Removed the VGA_/VGO_/VGP_ prefixes for arch/OS/platform-specific
things. These made sense when the arch/OS/platform-specific code was in
one module, but as that code got mixed in with generic code the boundary
between generic and non-generic blurred, and the distinction made less
sense. So let's get rid of them.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4002 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/pub_tool_basics.h b/include/pub_tool_basics.h
index 9b09d07..71370db 100644
--- a/include/pub_tool_basics.h
+++ b/include/pub_tool_basics.h
@@ -117,11 +117,9 @@
#define VG_WORDSIZE VEX_HOST_WORDSIZE
#if defined(VGA_x86)
-# define VGA_REGPARM(n) __attribute__((regparm(n)))
-#elif defined(VGA_amd64) || defined(VGA_arm)
-# define VGA_REGPARM(n) /* */
-#elif defined(VGA_ppc32)
-# define VGA_REGPARM(n) /* */
+# define VG_REGPARM(n) __attribute__((regparm(n)))
+#elif defined(VGA_amd64) || defined(VGA_arm) || defined(VGA_ppc32)
+# define VG_REGPARM(n) /* */
#else
# error Unknown arch
#endif
diff --git a/include/pub_tool_basics_asm.h b/include/pub_tool_basics_asm.h
index 42f13dc..65f4799 100644
--- a/include/pub_tool_basics_asm.h
+++ b/include/pub_tool_basics_asm.h
@@ -49,10 +49,6 @@
#define VG_(str) VGAPPEND(vgPlain_, str)
#define ML_(str) VGAPPEND(vgModuleLocal_, str)
-#define VGA_(str) VGAPPEND(vgArch_, str)
-#define VGO_(str) VGAPPEND(vgOS_, str)
-#define VGP_(str) VGAPPEND(vgPlatform_, str)
-
#endif /* __PUB_TOOL_BASICS_ASM_H */
/*--------------------------------------------------------------------*/
diff --git a/include/pub_tool_machine.h b/include/pub_tool_machine.h
index a707b5f..8d51420 100644
--- a/include/pub_tool_machine.h
+++ b/include/pub_tool_machine.h
@@ -31,24 +31,24 @@
#ifndef __PUB_TOOL_MACHINE_H
#define __PUB_TOOL_MACHINE_H
-/* VGA_STACK_REDZONE_SZB: how many bytes below the stack pointer are validly
+/* VG_STACK_REDZONE_SZB: how many bytes below the stack pointer are validly
* addressible? */
#if defined(VGA_x86)
-# define VGA_MIN_INSTR_SZB 1
-# define VGA_MAX_INSTR_SZB 16
-# define VGA_STACK_REDZONE_SZB 0
+# define VG_MIN_INSTR_SZB 1
+# define VG_MAX_INSTR_SZB 16
+# define VG_STACK_REDZONE_SZB 0
#elif defined(VGA_amd64)
-# define VGA_MIN_INSTR_SZB 1
-# define VGA_MAX_INSTR_SZB 16
-# define VGA_STACK_REDZONE_SZB 128
+# define VG_MIN_INSTR_SZB 1
+# define VG_MAX_INSTR_SZB 16
+# define VG_STACK_REDZONE_SZB 128
#elif defined(VGA_arm)
-# define VGA_MIN_INSTR_SZB 4
-# define VGA_MAX_INSTR_SZB 4
-# define VGA_STACK_REDZONE_SZB 0
+# define VG_MIN_INSTR_SZB 4
+# define VG_MAX_INSTR_SZB 4
+# define VG_STACK_REDZONE_SZB 0
#elif defined(VGA_ppc32)
-# define VGA_MIN_INSTR_SZB 4
-# define VGA_MAX_INSTR_SZB 4
-# define VGA_STACK_REDZONE_SZB 0
+# define VG_MIN_INSTR_SZB 4
+# define VG_MAX_INSTR_SZB 4
+# define VG_STACK_REDZONE_SZB 0
#else
# error Unknown arch
#endif
diff --git a/include/pub_tool_tooliface.h b/include/pub_tool_tooliface.h
index ab39e7c..1d16683 100644
--- a/include/pub_tool_tooliface.h
+++ b/include/pub_tool_tooliface.h
@@ -314,21 +314,21 @@
specialising can optimise things significantly. If any of the
specialised cases are defined, the general case must be defined too.
- Nb: all the specialised ones must use the VGA_REGPARM(n) attribute.
+ Nb: all the specialised ones must use the VG_REGPARM(n) attribute.
*/
-void VG_(track_new_mem_stack_4) (VGA_REGPARM(1) void(*f)(Addr new_ESP));
-void VG_(track_new_mem_stack_8) (VGA_REGPARM(1) void(*f)(Addr new_ESP));
-void VG_(track_new_mem_stack_12)(VGA_REGPARM(1) void(*f)(Addr new_ESP));
-void VG_(track_new_mem_stack_16)(VGA_REGPARM(1) void(*f)(Addr new_ESP));
-void VG_(track_new_mem_stack_32)(VGA_REGPARM(1) void(*f)(Addr new_ESP));
-void VG_(track_new_mem_stack) (void(*f)(Addr a, SizeT len));
+void VG_(track_new_mem_stack_4) (VG_REGPARM(1) void(*f)(Addr new_ESP));
+void VG_(track_new_mem_stack_8) (VG_REGPARM(1) void(*f)(Addr new_ESP));
+void VG_(track_new_mem_stack_12)(VG_REGPARM(1) void(*f)(Addr new_ESP));
+void VG_(track_new_mem_stack_16)(VG_REGPARM(1) void(*f)(Addr new_ESP));
+void VG_(track_new_mem_stack_32)(VG_REGPARM(1) void(*f)(Addr new_ESP));
+void VG_(track_new_mem_stack) (void(*f)(Addr a, SizeT len));
-void VG_(track_die_mem_stack_4) (VGA_REGPARM(1) void(*f)(Addr die_ESP));
-void VG_(track_die_mem_stack_8) (VGA_REGPARM(1) void(*f)(Addr die_ESP));
-void VG_(track_die_mem_stack_12)(VGA_REGPARM(1) void(*f)(Addr die_ESP));
-void VG_(track_die_mem_stack_16)(VGA_REGPARM(1) void(*f)(Addr die_ESP));
-void VG_(track_die_mem_stack_32)(VGA_REGPARM(1) void(*f)(Addr die_ESP));
-void VG_(track_die_mem_stack) (void(*f)(Addr a, SizeT len));
+void VG_(track_die_mem_stack_4) (VG_REGPARM(1) void(*f)(Addr die_ESP));
+void VG_(track_die_mem_stack_8) (VG_REGPARM(1) void(*f)(Addr die_ESP));
+void VG_(track_die_mem_stack_12)(VG_REGPARM(1) void(*f)(Addr die_ESP));
+void VG_(track_die_mem_stack_16)(VG_REGPARM(1) void(*f)(Addr die_ESP));
+void VG_(track_die_mem_stack_32)(VG_REGPARM(1) void(*f)(Addr die_ESP));
+void VG_(track_die_mem_stack) (void(*f)(Addr a, SizeT len));
/* Used for redzone at end of thread stacks */
void VG_(track_ban_mem_stack) (void(*f)(Addr a, SizeT len));