|
From: <sv...@va...> - 2012-08-26 03:22:29
|
florian 2012-08-26 04:22:09 +0100 (Sun, 26 Aug 2012)
New Revision: 12900
Log:
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
Modified files:
trunk/coregrind/m_scheduler/scheduler.c
trunk/coregrind/m_translate.c
trunk/memcheck/mc_machine.c
Modified: trunk/coregrind/m_scheduler/scheduler.c (+11 -11)
===================================================================
--- trunk/coregrind/m_scheduler/scheduler.c 2012-08-25 22:48:22 +01:00 (rev 12899)
+++ trunk/coregrind/m_scheduler/scheduler.c 2012-08-26 04:22:09 +01:00 (rev 12900)
@@ -1367,22 +1367,22 @@
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 @@
}
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);
Modified: trunk/memcheck/mc_machine.c (+6 -6)
===================================================================
--- trunk/memcheck/mc_machine.c 2012-08-25 22:48:22 +01:00 (rev 12899)
+++ trunk/memcheck/mc_machine.c 2012-08-26 04:22:09 +01:00 (rev 12900)
@@ -200,7 +200,7 @@
if (o == GOF(IP_AT_SYSCALL) && sz == 8) return -1; /* slot unused */
if (o == GOF(FPROUND) && sz == 1) return -1;
if (o == GOF(DFPROUND) && sz == 1) return -1;
- if (o == GOF(EMWARN) && sz == 4) return -1;
+ if (o == GOF(EMNOTE) && sz == 4) return -1;
if (o == GOF(TISTART) && sz == 8) return -1;
if (o == GOF(TILEN) && sz == 8) return -1;
if (o == GOF(VSCR) && sz == 4) return -1;
@@ -401,7 +401,7 @@
if (o == GOF(FPROUND) && sz == 1) return -1;
if (o == GOF(DFPROUND) && sz == 1) return -1;
if (o == GOF(VRSAVE) && sz == 4) return -1;
- if (o == GOF(EMWARN) && sz == 4) return -1;
+ if (o == GOF(EMNOTE) && sz == 4) return -1;
if (o == GOF(TISTART) && sz == 4) return -1;
if (o == GOF(TILEN) && sz == 4) return -1;
if (o == GOF(VSCR) && sz == 4) return -1;
@@ -612,7 +612,7 @@
if (o == GOF(SSEROUND) && szB == 8) return -1;
if (o == GOF(FTOP) && szB == 4) return -1;
if (o == GOF(FPROUND) && szB == 8) return -1;
- if (o == GOF(EMWARN) && szB == 4) return -1;
+ if (o == GOF(EMNOTE) && szB == 4) return -1;
if (o == GOF(FC3210) && szB == 8) return -1;
/* XMM registers */
@@ -724,7 +724,7 @@
if (o == GOF(SSEROUND) && szB == 4) return -1;
if (o == GOF(FTOP) && szB == 4) return -1;
if (o == GOF(FPROUND) && szB == 4) return -1;
- if (o == GOF(EMWARN) && szB == 4) return -1;
+ if (o == GOF(EMNOTE) && szB == 4) return -1;
if (o == GOF(FC3210) && szB == 4) return -1;
/* XMM registers */
@@ -874,7 +874,7 @@
//if (o == GOF(SYSCALLNO) && sz == 4) return -1; /* slot unused */
//if (o == GOF(CC) && sz == 4) return -1; /* slot unused */
- //if (o == GOF(EMWARN) && sz == 4) return -1; /* slot unused */
+ //if (o == GOF(EMNOTE) && sz == 4) return -1; /* slot unused */
//if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
//if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
@@ -1008,7 +1008,7 @@
if (o == GOF(FCSR) && sz == 4) return -1; /* slot unused */
if (o == GOF(ULR) && sz == 4) return -1;
- if (o == GOF(EMWARN) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(EMNOTE) && sz == 4) return -1; /* slot unused */
if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
if (o == GOF(TILEN) && sz == 4) return -1; /* slot unused */
if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
Modified: trunk/coregrind/m_translate.c (+7 -7)
===================================================================
--- trunk/coregrind/m_translate.c 2012-08-25 22:48:22 +01:00 (rev 12899)
+++ trunk/coregrind/m_translate.c 2012-08-26 04:22:09 +01:00 (rev 12900)
@@ -912,7 +912,7 @@
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 @@
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 @@
/* Bomb out if t1 >=s stack_size, that is, (stack_size-1)-t1 <s 0.
The destination (0) is a bit bogus but it doesn't matter since
this is an unrecoverable error and will lead to Valgrind
- shutting down. _EMWARN is set regardless - that's harmless
+ shutting down. _EMNOTE is set regardless - that's harmless
since is only has a meaning if the exit is taken. */
addStmtToIRSB(
bb,
- IRStmt_Put(offB_EMWARN, mkU32(EmWarn_PPC64_redir_overflow))
+ IRStmt_Put(offB_EMNOTE, mkU32(EmWarn_PPC64_redir_overflow))
);
addStmtToIRSB(
bb,
@@ -1006,7 +1006,7 @@
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;
@@ -1018,7 +1018,7 @@
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;
@@ -1046,7 +1046,7 @@
/* Bomb out if t1 < 0. Same comments as gen_PUSH apply. */
addStmtToIRSB(
bb,
- IRStmt_Put(offB_EMWARN, mkU32(EmWarn_PPC64_redir_underflow))
+ IRStmt_Put(offB_EMNOTE, mkU32(EmWarn_PPC64_redir_underflow))
);
addStmtToIRSB(
bb,
|