Rename some arch-specific macros to use the more consistent "VGA_" prefix.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3432 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index 1c079c6..bf1f01f 100644
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -40,9 +40,9 @@
Basic properties
------------------------------------------------------------------ */
-#define VG_ELF_ENDIANNESS ELFDATA2LSB
-#define VG_ELF_MACHINE EM_X86_64
-#define VG_ELF_CLASS ELFCLASS64
+#define VGA_ELF_ENDIANNESS ELFDATA2LSB
+#define VGA_ELF_MACHINE EM_X86_64
+#define VGA_ELF_CLASS ELFCLASS64
#define VGA_WORD_SIZE 8
@@ -51,13 +51,13 @@
------------------------------------------------------------------ */
// Vex field names
-#define ARCH_INSTR_PTR guest_RIP
-#define ARCH_STACK_PTR guest_RSP
-#define ARCH_FRAME_PTR guest_RBP
+#define VGA_INSTR_PTR guest_RIP
+#define VGA_STACK_PTR guest_RSP
+#define VGA_FRAME_PTR guest_RBP
-#define ARCH_CLREQ_ARGS guest_RAX
-#define ARCH_CLREQ_RET guest_RDX
-#define ARCH_PTHREQ_RET guest_RDX
+#define VGA_CLREQ_ARGS guest_RAX
+#define VGA_CLREQ_RET guest_RDX
+#define VGA_PTHREQ_RET guest_RDX
// Register numbers, for vg_symtab2.c
#define R_STACK_PTR 4
diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index 8d60079..0941673 100644
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -41,9 +41,9 @@
Basic properties
------------------------------------------------------------------ */
-#define VG_ELF_ENDIANNESS ELFDATA2LSB
-#define VG_ELF_MACHINE EM_ARM
-#define VG_ELF_CLASS ELFCLASS32
+#define VGA_ELF_ENDIANNESS ELFDATA2LSB
+#define VGA_ELF_MACHINE EM_ARM
+#define VGA_ELF_CLASS ELFCLASS32
#define VGA_WORD_SIZE 4
@@ -57,13 +57,13 @@
// r13 = stack pointer
// r14 = link register
// r15 = program counter
-#define ARCH_INSTR_PTR guest_R15
-#define ARCH_STACK_PTR guest_R13
-#define ARCH_FRAME_PTR guest_R11
+#define VGA_INSTR_PTR guest_R15
+#define VGA_STACK_PTR guest_R13
+#define VGA_FRAME_PTR guest_R11
-#define ARCH_CLREQ_ARGS guest_R0
-#define ARCH_CLREQ_RET guest_R0
-#define ARCH_PTHREQ_RET guest_R0
+#define VGA_CLREQ_ARGS guest_R0
+#define VGA_CLREQ_RET guest_R0
+#define VGA_PTHREQ_RET guest_R0
// Register numbers, for vg_symtab2.c
#define R_STACK_PTR 13
diff --git a/coregrind/arm/signals.c b/coregrind/arm/signals.c
index ccf1f14..717a384 100644
--- a/coregrind/arm/signals.c
+++ b/coregrind/arm/signals.c
@@ -152,7 +152,7 @@
#if 0
#define SET_SIGNAL_ESP(zztid, zzval) \
- SET_THREAD_REG(zztid, zzval, ARCH_STACK_PTR, R_STACK_PTR, \
+ SET_THREAD_REG(zztid, zzval, VGA_STACK_PTR, R_STACK_PTR, \
post_reg_write_deliver_signal)
#endif
diff --git a/coregrind/core.h b/coregrind/core.h
index 9555326..37b5a61 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -1649,17 +1649,17 @@
extern Bool VGA_(getArchAndSubArch)( /*OUT*/VexArch*,
/*OUT*/VexSubArch* );
// Accessors for the ThreadArchState
-#define INSTR_PTR(regs) ((regs).vex.ARCH_INSTR_PTR)
-#define STACK_PTR(regs) ((regs).vex.ARCH_STACK_PTR)
-#define FRAME_PTR(regs) ((regs).vex.ARCH_FRAME_PTR)
-#define CLREQ_ARGS(regs) ((regs).vex.ARCH_CLREQ_ARGS)
-#define PTHREQ_RET(regs) ((regs).vex.ARCH_PTHREQ_RET)
-#define CLREQ_RET(regs) ((regs).vex.ARCH_CLREQ_RET)
+#define INSTR_PTR(regs) ((regs).vex.VGA_INSTR_PTR)
+#define STACK_PTR(regs) ((regs).vex.VGA_STACK_PTR)
+#define FRAME_PTR(regs) ((regs).vex.VGA_FRAME_PTR)
+#define CLREQ_ARGS(regs) ((regs).vex.VGA_CLREQ_ARGS)
+#define PTHREQ_RET(regs) ((regs).vex.VGA_PTHREQ_RET)
+#define CLREQ_RET(regs) ((regs).vex.VGA_CLREQ_RET)
// Offsets for the Vex state
-#define O_STACK_PTR (offsetof(VexGuestArchState, ARCH_STACK_PTR))
-#define O_FRAME_PTR (offsetof(VexGuestArchState, ARCH_FRAME_PTR))
-#define O_CLREQ_RET (offsetof(VexGuestArchState, ARCH_CLREQ_RET))
-#define O_PTHREQ_RET (offsetof(VexGuestArchState, ARCH_PTHREQ_RET))
+#define O_STACK_PTR (offsetof(VexGuestArchState, VGA_STACK_PTR))
+#define O_FRAME_PTR (offsetof(VexGuestArchState, VGA_FRAME_PTR))
+#define O_CLREQ_RET (offsetof(VexGuestArchState, VGA_CLREQ_RET))
+#define O_PTHREQ_RET (offsetof(VexGuestArchState, VGA_PTHREQ_RET))
// Setting up the initial thread (1) state
diff --git a/coregrind/ume.c b/coregrind/ume.c
index 27afedb..cf526c3 100644
--- a/coregrind/ume.c
+++ b/coregrind/ume.c
@@ -161,12 +161,12 @@
fprintf(stderr, "valgrind: %s: bad ELF magic\n", filename);
return NULL;
}
- if (e->e.e_ident[EI_CLASS] != VG_ELF_CLASS) {
+ if (e->e.e_ident[EI_CLASS] != VGA_ELF_CLASS) {
fprintf(stderr, "valgrind: wrong executable class (eg. 32-bit instead\n"
"valgrind: of 64-bit)\n");
return NULL;
}
- if (e->e.e_ident[EI_DATA] != VG_ELF_ENDIANNESS) {
+ if (e->e.e_ident[EI_DATA] != VGA_ELF_ENDIANNESS) {
fprintf(stderr, "valgrind: wrong endian-ness\n");
return NULL;
}
@@ -175,7 +175,7 @@
return NULL;
}
- if (e->e.e_machine != VG_ELF_MACHINE) {
+ if (e->e.e_machine != VGA_ELF_MACHINE) {
fprintf(stderr, "valgrind: wrong architecture\n");
return NULL;
}
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 15962ce..ce3ff9f 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -2709,7 +2709,7 @@
sizeof(VexGuestArchState));
// Record the instr ptr offset, for use by asm code.
- VG_(instr_ptr_offset) = offsetof(VexGuestArchState, ARCH_INSTR_PTR);
+ VG_(instr_ptr_offset) = offsetof(VexGuestArchState, VGA_INSTR_PTR);
//--------------------------------------------------------------
// Initialise the pthread model
diff --git a/coregrind/vg_redir.c b/coregrind/vg_redir.c
index 0046335..79d1d55 100644
--- a/coregrind/vg_redir.c
+++ b/coregrind/vg_redir.c
@@ -578,9 +578,9 @@
//:: /* Called from generated code via helper */
//:: void VG_(wrap_after)(ThreadState *tst)
//:: {
-//:: Addr EIP = ARCH_INSTR_PTR(tst->arch); /* instruction after call */
-//:: Addr ESP = ARCH_STACK_PTR(tst->arch); /* pointer to args */
-//:: Word ret = ARCH_RETVAL(tst->arch); /* return value */
+//:: Addr EIP = VGA_INSTR_PTR(tst->arch); /* instruction after call */
+//:: Addr ESP = VGA_STACK_PTR(tst->arch); /* pointer to args */
+//:: Word ret = VGA_RETVAL(tst->arch); /* return value */
//:: struct call_instance *call;
//:: Bool mf = VG_(my_fault);
//::
diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 8e814d7..3d10210 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -926,12 +926,12 @@
VG_(memset)(ehdr, 0, sizeof(*ehdr));
VG_(memcpy)(ehdr->e_ident, ELFMAG, SELFMAG);
- ehdr->e_ident[EI_CLASS] = VG_ELF_CLASS;
- ehdr->e_ident[EI_DATA] = VG_ELF_ENDIANNESS;
+ ehdr->e_ident[EI_CLASS] = VGA_ELF_CLASS;
+ ehdr->e_ident[EI_DATA] = VGA_ELF_ENDIANNESS;
ehdr->e_ident[EI_VERSION] = EV_CURRENT;
ehdr->e_type = ET_CORE;
- ehdr->e_machine = VG_ELF_MACHINE;
+ ehdr->e_machine = VGA_ELF_MACHINE;
ehdr->e_version = EV_CURRENT;
ehdr->e_entry = 0;
ehdr->e_phoff = sizeof(Elf32_Ehdr);
diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index 4bf2d21..179c582 100644
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -780,11 +780,11 @@
&& ehdr->e_ident[EI_MAG1] == 'E'
&& ehdr->e_ident[EI_MAG2] == 'L'
&& ehdr->e_ident[EI_MAG3] == 'F');
- ok &= (ehdr->e_ident[EI_CLASS] == VG_ELF_CLASS
- && ehdr->e_ident[EI_DATA] == VG_ELF_ENDIANNESS
+ ok &= (ehdr->e_ident[EI_CLASS] == VGA_ELF_CLASS
+ && ehdr->e_ident[EI_DATA] == VGA_ELF_ENDIANNESS
&& ehdr->e_ident[EI_VERSION] == EV_CURRENT);
ok &= (ehdr->e_type == ET_EXEC || ehdr->e_type == ET_DYN);
- ok &= (ehdr->e_machine == VG_ELF_MACHINE);
+ ok &= (ehdr->e_machine == VGA_ELF_MACHINE);
ok &= (ehdr->e_version == EV_CURRENT);
ok &= (ehdr->e_shstrndx != SHN_UNDEF);
ok &= (ehdr->e_shoff != 0 && ehdr->e_shnum != 0);
diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index eb12ec5..8d9006d 100644
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -40,9 +40,9 @@
Basic properties
------------------------------------------------------------------ */
-#define VG_ELF_ENDIANNESS ELFDATA2LSB
-#define VG_ELF_MACHINE EM_386
-#define VG_ELF_CLASS ELFCLASS32
+#define VGA_ELF_ENDIANNESS ELFDATA2LSB
+#define VGA_ELF_MACHINE EM_386
+#define VGA_ELF_CLASS ELFCLASS32
#define VGA_WORD_SIZE 4
@@ -51,13 +51,13 @@
------------------------------------------------------------------ */
// Vex field names
-#define ARCH_INSTR_PTR guest_EIP
-#define ARCH_STACK_PTR guest_ESP
-#define ARCH_FRAME_PTR guest_EBP
+#define VGA_INSTR_PTR guest_EIP
+#define VGA_STACK_PTR guest_ESP
+#define VGA_FRAME_PTR guest_EBP
-#define ARCH_CLREQ_ARGS guest_EAX
-#define ARCH_CLREQ_RET guest_EDX
-#define ARCH_PTHREQ_RET guest_EDX
+#define VGA_CLREQ_ARGS guest_EAX
+#define VGA_CLREQ_RET guest_EDX
+#define VGA_PTHREQ_RET guest_EDX
// Register numbers, for vg_symtab2.c
diff --git a/include/valgrind.h.in b/include/valgrind.h.in
index 1d6fe94..c534985 100644
--- a/include/valgrind.h.in
+++ b/include/valgrind.h.in
@@ -130,7 +130,7 @@
); \
}
// XXX: make sure that the register holding the args and the register taking
-// the return value match ARCH_CLREQ_ARGS and ARCH_CLREQ_RET in
+// the return value match VGA_CLREQ_ARGS and VGA_CLREQ_RET in
// amd64/core_arch.h!
#endif // __amd64__
@@ -175,7 +175,7 @@
asm volatile(""); \
}
// XXX: make sure that the register holding the args and the register taking
-// the return value match ARCH_CLREQ_ARGS and ARCH_CLREQ_RET in
+// the return value match VGA_CLREQ_ARGS and VGA_CLREQ_RET in
// arm/core_arch.h!
#endif // __arm__