Arch-abstraction:

- renamed "vg_constants.h" as "core_asm.h".
- renamed "vg_constants_skin.h" as "tool_asm.h".
- renamed "mc_constants.h" as "mc_asm.h".

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 14a6c2082a89263a10e427d480643fa37e672dab..1ef20f25293e63fa616f44edea88879c125a6c7f 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -140,9 +140,9 @@ vg_inject_so_LDFLAGS = \
 
 noinst_HEADERS = \
        core.h                  \
+       core_asm.h              \
        ume.h                   \
        ume_arch.h              \
-        vg_constants.h          \
        vg_symtab2.h            \
         vg_unistd.h             \
        vg_symtypes.h           \

diff --git a/coregrind/core.h b/coregrind/core.h
index bbcdf32a8e0809ec98e2c0aada34d2756a7dfa35..e99656fb2c06e9ab6302b532dc8c601051be291b 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*--- A header file for all private parts of Valgrind's core.      ---*/
-/*--- Include no other!                                            ---*/
+/*--- Include no other! (more or less...)                          ---*/
 /*---                                                       core.h ---*/
 /*--------------------------------------------------------------------*/
 
@@ -41,7 +41,7 @@
 /* For system call numbers __NR_... */
 #include "vg_unistd.h"
 
-#include "vg_constants.h"
+#include "core_asm.h"
 
 /* All stuff visible to core and tools goes in tool.h.  Things
  * visible to core but not visible to any tools should go in this
@@ -495,7 +495,7 @@ extern Bool  VG_(is_empty_arena) ( ArenaId aid );
 #define VG_USERREQ__INTERNAL_PRINTF_BACKTRACE 0x3104
 
 /* 
-In vg_constants.h:
+In core_asm.h:
 #define VG_USERREQ__SIGNAL_RETURNS          0x4001
 */
 

diff --git a/coregrind/vg_constants.h b/coregrind/core_asm.h
similarity index 95%
rename from coregrind/vg_constants.h
rename to coregrind/core_asm.h
index 781400bea09eca89efdb1f05d77b34b764cf6f9f..9d470d4636dc7affee46d355d7b7161f92a96dc8 100644 (file)
--- a/coregrind/vg_constants.h
+++ b/coregrind/core_asm.h
@@ -1,7 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- A header file containing constants (for assembly code).      ---*/
-/*---                                               vg_constants.h ---*/
+/*--- Asm-specific core stuff.                          core_asm.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -29,10 +28,10 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __VG_CONSTANTS_H
-#define __VG_CONSTANTS_H
+#ifndef __CORE_ASM_H
+#define __CORE_ASM_H
 
-#include "vg_constants_skin.h"
+#include "tool_asm.h"
 
 /* This file is included in all Valgrind source files, including
    assembly ones. */
@@ -181,8 +180,8 @@
  */
 #define VALGRINDCLO    "_VALGRIND_CLO"
 
-#endif /* ndef __VG_CONSTANTS_H */
+#endif /* ndef __CORE_ASM_H */
 
 /*--------------------------------------------------------------------*/
-/*--- end                                           vg_constants.h ---*/
+/*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/vg_cpuid.S b/coregrind/vg_cpuid.S
index 85c63bc323a50a5ebd6a211f9dfd85b40da08a66..4b1ba8ddc5b0ec75581b2542ceda2c79cda9beb4 100644 (file)
--- a/coregrind/vg_cpuid.S
+++ b/coregrind/vg_cpuid.S
@@ -29,7 +29,7 @@
   The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_constants.h"
+#include "core_asm.h"
 #include "vg_unistd.h"
 
 /*

diff --git a/coregrind/vg_dispatch.S b/coregrind/vg_dispatch.S
index 546f5ef0a93e778f42dce7780d0a6280895789a1..111a160e1b2d19cef045bc29d1e126970ab8accc 100644 (file)
--- a/coregrind/vg_dispatch.S
+++ b/coregrind/vg_dispatch.S
@@ -29,7 +29,7 @@
   The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_constants.h"
+#include "core_asm.h"
 
 
 /*------------------------------------------------------------*/

diff --git a/coregrind/vg_helpers.S b/coregrind/vg_helpers.S
index 5d801c3295d0754165acbbb13e6755e5780e5ee0..c4e73cd7468dbde50e0bb480c4c7c56910d4e6df 100644 (file)
--- a/coregrind/vg_helpers.S
+++ b/coregrind/vg_helpers.S
@@ -28,7 +28,7 @@
   The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_constants.h"
+#include "core_asm.h"
 
 /* ------------------ SIMULATED CPU HELPERS ------------------ */
 /* A stubs for a return which we want to catch: a signal return.

diff --git a/coregrind/vg_syscall.S b/coregrind/vg_syscall.S
index e46d1b46651bab75c94f0f289fc5873ddcc84663..7258adc6a89874707f7c185f1e8b5ce3105961e5 100644 (file)
--- a/coregrind/vg_syscall.S
+++ b/coregrind/vg_syscall.S
@@ -29,7 +29,7 @@
   The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_constants.h"
+#include "core_asm.h"
 #include "vg_unistd.h"
 
 .globl VG_(do_syscall)

diff --git a/include/Makefile.am b/include/Makefile.am
index 4f799ca0b3f4ceba5d9b399799ca119370c9c1f1..3861cf5e345e2401dc54719bb212942960637a86 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,9 +5,9 @@ EXTRA_DIST = \
 incincdir = $(includedir)/valgrind
 
 incinc_HEADERS = \
-       valgrind.h \
-       vg_constants_skin.h \
        tool.h \
+       tool_asm.h \
+       valgrind.h \
        vg_kerneliface.h \
        vg_skin.h
 

diff --git a/include/tool.h.base b/include/tool.h.base
index 9049dd446572e7a6c5412ca6550a9f8cfe2ae2eb..c9d065f4f7714841af80f18d113adb36422d28a3 100644 (file)
--- a/include/tool.h.base
+++ b/include/tool.h.base
@@ -34,7 +34,7 @@
 #include <stdarg.h>       /* ANSI varargs stuff  */
 #include <setjmp.h>       /* for jmp_buf         */
 
