A small API change: pass both the guest and host word sizes to the

instrumentatation functions.

git-svn-id: svn://svn.valgrind.org/vex/trunk@1062

diff --git a/VEX/priv/main/vex_main.c b/VEX/priv/main/vex_main.c
index 7d79683076cf9c14071ea5dfae9c05383df63164..ea97c4c4be79b5894de78509982c022d6544b7e5 100644 (file)
--- a/VEX/priv/main/vex_main.c
+++ b/VEX/priv/main/vex_main.c
@@ -184,8 +184,10 @@ VexTranslateResult LibVEX_Translate (
    /* OUT: how much of the output area is used. */
    Int*    host_bytes_used,
    /* IN: optionally, two instrumentation functions. */
-   IRBB*   (*instrument1) ( IRBB*, VexGuestLayout*, IRType hWordTy ),
-   IRBB*   (*instrument2) ( IRBB*, VexGuestLayout*, IRType hWordTy ),
+   IRBB*   (*instrument1) ( IRBB*, VexGuestLayout*, 
+                            IRType gWordTy, IRType hWordTy ),
+   IRBB*   (*instrument2) ( IRBB*, VexGuestLayout*, 
+                            IRType gWordTy, IRType hWordTy ),
    Bool    cleanup_after_instrumentation,
    /* IN: optionally, an access check function for guest code. */
    Bool    (*byte_accessible) ( Addr64 ),
@@ -431,9 +433,11 @@ VexTranslateResult LibVEX_Translate (
 
    /* Get the thing instrumented. */
    if (instrument1)
-      irbb = (*instrument1)(irbb, guest_layout, host_word_type);
+      irbb = (*instrument1)(irbb, guest_layout, 
+                                  guest_word_type, host_word_type);
    if (instrument2)
-      irbb = (*instrument2)(irbb, guest_layout, host_word_type);
+      irbb = (*instrument2)(irbb, guest_layout,
+                                  guest_word_type, host_word_type);
       
    if (vex_traceflags & VEX_TRACE_INST) {
       vex_printf("\n------------------------" 

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index ffd10bf82a1866dd4fcf8b71afcff0eabdb8884e..9b25a7138216e62c11e144b9e41df81e61df1b2f 100644 (file)
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -263,8 +263,10 @@ VexTranslateResult LibVEX_Translate (
    /* OUT: how much of the output area is used. */
    Int*    host_bytes_used,
    /* IN: optionally, two instrumentation functions. */
-   IRBB*   (*instrument1) ( IRBB*, VexGuestLayout*, IRType hWordTy ),
-   IRBB*   (*instrument2) ( IRBB*, VexGuestLayout*, IRType hWordTy ),
+   IRBB*   (*instrument1) ( IRBB*, VexGuestLayout*, 
+                            IRType gWordTy, IRType hWordTy ),
+   IRBB*   (*instrument2) ( IRBB*, VexGuestLayout*, 
+                            IRType gWordTy, IRType hWordTy ),
    Bool    cleanup_after_instrumentation,
    /* IN: optionally, an access check function for guest code. */
    Bool    (*byte_accessible) ( Addr64 ),