|
From: <sv...@va...> - 2015-01-02 13:34:24
|
Author: florian
Date: Fri Jan 2 13:34:15 2015
New Revision: 3053
Log:
Give DisResult::continueAt Addr type.
Modified:
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_x86_toIR.c
Modified: trunk/priv/guest_arm_toIR.c
==============================================================================
--- trunk/priv/guest_arm_toIR.c (original)
+++ trunk/priv/guest_arm_toIR.c Fri Jan 2 13:34:15 2015
@@ -15554,7 +15554,7 @@
if (resteerOkFn( callback_opaque, dst )) {
/* yes */
dres.whatNext = Dis_ResteerU;
- dres.continueAt = (Addr64)dst;
+ dres.continueAt = dst;
} else {
/* no; terminate the SB at this point. */
llPutIReg(15, mkU32(dst));
@@ -15585,7 +15585,7 @@
IRConst_U32(guest_R15_curr_instr_notENC+4),
OFFB_R15T ));
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)dst;
+ dres.continueAt = (Addr32)dst;
comment = "(assumed taken)";
}
else
@@ -15604,8 +15604,7 @@
IRConst_U32(dst),
OFFB_R15T ));
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)
- (guest_R15_curr_instr_notENC+4);
+ dres.continueAt = guest_R15_curr_instr_notENC+4;
comment = "(assumed not taken)";
}
else {
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 13:34:15 2015
@@ -471,7 +471,7 @@
n_resteers++;
d_resteers++;
if (0 && (n_resteers & 0xFF) == 0)
- vex_printf("resteer[%d,%d] to 0x%llx (delta = %lld)\n",
+ vex_printf("resteer[%d,%d] to 0x%lx (delta = %lld)\n",
n_resteers, d_resteers,
dres.continueAt, delta);
break;
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 13:34:15 2015
@@ -88,7 +88,7 @@
/* For Dis_Resteer, this is the guest address we should continue
at. Otherwise ignored (should be zero). */
- Addr64 continueAt;
+ Addr continueAt;
}
Modified: trunk/priv/guest_x86_toIR.c
==============================================================================
--- trunk/priv/guest_x86_toIR.c (original)
+++ trunk/priv/guest_x86_toIR.c Fri Jan 2 13:34:15 2015
@@ -13081,7 +13081,7 @@
if (resteerOkFn( callback_opaque, (Addr32)d32 )) {
/* follow into the call target. */
dres.whatNext = Dis_ResteerU;
- dres.continueAt = (Addr64)(Addr32)d32;
+ dres.continueAt = (Addr32)d32;
} else {
jmp_lit(&dres, Ijk_Call, d32);
vassert(dres.whatNext == Dis_StopHere);
@@ -13395,7 +13395,7 @@
delta++;
if (resteerOkFn( callback_opaque, (Addr32)d32) ) {
dres.whatNext = Dis_ResteerU;
- dres.continueAt = (Addr64)(Addr32)d32;
+ dres.continueAt = (Addr32)d32;
} else {
jmp_lit(&dres, Ijk_Boring, d32);
vassert(dres.whatNext == Dis_StopHere);
@@ -13409,7 +13409,7 @@
delta += sz;
if (resteerOkFn( callback_opaque, (Addr32)d32) ) {
dres.whatNext = Dis_ResteerU;
- dres.continueAt = (Addr64)(Addr32)d32;
+ dres.continueAt = (Addr32)d32;
} else {
jmp_lit(&dres, Ijk_Boring, d32);
vassert(dres.whatNext == Dis_StopHere);
@@ -13456,7 +13456,7 @@
IRConst_U32(guest_EIP_bbstart+delta),
OFFB_EIP ) );
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)d32;
+ dres.continueAt = (Addr32)d32;
comment = "(assumed taken)";
}
else
@@ -13476,7 +13476,7 @@
IRConst_U32(d32),
OFFB_EIP ) );
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)(guest_EIP_bbstart+delta);
+ dres.continueAt = guest_EIP_bbstart + delta;
comment = "(assumed not taken)";
}
else {
@@ -15021,7 +15021,7 @@
IRConst_U32(guest_EIP_bbstart+delta),
OFFB_EIP ) );
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)d32;
+ dres.continueAt = (Addr32)d32;
comment = "(assumed taken)";
}
else
@@ -15041,7 +15041,7 @@
IRConst_U32(d32),
OFFB_EIP ) );
dres.whatNext = Dis_ResteerC;
- dres.continueAt = (Addr64)(Addr32)(guest_EIP_bbstart+delta);
+ dres.continueAt = guest_EIP_bbstart + delta;
comment = "(assumed not taken)";
}
else {
|