Use "VGA_" prefix more consistently for arch-specific things.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3433

diff --git a/coregrind/amd64-linux/syscalls.c b/coregrind/amd64-linux/syscalls.c
index eae137daf5e6e272bba94e103d4e109b498a2ec7..05323e3989ac7ca51b848619715cba0983078390 100644 (file)
--- a/coregrind/amd64-linux/syscalls.c
+++ b/coregrind/amd64-linux/syscalls.c
@@ -189,7 +189,7 @@ static ULong *allocstack(ThreadId tid)
    UInt*  pUInt;
 
    if (tst->os_state.stack == NULL) {
-      void *stk = VG_(mmap)(0, VG_STACK_SIZE_W * sizeof(Int) + VKI_PAGE_SIZE,
+      void *stk = VG_(mmap)(0, VGA_STACK_SIZE_W * sizeof(Int) + VKI_PAGE_SIZE,
                            VKI_PROT_READ|VKI_PROT_WRITE,
                            VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS,
                            SF_VALGRIND,

diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index bf1f01fc0834278368d02ce446cf1945a3b0577a..681539012c26586eeecbf3c6e0e2e001b4933841 100644 (file)
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -123,16 +123,17 @@ struct _ThreadArchAux {
    ------------------------------------------------------------------ */
 
 // Valgrind's signal stack size, in words.
-#define VG_SIGSTACK_SIZE_W    10000
+#define VGA_SIGSTACK_SIZE_W   10000
 
 // Valgrind's stack size, in words.
-#define VG_STACK_SIZE_W    16384
+#define VGA_STACK_SIZE_W      16384
 
 // Base address of client address space.
-#define CLIENT_BASE    0x00000000ul
+#define VGA_CLIENT_BASE       0x0ul
 
 #endif   // __AMD64_CORE_ARCH_H
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
+

diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index 094167378c14d1458258f47a6a7e1a026657b223..00d5dcfed6c9a4f0ee7d8d9679226ce0542096a6 100644 (file)
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -118,10 +118,10 @@ struct _ThreadArchAux {
    ------------------------------------------------------------------ */
 
 // Valgrind's signal stack size, in words.
-#define VG_SIGSTACK_SIZE_W    10000
+#define VGA_SIGSTACK_SIZE_W   10000
 
 // Base address of client address space.
-#define CLIENT_BASE    0x00000000ul
+#define VGA_CLIENT_BASE       0x0ul
 
 #endif   // __ARM_CORE_ARCH_H
 

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index ce3ff9f23dba4d9983cfd12e0d726d0065feb811..59389a567f6cb7fbda5fdb169571fe181818230c 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -396,7 +396,7 @@ static void layout_remaining_space(Addr argc_addr, float ratio)
    // taking into account the tool's shadow needs.
    client_size         = ROUNDDN((VG_(valgrind_base)-REDZONE_SIZE) / (1.+ratio),
                          CLIENT_SIZE_MULTIPLE);
-   VG_(client_base)    = CLIENT_BASE;
+   VG_(client_base)    = VGA_CLIENT_BASE;
    VG_(client_end)     = VG_(client_base) + client_size;
    /* where !FIXED mmap goes */
    VG_(client_mapbase) = VG_(client_base) +
@@ -2396,7 +2396,7 @@ void VG_(sanity_check_general) ( Bool force_expensive )
 
   The memory map it creates is:
 
-  CLIENT_BASE    +-------------------------+
+ VGA_CLIENT_BASE +-------------------------+
                  | client address space    |
                 :                         :
                 :                         :

diff --git a/coregrind/x86-linux/syscalls.c b/coregrind/x86-linux/syscalls.c
index 1fe922d383d170d3e7c00a020fed4c9fb6f5a32e..998c90ce6c32cd7b236ea6ddb4964ee22456f1a8 100644 (file)
--- a/coregrind/x86-linux/syscalls.c
+++ b/coregrind/x86-linux/syscalls.c
@@ -186,7 +186,7 @@ static UInt *allocstack(ThreadId tid)
    UInt *esp;
 
    if (tst->os_state.stack == NULL) {
-      void *stk = VG_(mmap)(0, VG_STACK_SIZE_W * sizeof(Int) + VKI_PAGE_SIZE,
+      void *stk = VG_(mmap)(0, VGA_STACK_SIZE_W * sizeof(Int) + VKI_PAGE_SIZE,
                            VKI_PROT_READ|VKI_PROT_WRITE,
                            VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS,
                            SF_VALGRIND,
@@ -195,7 +195,7 @@ static UInt *allocstack(ThreadId tid)
       if (stk != (void *)-1) {
         VG_(mprotect)(stk, VKI_PAGE_SIZE, VKI_PROT_NONE); /* guard page */
         tst->os_state.stack = (UInt *)stk + VKI_PAGE_SIZE/sizeof(UInt);
-        tst->os_state.stacksize = VG_STACK_SIZE_W;
+        tst->os_state.stacksize = VGA_STACK_SIZE_W;
       } else 
         return (UInt *)-1;
    }

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index 8d9006db995709c52e268b7a9499af348116e20e..63a2f546f9c85f90d289341d83ed030bb26f97a4 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -118,13 +118,13 @@ typedef VexGuestX86State VexGuestArchState;
    ------------------------------------------------------------------ */
 
 // Valgrind's signal stack size, in words.
-#define VG_SIGSTACK_SIZE_W    10000
+#define VGA_SIGSTACK_SIZE_W   10000
 
 // Valgrind's stack size, in words.
-#define VG_STACK_SIZE_W    16384
+#define VGA_STACK_SIZE_W      16384
 
 // Base address of client address space.
-#define CLIENT_BASE    0x00000000ul
+#define VGA_CLIENT_BASE       0x0ul
 
 /* ---------------------------------------------------------------------
    Signal stuff (should be plat)