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/memcheck/mac_shared.h b/memcheck/mac_shared.h
index 785ef97..88b9f3a 100644
--- a/memcheck/mac_shared.h
+++ b/memcheck/mac_shared.h
@@ -421,18 +421,18 @@
Bool (*is_valid_aligned_word) ( Addr )
);
-extern VGA_REGPARM(1) void MAC_(new_mem_stack_4) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(die_mem_stack_4) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(new_mem_stack_8) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(die_mem_stack_8) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(new_mem_stack_12) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(die_mem_stack_12) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(new_mem_stack_16) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(die_mem_stack_16) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(new_mem_stack_32) ( Addr old_ESP );
-extern VGA_REGPARM(1) void MAC_(die_mem_stack_32) ( Addr old_ESP );
-extern void MAC_(die_mem_stack) ( Addr a, SizeT len);
-extern void MAC_(new_mem_stack) ( Addr a, SizeT len);
+extern VG_REGPARM(1) void MAC_(new_mem_stack_4) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(die_mem_stack_4) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(new_mem_stack_8) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(die_mem_stack_8) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(new_mem_stack_12) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(die_mem_stack_12) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(new_mem_stack_16) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(die_mem_stack_16) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(new_mem_stack_32) ( Addr old_ESP );
+extern VG_REGPARM(1) void MAC_(die_mem_stack_32) ( Addr old_ESP );
+extern void MAC_(die_mem_stack) ( Addr a, SizeT len);
+extern void MAC_(new_mem_stack) ( Addr a, SizeT len);
extern void* MAC_(malloc) ( ThreadId tid, SizeT n );
extern void* MAC_(__builtin_new) ( ThreadId tid, SizeT n );
@@ -460,159 +460,159 @@
ALIGNED8_NEW, ALIGNED8_DIE, \
UNALIGNED_NEW, UNALIGNED_DIE) \
\
-void VGA_REGPARM(1) MAC_(new_mem_stack_4)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(new_mem_stack_4)(Addr new_SP) \
{ \
PROF_EVENT(110, "new_mem_stack_4"); \
if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
} else { \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + new_SP, 4 ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + new_SP, 4 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(die_mem_stack_4)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(die_mem_stack_4)(Addr new_SP) \
{ \
PROF_EVENT(120, "die_mem_stack_4"); \
if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4 ); \
} else { \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4, 4 ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4, 4 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(new_mem_stack_8)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(new_mem_stack_8)(Addr new_SP) \
{ \
PROF_EVENT(111, "new_mem_stack_8"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+4 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP+4 ); \
} else { \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + new_SP, 8 ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + new_SP, 8 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(die_mem_stack_8)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(die_mem_stack_8)(Addr new_SP) \
{ \
PROF_EVENT(121, "die_mem_stack_8"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-8 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-8 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-8 ); \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-8 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4 ); \
} else { \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-8, 8 ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + new_SP-8, 8 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(new_mem_stack_12)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(new_mem_stack_12)(Addr new_SP) \
{ \
PROF_EVENT(112, "new_mem_stack_12"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+8 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP+8 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+4 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+4 ); \
} else { \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + new_SP, 12 ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + new_SP, 12 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(die_mem_stack_12)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(die_mem_stack_12)(Addr new_SP) \
{ \
PROF_EVENT(122, "die_mem_stack_12"); \
/* Note the -12 in the test */ \
if (VG_IS_8_ALIGNED(new_SP-12)) { \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-12 ); \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-12 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-12 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-8 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-12 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-8 ); \
} else { \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-12, 12 ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + new_SP-12, 12 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(new_mem_stack_16)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(new_mem_stack_16)(Addr new_SP) \
{ \
PROF_EVENT(113, "new_mem_stack_16"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+8 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+8 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+4 ); \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+12 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+4 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP+12 ); \
} else { \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + new_SP, 16 ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + new_SP, 16 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(die_mem_stack_16)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(die_mem_stack_16)(Addr new_SP) \
{ \
PROF_EVENT(123, "die_mem_stack_16"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-16 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-8 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-16 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-8 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-16 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-12 ); \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-16 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-12 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4 ); \
} else { \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-16, 16 ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + new_SP-16, 16 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(new_mem_stack_32)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(new_mem_stack_32)(Addr new_SP) \
{ \
PROF_EVENT(114, "new_mem_stack_32"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+8 ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+16 ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+24 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+8 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+16 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+24 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+4 ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+12 ); \
- ALIGNED8_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+20 ); \
- ALIGNED4_NEW ( -VGA_STACK_REDZONE_SZB + new_SP+28 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+4 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+12 ); \
+ ALIGNED8_NEW ( -VG_STACK_REDZONE_SZB + new_SP+20 ); \
+ ALIGNED4_NEW ( -VG_STACK_REDZONE_SZB + new_SP+28 ); \
} else { \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + new_SP, 32 ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + new_SP, 32 ); \
} \
} \
\
-void VGA_REGPARM(1) MAC_(die_mem_stack_32)(Addr new_SP) \
+void VG_REGPARM(1) MAC_(die_mem_stack_32)(Addr new_SP) \
{ \
PROF_EVENT(124, "die_mem_stack_32"); \
if (VG_IS_8_ALIGNED(new_SP)) { \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-32 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-24 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-16 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP- 8 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-32 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-24 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-16 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP- 8 ); \
} else if (VG_IS_4_ALIGNED(new_SP)) { \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-32 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-28 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-20 ); \
- ALIGNED8_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-12 ); \
- ALIGNED4_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-4 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-32 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-28 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-20 ); \
+ ALIGNED8_DIE ( -VG_STACK_REDZONE_SZB + new_SP-12 ); \
+ ALIGNED4_DIE ( -VG_STACK_REDZONE_SZB + new_SP-4 ); \
} else { \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + new_SP-32, 32 ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + new_SP-32, 32 ); \
} \
} \
\
void MAC_(new_mem_stack) ( Addr a, SizeT len ) \
{ \
PROF_EVENT(115, "new_mem_stack"); \
- UNALIGNED_NEW ( -VGA_STACK_REDZONE_SZB + a, len ); \
+ UNALIGNED_NEW ( -VG_STACK_REDZONE_SZB + a, len ); \
} \
\
void MAC_(die_mem_stack) ( Addr a, SizeT len ) \
{ \
PROF_EVENT(125, "die_mem_stack"); \
- UNALIGNED_DIE ( -VGA_STACK_REDZONE_SZB + a, len ); \
+ UNALIGNED_DIE ( -VG_STACK_REDZONE_SZB + a, len ); \
}
#endif /* __MAC_SHARED_H */