From: Florian Krohm Date: Sun, 26 Aug 2012 03:22:09 +0000 (+0000) Subject: Followup patch to r12899, purely mechanical. Rename: X-Git-Tag: svn/VALGRIND_3_9_0~740 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd528bd768294a7bed2c11ba65783870823a9f09;p=thirdparty%2Fvalgrind.git Followup patch to r12899, purely mechanical. Rename: VexEmWarn -> VexEmNote EmWarn_NUMBER -> EmNote_NUMBER guest_EMWARN -> guest_EMNOTE LibVEX_EmWarn_string -> LibVEX_EmNote_string offB_EMWARN -> offB_EMNOTE EmWarn_NONE -> EmNote_NONE See also VEX r2484 git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12900 --- diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c index 4366124c9d..418d55f09f 100644 --- a/coregrind/m_scheduler/scheduler.c +++ b/coregrind/m_scheduler/scheduler.c @@ -1367,22 +1367,22 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid ) break; case VEX_TRC_JMP_EMWARN: { - static Int counts[EmWarn_NUMBER]; + static Int counts[EmNote_NUMBER]; static Bool counts_initted = False; - VexEmWarn ew; + VexEmNote ew; HChar* what; Bool show; Int q; if (!counts_initted) { counts_initted = True; - for (q = 0; q < EmWarn_NUMBER; q++) + for (q = 0; q < EmNote_NUMBER; q++) counts[q] = 0; } - ew = (VexEmWarn)VG_(threads)[tid].arch.vex.guest_EMWARN; - what = (ew < 0 || ew >= EmWarn_NUMBER) + ew = (VexEmNote)VG_(threads)[tid].arch.vex.guest_EMNOTE; + what = (ew < 0 || ew >= EmNote_NUMBER) ? "unknown (?!)" - : LibVEX_EmWarn_string(ew); - show = (ew < 0 || ew >= EmWarn_NUMBER) + : LibVEX_EmNote_string(ew); + show = (ew < 0 || ew >= EmNote_NUMBER) ? True : counts[ew]++ < 3; if (show && VG_(clo_show_emwarns) && !VG_(clo_xml)) { @@ -1395,12 +1395,12 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid ) } case VEX_TRC_JMP_EMFAIL: { - VexEmWarn ew; + VexEmNote ew; HChar* what; - ew = (VexEmWarn)VG_(threads)[tid].arch.vex.guest_EMWARN; - what = (ew < 0 || ew >= EmWarn_NUMBER) + ew = (VexEmNote)VG_(threads)[tid].arch.vex.guest_EMNOTE; + what = (ew < 0 || ew >= EmNote_NUMBER) ? "unknown (?!)" - : LibVEX_EmWarn_string(ew); + : LibVEX_EmNote_string(ew); VG_(message)( Vg_UserMsg, "Emulation fatal error -- Valgrind cannot continue:\n"); VG_(message)( Vg_UserMsg, " %s\n", what); diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c index b3c98dccdf..30e9caa231 100644 --- a/coregrind/m_translate.c +++ b/coregrind/m_translate.c @@ -912,7 +912,7 @@ static void gen_PUSH ( IRSB* bb, IRExpr* e ) Int stack_size = VEX_GUEST_PPC64_REDIR_STACK_SIZE; Int offB_REDIR_SP = offsetof(VexGuestPPC64State,guest_REDIR_SP); Int offB_REDIR_STACK = offsetof(VexGuestPPC64State,guest_REDIR_STACK); - Int offB_EMWARN = offsetof(VexGuestPPC64State,guest_EMWARN); + Int offB_EMNOTE = offsetof(VexGuestPPC64State,guest_EMNOTE); Int offB_CIA = offsetof(VexGuestPPC64State,guest_CIA); Bool is64 = True; IRType ty_Word = Ity_I64; @@ -926,7 +926,7 @@ static void gen_PUSH ( IRSB* bb, IRExpr* e ) Int stack_size = VEX_GUEST_PPC32_REDIR_STACK_SIZE; Int offB_REDIR_SP = offsetof(VexGuestPPC32State,guest_REDIR_SP); Int offB_REDIR_STACK = offsetof(VexGuestPPC32State,guest_REDIR_STACK); - Int offB_EMWARN = offsetof(VexGuestPPC32State,guest_EMWARN); + Int offB_EMNOTE = offsetof(VexGuestPPC32State,guest_EMNOTE); Int offB_CIA = offsetof(VexGuestPPC32State,guest_CIA); Bool is64 = False; IRType ty_Word = Ity_I32; @@ -960,11 +960,11 @@ static void gen_PUSH ( IRSB* bb, IRExpr* e ) /* Bomb out if t1 >=s stack_size, that is, (stack_size-1)-t1