From: Nicholas Nethercote <njn@valgrind.org>
Date: Sat, 26 Mar 2005 00:18:45 +0000 (+0000)
Subject: Use "VGA_" prefix more consistently for arch-specific things.
X-Git-Tag: svn/VALGRIND_3_0_0~885
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb6c8b4bd25c812ef3a0a17efd1180c118639134;p=thirdparty%2Fvalgrind.git

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 eae137daf5..05323e3989 100644
--- 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 bf1f01fc08..681539012c 100644
--- 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 094167378c..00d5dcfed6 100644
--- 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 ce3ff9f23d..59389a567f 100644
--- 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 1fe922d383..998c90ce6c 100644
--- 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 8d9006db99..63a2f546f9 100644
--- 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)