Add VGA_ prefix to the arch-specific macros {MIN,MAX}_INSTR_SIZE and
REGPARMS.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3458 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mac_shared.h b/memcheck/mac_shared.h
index 1ea7619..c6092e2 100644
--- a/memcheck/mac_shared.h
+++ b/memcheck/mac_shared.h
@@ -383,18 +383,18 @@
Bool (*is_valid_address) ( Addr )
);
-extern REGPARM(1) void MAC_(new_mem_stack_4) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(die_mem_stack_4) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(new_mem_stack_8) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(die_mem_stack_8) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(new_mem_stack_12) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(die_mem_stack_12) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(new_mem_stack_16) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(die_mem_stack_16) ( Addr old_ESP );
-extern REGPARM(1) void MAC_(new_mem_stack_32) ( Addr old_ESP );
-extern 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 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);
/*------------------------------------------------------------*/
@@ -413,7 +413,7 @@
ALIGNED8_NEW, ALIGNED8_DIE, \
UNALIGNED_NEW, UNALIGNED_DIE) \
\
-void REGPARM(1) MAC_(new_mem_stack_4)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(new_mem_stack_4)(Addr new_ESP) \
{ \
PROF_EVENT(110); \
if (VG_IS_4_ALIGNED(new_ESP)) { \
@@ -423,7 +423,7 @@
} \
} \
\
-void REGPARM(1) MAC_(die_mem_stack_4)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(die_mem_stack_4)(Addr new_ESP) \
{ \
PROF_EVENT(120); \
if (VG_IS_4_ALIGNED(new_ESP)) { \
@@ -433,7 +433,7 @@
} \
} \
\
-void REGPARM(1) MAC_(new_mem_stack_8)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(new_mem_stack_8)(Addr new_ESP) \
{ \
PROF_EVENT(111); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -446,7 +446,7 @@
} \
} \
\
-void REGPARM(1) MAC_(die_mem_stack_8)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(die_mem_stack_8)(Addr new_ESP) \
{ \
PROF_EVENT(121); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -459,7 +459,7 @@
} \
} \
\
-void REGPARM(1) MAC_(new_mem_stack_12)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(new_mem_stack_12)(Addr new_ESP) \
{ \
PROF_EVENT(112); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -473,7 +473,7 @@
} \
} \
\
-void REGPARM(1) MAC_(die_mem_stack_12)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(die_mem_stack_12)(Addr new_ESP) \
{ \
PROF_EVENT(122); \
/* Note the -12 in the test */ \
@@ -488,7 +488,7 @@
} \
} \
\
-void REGPARM(1) MAC_(new_mem_stack_16)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(new_mem_stack_16)(Addr new_ESP) \
{ \
PROF_EVENT(113); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -503,7 +503,7 @@
} \
} \
\
-void REGPARM(1) MAC_(die_mem_stack_16)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(die_mem_stack_16)(Addr new_ESP) \
{ \
PROF_EVENT(123); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -518,7 +518,7 @@
} \
} \
\
-void REGPARM(1) MAC_(new_mem_stack_32)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(new_mem_stack_32)(Addr new_ESP) \
{ \
PROF_EVENT(114); \
if (VG_IS_8_ALIGNED(new_ESP)) { \
@@ -537,7 +537,7 @@
} \
} \
\
-void REGPARM(1) MAC_(die_mem_stack_32)(Addr new_ESP) \
+void VGA_REGPARM(1) MAC_(die_mem_stack_32)(Addr new_ESP) \
{ \
PROF_EVENT(124); \
if (VG_IS_8_ALIGNED(new_ESP)) { \