|
From: <sv...@va...> - 2015-01-02 11:44:24
|
Author: florian
Date: Fri Jan 2 11:44:12 2015
New Revision: 3052
Log:
Make VexTranslateArgs::guest_bytes_addr an Addr value. Fix ripple.
Modified:
trunk/priv/guest_amd64_defs.h
trunk/priv/guest_amd64_toIR.c
trunk/priv/guest_arm64_defs.h
trunk/priv/guest_arm64_toIR.c
trunk/priv/guest_arm_defs.h
trunk/priv/guest_arm_toIR.c
trunk/priv/guest_generic_bb_to_IR.c
trunk/priv/guest_generic_bb_to_IR.h
trunk/priv/guest_mips_defs.h
trunk/priv/guest_mips_toIR.c
trunk/priv/guest_ppc_defs.h
trunk/priv/guest_ppc_toIR.c
trunk/priv/guest_s390_defs.h
trunk/priv/guest_s390_toIR.c
trunk/priv/guest_x86_defs.h
trunk/priv/guest_x86_toIR.c
trunk/priv/ir_opt.c
trunk/priv/ir_opt.h
trunk/priv/main_main.c
trunk/pub/libvex.h
trunk/switchback/switchback.c
trunk/useful/test_main.c
Modified: trunk/priv/guest_amd64_defs.h
==============================================================================
--- trunk/priv/guest_amd64_defs.h (original)
+++ trunk/priv/guest_amd64_defs.h Fri Jan 2 11:44:12 2015
@@ -56,7 +56,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_amd64_toIR.c
==============================================================================
--- trunk/priv/guest_amd64_toIR.c (original)
+++ trunk/priv/guest_amd64_toIR.c Fri Jan 2 11:44:12 2015
@@ -31784,7 +31784,7 @@
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,
Modified: trunk/priv/guest_arm64_defs.h
==============================================================================
--- trunk/priv/guest_arm64_defs.h (original)
+++ trunk/priv/guest_arm64_defs.h Fri Jan 2 11:44:12 2015
@@ -46,7 +46,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_arm64_toIR.c
==============================================================================
--- trunk/priv/guest_arm64_toIR.c (original)
+++ trunk/priv/guest_arm64_toIR.c Fri Jan 2 11:44:12 2015
@@ -12971,7 +12971,7 @@
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,
Modified: trunk/priv/guest_arm_defs.h
==============================================================================
--- trunk/priv/guest_arm_defs.h (original)
+++ trunk/priv/guest_arm_defs.h Fri Jan 2 11:44:12 2015
@@ -48,7 +48,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_arm_toIR.c
==============================================================================
--- trunk/priv/guest_arm_toIR.c (original)
+++ trunk/priv/guest_arm_toIR.c Fri Jan 2 11:44:12 2015
@@ -22019,7 +22019,7 @@
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,
Modified: trunk/priv/guest_generic_bb_to_IR.c
==============================================================================
--- trunk/priv/guest_generic_bb_to_IR.c (original)
+++ trunk/priv/guest_generic_bb_to_IR.c Fri Jan 2 11:44:12 2015
@@ -184,7 +184,7 @@
/*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 @@
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 @@
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 */
)
Modified: trunk/priv/guest_generic_bb_to_IR.h
==============================================================================
--- trunk/priv/guest_generic_bb_to_IR.h (original)
+++ trunk/priv/guest_generic_bb_to_IR.h Fri Jan 2 11:44:12 2015
@@ -143,7 +143,7 @@
/*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 @@
/*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,
Modified: trunk/priv/guest_mips_defs.h
==============================================================================
--- trunk/priv/guest_mips_defs.h (original)
+++ trunk/priv/guest_mips_defs.h Fri Jan 2 11:44:12 2015
@@ -47,7 +47,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_mips_toIR.c
==============================================================================
--- trunk/priv/guest_mips_toIR.c (original)
+++ trunk/priv/guest_mips_toIR.c Fri Jan 2 11:44:12 2015
@@ -17287,7 +17287,7 @@
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,
Modified: trunk/priv/guest_ppc_defs.h
==============================================================================
--- trunk/priv/guest_ppc_defs.h (original)
+++ trunk/priv/guest_ppc_defs.h Fri Jan 2 11:44:12 2015
@@ -57,7 +57,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_ppc_toIR.c
==============================================================================
--- trunk/priv/guest_ppc_toIR.c (original)
+++ trunk/priv/guest_ppc_toIR.c Fri Jan 2 11:44:12 2015
@@ -20187,7 +20187,7 @@
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,
Modified: trunk/priv/guest_s390_defs.h
==============================================================================
--- trunk/priv/guest_s390_defs.h (original)
+++ trunk/priv/guest_s390_defs.h Fri Jan 2 11:44:12 2015
@@ -46,7 +46,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_s390_toIR.c
==============================================================================
--- trunk/priv/guest_s390_toIR.c (original)
+++ trunk/priv/guest_s390_toIR.c Fri Jan 2 11:44:12 2015
@@ -16663,7 +16663,7 @@
void *callback_opaque,
const UChar *guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo *archinfo,
const VexAbiInfo *abiinfo,
Modified: trunk/priv/guest_x86_defs.h
==============================================================================
--- trunk/priv/guest_x86_defs.h (original)
+++ trunk/priv/guest_x86_defs.h Fri Jan 2 11:44:12 2015
@@ -56,7 +56,7 @@
void* callback_opaque,
const UChar* guest_code,
Long delta,
- Addr64 guest_IP,
+ Addr guest_IP,
VexArch guest_arch,
const VexArchInfo* archinfo,
const VexAbiInfo* abiinfo,
Modified: trunk/priv/guest_x86_toIR.c
==============================================================================
--- trunk/priv/guest_x86_toIR.c (original)
+++ trunk/priv/guest_x86_toIR.c Fri Jan 2 11:44:12 2015
@@ -15413,7 +15413,7 @@
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,
Modified: trunk/priv/ir_opt.c
==============================================================================
--- trunk/priv/ir_opt.c (original)
+++ trunk/priv/ir_opt.c Fri Jan 2 11:44:12 2015
@@ -4650,7 +4650,7 @@
}
-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 @@
}
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* bb0,
IRExpr* (*specHelper) (const HChar*, IRExpr**, IRStmt**, Int),
Bool (*preciseMemExnsFn)(Int,Int),
- Addr64 guest_addr,
+ Addr guest_addr,
VexArch guest_arch
)
{
Modified: trunk/priv/ir_opt.h
==============================================================================
--- trunk/priv/ir_opt.h (original)
+++ trunk/priv/ir_opt.h Fri Jan 2 11:44:12 2015
@@ -47,7 +47,7 @@
IRSB* bb,
IRExpr* (*specHelper) (const HChar*, IRExpr**, IRStmt**, Int),
Bool (*preciseMemExnsFn)(Int,Int),
- Addr64 guest_addr,
+ Addr guest_addr,
VexArch guest_arch
);
Modified: trunk/priv/main_main.c
==============================================================================
--- trunk/priv/main_main.c (original)
+++ trunk/priv/main_main.c Fri Jan 2 11:44:12 2015
@@ -728,8 +728,8 @@
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 );
Modified: trunk/pub/libvex.h
==============================================================================
--- trunk/pub/libvex.h (original)
+++ trunk/pub/libvex.h Fri Jan 2 11:44:12 2015
@@ -605,7 +605,7 @@
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. */
Modified: trunk/switchback/switchback.c
==============================================================================
--- trunk/switchback/switchback.c (original)
+++ trunk/switchback/switchback.c Fri Jan 2 11:44:12 2015
@@ -585,7 +585,7 @@
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];
Modified: trunk/useful/test_main.c
==============================================================================
--- trunk/useful/test_main.c (original)
+++ trunk/useful/test_main.c Fri Jan 2 11:44:12 2015
@@ -189,7 +189,7 @@
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 @@
/* 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 */
|