Followup to r2483, 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
git-svn-id: svn://svn.valgrind.org/vex/trunk@2484 8f6e269a-dfd6-0310-a8e1-e2731360e62c
diff --git a/pub/libvex_emnote.h b/pub/libvex_emnote.h
index 4f43f43..f7b68eb 100644
--- a/pub/libvex_emnote.h
+++ b/pub/libvex_emnote.h
@@ -1,6 +1,6 @@
/*---------------------------------------------------------------*/
-/*--- begin libvex_emwarn.h ---*/
+/*--- begin libvex_emnote.h ---*/
/*---------------------------------------------------------------*/
/*
@@ -33,30 +33,32 @@
without prior written permission.
*/
-#ifndef __LIBVEX_EMWARN_H
-#define __LIBVEX_EMWARN_H
+#ifndef __LIBVEX_EMNOTE_H
+#define __LIBVEX_EMNOTE_H
/* VEX can sometimes generate code which returns to the dispatcher
- with the guest state pointer set to VEX_TRC_JMP_EMWARN. This means
- that VEX is trying to warn Valgrind that it is doing imprecise
- emulation in some sense. The guest's pseudo-register
- "guest_EMWARN" will hold a value of type VexEmWarn, which describes
+ with the guest state pointer set to VEX_TRC_JMP_EMWARN or
+ VEX_TRC_JMP_EMFAIL. This means that VEX is trying to tell Valgrind
+ something noteworthy about emulation progress. For example, that Valgrind
+ is doing imprecise emulation in some sense. The guest's pseudo-register
+ "guest_EMNOTE" will hold a value of type VexEmNote, which describes
the nature of the warning. Currently the limitations that are
warned about apply primarily to floating point support.
- All guest states should have a 32-bit (UInt) guest_EMWARN pseudo-
+ All guest states must have a 32-bit (UInt) guest_EMNOTE pseudo-
register, that emulation warnings can be written in to.
- Note that guest_EMWARN only carries a valid value at the jump
- marked as VEX_TRC_JMP_EMWARN. You can't assume it will continue to
- carry a valid value from any amount of time after the jump.
+ Note that guest_EMNOTE only carries a valid value at the jump
+ marked as VEX_TRC_JMP_EMWARN / VEX_TRC_JMP_EMFAIL. You can't assume
+ it will continue to carry a valid value from any amount of time after
+ the jump.
*/
typedef
enum {
- /* no warning indicated */
- EmWarn_NONE=0,
+ /* no note indicated */
+ EmNote_NONE=0,
/* unmasking x87 FP exceptions is not supported */
EmWarn_X86_x87exns,
@@ -83,17 +85,17 @@
EmWarn_PPC64_redir_overflow,
EmWarn_PPC64_redir_underflow,
- EmWarn_NUMBER
+ EmNote_NUMBER
}
- VexEmWarn;
+ VexEmNote;
/* Produces a short string describing the warning. */
-extern HChar* LibVEX_EmWarn_string ( VexEmWarn );
+extern HChar* LibVEX_EmNote_string ( VexEmNote );
-#endif /* ndef __LIBVEX_EMWARN_H */
+#endif /* ndef __LIBVEX_EMNOTE_H */
/*---------------------------------------------------------------*/
-/*--- libvex_emwarn.h ---*/
+/*--- libvex_emnote.h ---*/
/*---------------------------------------------------------------*/
diff --git a/pub/libvex_guest_amd64.h b/pub/libvex_guest_amd64.h
index 00ee05d..9c12e88 100644
--- a/pub/libvex_guest_amd64.h
+++ b/pub/libvex_guest_amd64.h
@@ -129,8 +129,8 @@
ULong guest_FPROUND;
ULong guest_FC3210;
- /* Emulation warnings */
- UInt guest_EMWARN;
+ /* Emulation notes */
+ UInt guest_EMNOTE;
/* Translation-invalidation area description. Not used on amd64
(there is no invalidate-icache insn), but needed so as to
diff --git a/pub/libvex_guest_arm.h b/pub/libvex_guest_arm.h
index 29d60c7..a0d4924 100644
--- a/pub/libvex_guest_arm.h
+++ b/pub/libvex_guest_arm.h
@@ -92,8 +92,8 @@
UInt guest_GEFLAG3;
/* Various pseudo-regs mandated by Vex or Valgrind. */
- /* Emulation warnings */
- UInt guest_EMWARN;
+ /* Emulation notes */
+ UInt guest_EMNOTE;
/* For clflush: record start and length of area to invalidate */
UInt guest_TISTART;
diff --git a/pub/libvex_guest_mips32.h b/pub/libvex_guest_mips32.h
index 204ad8c..eac4657 100644
--- a/pub/libvex_guest_mips32.h
+++ b/pub/libvex_guest_mips32.h
@@ -129,8 +129,8 @@
*/
/* 288 */ UInt guest_ULR;
- /* Emulation warnings */
- UInt guest_EMWARN; /* 292 */
+ /* Emulation notes */
+ UInt guest_EMNOTE; /* 292 */
/* For clflush: record start and length of area to invalidate */
UInt guest_TISTART; /* 296 */
diff --git a/pub/libvex_guest_ppc32.h b/pub/libvex_guest_ppc32.h
index 4821d82..3f615fe 100644
--- a/pub/libvex_guest_ppc32.h
+++ b/pub/libvex_guest_ppc32.h
@@ -207,8 +207,8 @@
/* Vector Status and Control Register */
/* 1192 */ UInt guest_VSCR;
- /* Emulation warnings */
- /* 1196 */ UInt guest_EMWARN;
+ /* Emulation notes */
+ /* 1196 */ UInt guest_EMNOTE;
/* For icbi: record start and length of area to invalidate */
/* 1200 */ UInt guest_TISTART;
diff --git a/pub/libvex_guest_ppc64.h b/pub/libvex_guest_ppc64.h
index 585a554..31c4b62 100644
--- a/pub/libvex_guest_ppc64.h
+++ b/pub/libvex_guest_ppc64.h
@@ -246,8 +246,8 @@
/* Vector Status and Control Register */
/* 1332 */ UInt guest_VSCR;
- /* Emulation warnings */
- /* 1336 */ UInt guest_EMWARN;
+ /* Emulation notes */
+ /* 1336 */ UInt guest_EMNOTE;
/* gcc adds 4 bytes padding here: pre-empt it. */
/* 1340 */ UInt padding;
diff --git a/pub/libvex_guest_s390x.h b/pub/libvex_guest_s390x.h
index 3d1b087..5d121e1 100644
--- a/pub/libvex_guest_s390x.h
+++ b/pub/libvex_guest_s390x.h
@@ -141,8 +141,8 @@
libvex_ir.h */
/* 408 */ ULong guest_IP_AT_SYSCALL;
- /* Emulation warnings; see comments in libvex_emwarn.h */
- /* 416 */ UInt guest_EMWARN;
+ /* Emulation notes; see comments in libvex_emnote.h */
+ /* 416 */ UInt guest_EMNOTE;
/* For translation chaining */
/* 420 */ UInt host_EvC_COUNTER;
diff --git a/pub/libvex_guest_x86.h b/pub/libvex_guest_x86.h
index 166c63e..3dcbc57 100644
--- a/pub/libvex_guest_x86.h
+++ b/pub/libvex_guest_x86.h
@@ -197,8 +197,8 @@
HWord guest_LDT; /* host addr, a VexGuestX86SegDescr* */
HWord guest_GDT; /* host addr, a VexGuestX86SegDescr* */
- /* Emulation warnings */
- UInt guest_EMWARN;
+ /* Emulation notes */
+ UInt guest_EMNOTE;
/* For clflush: record start and length of area to invalidate */
UInt guest_TISTART;
diff --git a/pub/libvex_ir.h b/pub/libvex_ir.h
index 6e30817..24d428d 100644
--- a/pub/libvex_ir.h
+++ b/pub/libvex_ir.h
@@ -1833,9 +1833,9 @@
a jump of kind Ijk_TInval.
Re Ijk_EmWarn and Ijk_EmFail: the guest state must have a
- pseudo-register guest_EMWARN, which is 32-bits regardless of the
- host or guest word size. That register should be made to hold an
- EmWarn_* value to indicate the reason for the exit.
+ pseudo-register guest_EMNOTE, which is 32-bits regardless of the
+ host or guest word size. That register should be made to hold a
+ VexEmNote value to indicate the reason for the exit.
In the case of Ijk_EmFail, the exit is fatal (Vex-generated code
cannot continue) and so the jump destination can be anything.