From: Julian Seward Date: Wed, 8 Aug 2012 21:02:20 +0000 (+0000) Subject: Support Ijk_TInval style exits on ARM, so that --smc-check= works on X-Git-Tag: svn/VALGRIND_3_8_1^2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeb6114e897cd495b16ff1361171be53e7533911;p=thirdparty%2Fvalgrind.git Support Ijk_TInval style exits on ARM, so that --smc-check= works on ARM. (Not that it's actually necessary, but still ..) git-svn-id: svn://svn.valgrind.org/vex/trunk@2465 --- diff --git a/VEX/priv/host_arm_defs.c b/VEX/priv/host_arm_defs.c index 94326f519b..e428da0f6e 100644 --- a/VEX/priv/host_arm_defs.c +++ b/VEX/priv/host_arm_defs.c @@ -3222,7 +3222,7 @@ Int emit_ARMInstr ( /*MB_MOD*/Bool* is_profInc, //case Ijk_EmWarn: trcval = VEX_TRC_JMP_EMWARN; break; //case Ijk_MapFail: trcval = VEX_TRC_JMP_MAPFAIL; break; case Ijk_NoDecode: trcval = VEX_TRC_JMP_NODECODE; break; - //case Ijk_TInval: trcval = VEX_TRC_JMP_TINVAL; break; + case Ijk_TInval: trcval = VEX_TRC_JMP_TINVAL; break; case Ijk_NoRedir: trcval = VEX_TRC_JMP_NOREDIR; break; //case Ijk_SigTRAP: trcval = VEX_TRC_JMP_SIGTRAP; break; //case Ijk_SigSEGV: trcval = VEX_TRC_JMP_SIGSEGV; break; diff --git a/VEX/priv/host_arm_isel.c b/VEX/priv/host_arm_isel.c index e3181acd1b..7e827e6640 100644 --- a/VEX/priv/host_arm_isel.c +++ b/VEX/priv/host_arm_isel.c @@ -6026,6 +6026,7 @@ static void iselStmt ( ISelEnv* env, IRStmt* stmt ) case Ijk_NoDecode: case Ijk_NoRedir: case Ijk_Sys_syscall: + case Ijk_TInval: { HReg r = iselIntExpr_R(env, IRExpr_Const(stmt->Ist.Exit.dst)); addInstr(env, ARMInstr_XAssisted(r, amR15T, cc,