-#include "vg_constants_skin.h"
+#include "tool_asm.h"
 
 // XXX: here temporarily, will eventually go in arch-specific headers...
 #define REGPARM(x)     __attribute__((regparm (x)))

diff --git a/include/vg_constants_skin.h b/include/tool_asm.h
similarity index 87%
rename from include/vg_constants_skin.h
rename to include/tool_asm.h
index 3d2ee616793d8aaf3f567877c3a7cb446232e24d..9480ff579f4ceb8fe37d555c9517b57bf1e8b2e8 100644 (file)
--- a/include/vg_constants_skin.h
+++ b/include/tool_asm.h
@@ -1,7 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- A header file containing constants (for assembly code).      ---*/
-/*---                                               vg_constants.h ---*/
+/*--- Tool-specific, asm-specific includes.             tool_asm.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -29,8 +28,8 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __VG_CONSTANTS_SKIN_H
-#define __VG_CONSTANTS_SKIN_H
+#ifndef __TOOL_ASM_H
+#define __TOOL_ASM_H
 
 
 /* All symbols externally visible from valgrind.so are prefixed
@@ -54,8 +53,8 @@
 #define _STR(x)        #x
 #define STR(x) _STR(x)
 
-#endif /* ndef __VG_CONSTANTS_SKIN_H */
+#endif /* ndef __TOOL_ASM_H */
 
 /*--------------------------------------------------------------------*/
-/*--- end                                           vg_constants.h ---*/
+/*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index a19a9062d8879027463e1a8c6e6683312cdd06a5..86b6d7d5da0ab117e132343d901c4748867ee96f 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -30,7 +30,7 @@ mcinclude_HEADERS = \
 
 noinst_HEADERS =       \
        mac_shared.h    \
-       mc_constants.h  \
+       mc_asm.h        \
        mc_include.h
 
 mac_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer

diff --git a/memcheck/mc_constants.h b/memcheck/mc_asm.h
similarity index 83%
rename from memcheck/mc_constants.h
rename to memcheck/mc_asm.h
index 3ca0f1b09d98e6fab894712f738df3bb37926fae..cf4a736f24088c69937fb00af268e7c24dc1eaee 100644 (file)
--- a/memcheck/mc_constants.h
+++ b/memcheck/mc_asm.h
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*---                                               mc_constants.h ---*/
+/*---                                                     mc_asm.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -28,16 +28,16 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __MC_CONSTANTS_H
-#define __MC_CONSTANTS_H
+#ifndef __MC_ASM_H
+#define __MC_ASM_H
 
-#include "vg_constants_skin.h"
+#include "tool_asm.h"
 
 #define MC_(str)    VGAPPEND(vgMemCheck_,str)
 
-#endif   /* __MC_CONSTANTS_H */
+#endif   /* __MC_ASM_H */
 
 /*--------------------------------------------------------------------*/
-/*--- end                                           mc_constants.h ---*/
+/*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
 

diff --git a/memcheck/mc_helpers.S b/memcheck/mc_helpers.S
index 321be66a82d026a3344cdd05175ccdf48af803be..c56642de936499a45bc3a41abb7950605782595c 100644 (file)
--- a/memcheck/mc_helpers.S
+++ b/memcheck/mc_helpers.S
@@ -29,7 +29,7 @@
   The GNU General Public License is contained in the file COPYING.
 */
 
-#include "mc_constants.h"
+#include "mc_asm.h"
 
 .global MC_(helper_value_check0_fail)
 MC_(helper_value_check0_fail):

diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 9396cb7f9c0ee10e5819d229ba3091c2183292a5..948cef8ab6c65bf12d035b062bfc0dd8dde3ab27 100644 (file)
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -37,7 +37,7 @@
 #define __MC_INCLUDE_H
 
 #include "mac_shared.h"
-#include "mc_constants.h"
+#include "mc_asm.h"
 
 /*------------------------------------------------------------*/
 /*--- Types                                                ---*/

diff --git a/valgrind.spec.in b/valgrind.spec.in
index 8a4888cc2c8d00cad81af8f16ec8ac6cc63cc636..c16a2db13b1709e4451e7d392c6b93f7c6d461bb 100644 (file)
--- a/valgrind.spec.in
+++ b/valgrind.spec.in
@@ -37,7 +37,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 /usr/include/valgrind/memcheck.h
 /usr/include/valgrind/helgrind.h
 /usr/include/valgrind/tool.h
-/usr/include/valgrind/vg_constants_skin.h
+/usr/include/valgrind/tool_asm.h
 /usr/include/valgrind/vg_kerneliface.h
 /usr/include/valgrind/vg_skin.h
 /usr/bin/valgrind