Make VexTranslateArgs::guest_bytes_addr an Addr value. Fix ripple.

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

diff --git a/VEX/priv/guest_amd64_defs.h b/VEX/priv/guest_amd64_defs.h
index 494f366e058c15ca00ae063201202553143fac1f..a2956484fa2a80218c80dc688ccf4229066ff547 100644 (file)
--- a/VEX/priv/guest_amd64_defs.h
+++ b/VEX/priv/guest_amd64_defs.h
@@ -56,7 +56,7 @@ DisResult disInstr_AMD64 ( IRSB*        irbb,
                            void*        callback_opaque,
                            const UChar* guest_code,
                            Long         delta,
-                           Addr64       guest_IP,
+                           Addr         guest_IP,
                            VexArch      guest_arch,
                            const VexArchInfo* archinfo,
                            const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
index 135ab18c3b0de8776489d168f1ee0723bcf00ca0..ba5190a41b5e39601fabf948293727ac1dda8d13 100644 (file)
--- a/VEX/priv/guest_amd64_toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -31784,7 +31784,7 @@ DisResult disInstr_AMD64 ( IRSB*        irsb_IN,
                            void*        callback_opaque,
                            const UChar* guest_code_IN,
                            Long         delta,
-                           Addr64       guest_IP,
+                           Addr         guest_IP,
                            VexArch      guest_arch,
                            const VexArchInfo* archinfo,
                            const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_arm64_defs.h b/VEX/priv/guest_arm64_defs.h
index 1b52aa787db765083dc698d8f06c6a4b09dd1abc..8910cad82929034b80fb1eff9fe8a0c623d9d9d5 100644 (file)
--- a/VEX/priv/guest_arm64_defs.h
+++ b/VEX/priv/guest_arm64_defs.h
@@ -46,7 +46,7 @@ DisResult disInstr_ARM64 ( IRSB*        irbb,
                            void*        callback_opaque,
                            const UChar* guest_code,
                            Long         delta,
-                           Addr64       guest_IP,
+                           Addr         guest_IP,
                            VexArch      guest_arch,
                            const VexArchInfo* archinfo,
                            const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_arm64_toIR.c b/VEX/priv/guest_arm64_toIR.c
index 6cc84726b6abdaacced3d30e993546ba2ac2bc4f..f5a903a9ae2f4fc6a133a3a1cbe857cb456165ae 100644 (file)
--- a/VEX/priv/guest_arm64_toIR.c
+++ b/VEX/priv/guest_arm64_toIR.c
@@ -12971,7 +12971,7 @@ DisResult disInstr_ARM64 ( IRSB*        irsb_IN,
                            void*        callback_opaque,
                            const UChar* guest_code_IN,
                            Long         delta_IN,
-                           Addr64       guest_IP,
+                           Addr         guest_IP,
                            VexArch      guest_arch,
                            const VexArchInfo* archinfo,
                            const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_arm_defs.h b/VEX/priv/guest_arm_defs.h
index c03f2611abac204000a4a4d697b07574a9d565f7..abefb641676d4d08e89c93bc814ee2f9c0d25c83 100644 (file)
--- a/VEX/priv/guest_arm_defs.h
+++ b/VEX/priv/guest_arm_defs.h
@@ -48,7 +48,7 @@ DisResult disInstr_ARM ( IRSB*        irbb,
                          void*        callback_opaque,
                          const UChar* guest_code,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index 1da4dddeba8656a38e0146e27861bc8b8cae5876..ea91ec253053d613140cecaaf7f15f2a49fb28a3 100644 (file)
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -22019,7 +22019,7 @@ DisResult disInstr_ARM ( IRSB*        irsb_IN,
                          void*        callback_opaque,
                          const UChar* guest_code_IN,
                          Long         delta_ENCODED,
-                         Addr64       guest_IP_ENCODED,
+                         Addr         guest_IP_ENCODED,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_generic_bb_to_IR.c b/VEX/priv/guest_generic_bb_to_IR.c
index cd17fda913d3427ad6523d77c67a810837d8df35..4667cf13099657a209b15b6922a7e275cc03349e 100644 (file)
--- a/VEX/priv/guest_generic_bb_to_IR.c
+++ b/VEX/priv/guest_generic_bb_to_IR.c
@@ -184,7 +184,7 @@ IRSB* bb_to_IR (
          /*IN*/ void*            callback_opaque,
          /*IN*/ DisOneInstrFn    dis_instr_fn,
          /*IN*/ const UChar*     guest_code,
-         /*IN*/ Addr64           guest_IP_bbstart,
+         /*IN*/ Addr             guest_IP_bbstart,
          /*IN*/ Bool             (*chase_into_ok)(void*,Addr),
          /*IN*/ VexEndness       host_endness,
          /*IN*/ Bool             sigill_diag,
@@ -210,7 +210,7 @@ IRSB* bb_to_IR (
    Int        d_resteers = 0;
    Int        selfcheck_idx = 0;
    IRSB*      irsb;
-   Addr64     guest_IP_curr_instr;
+   Addr       guest_IP_curr_instr;
    IRConst*   guest_IP_bbstart_IRConst = NULL;
    Int        n_cond_resteers_allowed = 2;
 
@@ -329,10 +329,10 @@ IRSB* bb_to_IR (
          was originally Thumb or ARM.  For more details of this
          convention, see comments on definition of guest_R15T in
          libvex_guest_arm.h. */
-      if (arch_guest == VexArchARM && (guest_IP_curr_instr & (Addr64)1)) {
+      if (arch_guest == VexArchARM && (guest_IP_curr_instr & 1)) {
          /* Thumb insn => mask out the T bit, but put it in delta */
          addStmtToIRSB( irsb,
-                        IRStmt_IMark(guest_IP_curr_instr & ~(Addr64)1,
+                        IRStmt_IMark(guest_IP_curr_instr & ~(Addr)1,
                                      0, /* len */
                                      1  /* delta */
                         )

diff --git a/VEX/priv/guest_generic_bb_to_IR.h b/VEX/priv/guest_generic_bb_to_IR.h
index 7bf65cf2af8730523e3e13936335417872a4e4ff..e01ba6321da6caeb6c79be8f6291e1c1292097b7 100644 (file)
--- a/VEX/priv/guest_generic_bb_to_IR.h
+++ b/VEX/priv/guest_generic_bb_to_IR.h
@@ -143,7 +143,7 @@ typedef
       /*IN*/  Long         delta,
 
       /* What is the guest IP of the insn? */
-      /*IN*/  Addr64       guest_IP,
+      /*IN*/  Addr         guest_IP,
 
       /* Info about the guest architecture */
       /*IN*/  VexArch      guest_arch,
@@ -174,7 +174,7 @@ IRSB* bb_to_IR (
          /*IN*/ void*            callback_opaque,
          /*IN*/ DisOneInstrFn    dis_instr_fn,
          /*IN*/ const UChar*     guest_code,
-         /*IN*/ Addr64           guest_IP_bbstart,
+         /*IN*/ Addr             guest_IP_bbstart,
          /*IN*/ Bool             (*chase_into_ok)(void*,Addr),
          /*IN*/ VexEndness       host_endness,
          /*IN*/ Bool             sigill_diag,

diff --git a/VEX/priv/guest_mips_defs.h b/VEX/priv/guest_mips_defs.h
index 7cc2f885c98c36e5e976cdaaef012ef7d7d4e045..757211d8e7f80cf3b0ccdbc89326fa020564db4d 100644 (file)
--- a/VEX/priv/guest_mips_defs.h
+++ b/VEX/priv/guest_mips_defs.h
@@ -47,7 +47,7 @@ extern DisResult disInstr_MIPS ( IRSB*        irbb,
                                  void*        callback_opaque,
                                  const UChar* guest_code,
                                  Long         delta,
-                                 Addr64       guest_IP,
+                                 Addr         guest_IP,
                                  VexArch      guest_arch,
                                  const VexArchInfo* archinfo,
                                  const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_mips_toIR.c b/VEX/priv/guest_mips_toIR.c
index 92c64af205d3ccf268c78890e216542573c0021d..bfc9124c7478b28bf4ffca0aaf341ffca84fc97d 100644 (file)
--- a/VEX/priv/guest_mips_toIR.c
+++ b/VEX/priv/guest_mips_toIR.c
@@ -17287,7 +17287,7 @@ DisResult disInstr_MIPS( IRSB*        irsb_IN,
                          void*        callback_opaque,
                          const UChar* guest_code_IN,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h
index 19cdcbe2ea34ba3ace13a8898c2bd779829856ea..55bb656095bd5920095bd1d50deac751103eb056 100644 (file)
--- a/VEX/priv/guest_ppc_defs.h
+++ b/VEX/priv/guest_ppc_defs.h
@@ -57,7 +57,7 @@ DisResult disInstr_PPC ( IRSB*        irbb,
                          void*        callback_opaque,
                          const UChar* guest_code,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index e603b6e10e47a3424a70b3e487163866d761dc6d..3f01e0b32e6489b45365511f8f5a535e7a99fc80 100644 (file)
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -20187,7 +20187,7 @@ DisResult disInstr_PPC ( IRSB*        irsb_IN,
                          void*        callback_opaque,
                          const UChar* guest_code_IN,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
index de2cb6e6e72efadbc47712225e0fec018939a131..2e482f59a3f85f5f3a0b1bfba7b75077295d00e5 100644 (file)
--- a/VEX/priv/guest_s390_defs.h
+++ b/VEX/priv/guest_s390_defs.h
@@ -46,7 +46,7 @@ DisResult disInstr_S390 ( IRSB*        irbb,
                           void*        callback_opaque,
                           const UChar* guest_code,
                           Long         delta,
-                          Addr64       guest_IP,
+                          Addr         guest_IP,
                           VexArch      guest_arch,
                           const VexArchInfo* archinfo,
                           const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 98d78052eee6fbd216a091b18688d48a794d9c2b..e066d10a38f8c88a8239a25009e112f9fd73ede7 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -16663,7 +16663,7 @@ disInstr_S390(IRSB        *irsb_IN,
               void        *callback_opaque,
               const UChar *guest_code,
               Long         delta,
-              Addr64       guest_IP,
+              Addr         guest_IP,
               VexArch      guest_arch,
               const VexArchInfo *archinfo,
               const VexAbiInfo  *abiinfo,

diff --git a/VEX/priv/guest_x86_defs.h b/VEX/priv/guest_x86_defs.h
index 802b767b65734256e3b9ee6f5b58956c56f9ed30..47ce896c57a0ada2a13010d420343f4460a0f0d8 100644 (file)
--- a/VEX/priv/guest_x86_defs.h
+++ b/VEX/priv/guest_x86_defs.h
@@ -56,7 +56,7 @@ DisResult disInstr_X86 ( IRSB*        irbb,
                          void*        callback_opaque,
                          const UChar* guest_code,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/guest_x86_toIR.c b/VEX/priv/guest_x86_toIR.c
index 893fcac719b0b30aa7237eb00fac9316c22e5a99..f46707b1cda7aa4658394ded09c8a66a80674ef3 100644 (file)
--- a/VEX/priv/guest_x86_toIR.c
+++ b/VEX/priv/guest_x86_toIR.c
@@ -15413,7 +15413,7 @@ DisResult disInstr_X86 ( IRSB*        irsb_IN,
                          void*        callback_opaque,
                          const UChar* guest_code_IN,
                          Long         delta,
-                         Addr64       guest_IP,
+                         Addr         guest_IP,
                          VexArch      guest_arch,
                          const VexArchInfo* archinfo,
                          const VexAbiInfo*  abiinfo,

diff --git a/VEX/priv/ir_opt.c b/VEX/priv/ir_opt.c
index 0779e6135bdee2d224404e196d86bea7668af430..d2ba8fd7c898fc996359c40176af31da3c53ac6d 100644 (file)
--- a/VEX/priv/ir_opt.c
+++ b/VEX/priv/ir_opt.c
@@ -4650,7 +4650,7 @@ static Int calc_unroll_factor( IRSB* bb )
 }
 
 
-static IRSB* maybe_loop_unroll_BB ( IRSB* bb0, Addr64 my_addr )
+static IRSB* maybe_loop_unroll_BB ( IRSB* bb0, Addr my_addr )
 {
    Int      i, j, jmax, n_vars;
    Bool     xxx_known;
@@ -4810,7 +4810,7 @@ static IRSB* maybe_loop_unroll_BB ( IRSB* bb0, Addr64 my_addr )
    }
 
    if (DEBUG_IROPT) {
-      vex_printf("\nUNROLLED (%llx)\n", my_addr);
+      vex_printf("\nUNROLLED (%lx)\n", my_addr);
       ppIRSB(bb1);
       vex_printf("\n");
    }
@@ -6039,7 +6039,7 @@ IRSB* do_iropt_BB(
          IRSB* bb0,
          IRExpr* (*specHelper) (const HChar*, IRExpr**, IRStmt**, Int),
          Bool (*preciseMemExnsFn)(Int,Int),
-         Addr64 guest_addr,
+         Addr    guest_addr,
          VexArch guest_arch
       )
 {

diff --git a/VEX/priv/ir_opt.h b/VEX/priv/ir_opt.h
index 0af7225078f9359f0ddcd0e433a7777b1baab8d1..c797b7140d83d31625da59c16988ff582096e459 100644 (file)
--- a/VEX/priv/ir_opt.h
+++ b/VEX/priv/ir_opt.h
@@ -47,7 +47,7 @@ IRSB* do_iropt_BB(
          IRSB* bb,
          IRExpr* (*specHelper) (const HChar*, IRExpr**, IRStmt**, Int),
          Bool (*preciseMemExnsFn)(Int,Int),
-         Addr64 guest_addr,
+         Addr    guest_addr,
          VexArch guest_arch
       );
 

diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
index 12f641d6b948f4a35bbaef41afb66fb5b0bca0e7..08ee31eab484765b41687d43c13f07236c17c533 100644 (file)
--- a/VEX/priv/main_main.c
+++ b/VEX/priv/main_main.c
@@ -728,8 +728,8 @@ VexTranslateResult LibVEX_Translate ( VexTranslateArgs* vta )
          const UChar* p = vta->guest_bytes;
          UInt   sum = 0;
          UInt   guest_bytes_read = (UInt)vta->guest_extents->len[0];
-         vex_printf("GuestBytes %llx %u ", vta->guest_bytes_addr, 
-                                           guest_bytes_read );
+         vex_printf("GuestBytes %lx %u ", vta->guest_bytes_addr, 
+                                          guest_bytes_read );
          for (i = 0; i < guest_bytes_read; i++) {
             UInt b = (UInt)p[i];
             vex_printf(" %02x", b );

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index 3a5220c3729c1600535e1cc2b27757eac755dd8f..bde9656821977130951578df130feeffb329c6ce 100644 (file)
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -605,7 +605,7 @@ typedef
          This is the post-redirection guest address.  Not that Vex
          understands anything about redirection; that is all done on
          the Valgrind side. */
-      Addr64  guest_bytes_addr;
+      Addr    guest_bytes_addr;
 
       /* Is it OK to chase into this guest address?  May not be
         NULL. */

diff --git a/VEX/switchback/switchback.c b/VEX/switchback/switchback.c
index 48f3d1fa1d80fa8c15376c795e60b06c56dddae9..deecc540459915eae236add20933d713eea7812d 100644 (file)
--- a/VEX/switchback/switchback.c
+++ b/VEX/switchback/switchback.c
@@ -585,7 +585,7 @@ void make_translation ( Addr64 guest_addr, Bool verbose )
    vta.arch_host        = VexArch;
    vta.archinfo_host    = vex_archinfo;
    vta.guest_bytes      = (UChar*)ULong_to_Ptr(guest_addr);
-   vta.guest_bytes_addr = (Addr64)guest_addr;
+   vta.guest_bytes_addr = guest_addr;
    vta.chase_into_ok    = chase_into_ok;
 //   vta.guest_extents    = &vge;
    vta.guest_extents    = &trans_table[trans_table_used];

diff --git a/VEX/useful/test_main.c b/VEX/useful/test_main.c
index 802827cde0a2d38170890fe55461079fd96cf7b6..a19ad306d5fc300374f7422fd05662d75a1ff9dd 100644 (file)
--- a/VEX/useful/test_main.c
+++ b/VEX/useful/test_main.c
@@ -189,7 +189,7 @@ int main ( int argc, char** argv )
 
       vta.abiinfo_both    = vbi;
       vta.guest_bytes     = &origbuf[18];
-      vta.guest_bytes_addr = (Addr64)orig_addr;
+      vta.guest_bytes_addr = orig_addr;
       vta.callback_opaque = NULL;
       vta.chase_into_ok   = chase_into_not_ok;
       vta.guest_extents   = &vge;
@@ -223,7 +223,7 @@ int main ( int argc, char** argv )
       /* ARM/Thumb only hacks, that are needed to keep the ITstate
          analyser in the front end happy.  */
       vta.guest_bytes     = &origbuf[18 +1];
-      vta.guest_bytes_addr = (Addr64)(&origbuf[18 +1]);
+      vta.guest_bytes_addr = &origbuf[18 +1];
 #endif
 
 #if 1 /* no instrumentation */