Arch-abstraction:

- Moved all assembly files in coregrind/ into coregrind/x86/.

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

diff --git a/Makefile.core-AM_CPPFLAGS.am b/Makefile.core-AM_CPPFLAGS.am
index 2e889b4f1080dd875989f50ac7c735869dc8d49a..ddf6578ee3024a4b40fb0ddd905098bfe5329da4 100644 (file)
--- a/Makefile.core-AM_CPPFLAGS.am
+++ b/Makefile.core-AM_CPPFLAGS.am
@@ -5,4 +5,5 @@ add_includes = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
                -I$(top_srcdir)/include/$(VG_ARCH)
 
 AM_CPPFLAGS = $(add_includes)
+AM_CCASFLAGS = $(add_includes)
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 2d4497b86de38de7d983cdc229073f77a1bf8451..6bbdaf96156486b459a011a00d77019ceb8b9c75 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" -I$(srcdir)/demangle \
                -DVG_PLATFORM="\"$(VG_PLATFORM)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g -DELFSZ=32
-AM_CCASFLAGS = $(add_includes) -I..
 
 default.supp: $(SUPP_FILES)
 
@@ -49,12 +48,10 @@ stage2_SOURCES = \
        vg_scheduler.c \
        vg_default.c \
        vg_demangle.c \
-       vg_dispatch.S \
        vg_errcontext.c \
        vg_execontext.c \
        vg_from_ucode.c \
        vg_hashtable.c \
-       vg_helpers.S \
        vg_instrument.c \
        vg_main.c \
        vg_malloc2.c \
@@ -72,12 +69,10 @@ stage2_SOURCES = \
        vg_skiplist.c \
        vg_symtypes.c \
        vg_syscalls.c \
-       vg_syscall.S \
        vg_to_ucode.c \
        vg_toolint.c \
        vg_translate.c \
-       vg_transtab.c \
-       vg_cpuid.S
+       vg_transtab.c
 stage2_DEPENDENCIES = $(srcdir)/valgrind.vs ${VG_ARCH}/stage2.lds
 stage2_LDFLAGS=-Wl,--export-dynamic -g \
        -Wl,-defsym,kickstart_base=$(KICKSTART_BASE) \
@@ -116,7 +111,7 @@ vg_toolint.h:  $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def ./Makefile
 libpthread_so_SOURCES = \
        vg_libpthread.c \
        vg_libpthread_unimp.c \
-       vg_syscall.S \
+       ${VG_ARCH}/syscall.S \
        ${VG_ARCH}/libpthread.c 
 libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
 libpthread_so_LDFLAGS     = -Werror -fno-omit-frame-pointer -UVG_LIBDIR \

diff --git a/coregrind/x86/Makefile.am b/coregrind/x86/Makefile.am
index c0142a63055f19ce228d818819e448a315aeee98..ca3e831a6b63f2c54cd14d140e8a54b723ef118a 100644 (file)
--- a/coregrind/x86/Makefile.am
+++ b/coregrind/x86/Makefile.am
@@ -18,6 +18,10 @@ BUILT_SOURCES = stage2.lds
 CLEANFILES = stage2.lds
 
 libarch_a_SOURCES = \
+       cpuid.S \
+       helpers.S \
+       dispatch.S \
+       syscall.S \
        signal.c \
        state.c
 

diff --git a/coregrind/vg_cpuid.S b/coregrind/x86/cpuid.S
similarity index 91%
rename from coregrind/vg_cpuid.S
rename to coregrind/x86/cpuid.S
index 439e6e12584bca8eb680730b65c6ba347d23f1d8..4e067f2f08da04c90aa8221a86647d45e25349b8 100644 (file)
--- a/coregrind/vg_cpuid.S
+++ b/coregrind/x86/cpuid.S
@@ -1,7 +1,6 @@
 
 ##--------------------------------------------------------------------##
-##--- Support for determining CPU characteristics.                 ---##
-##---                                                   vg_cpuid.S ---##
+##--- Support for determining CPU characteristics.     x86/cpuid.S ---##
 ##--------------------------------------------------------------------##
 
 /*
@@ -30,7 +29,6 @@
 */
 
 #include "core_asm.h"
-#include "vki_unistd.h"
 
 /*
     int VG_(cpuid)(UInt eax,
@@ -80,5 +78,5 @@ VG_(cpuid):
 .section .note.GNU-stack,"",@progbits
 
 ##--------------------------------------------------------------------##
-##--- end                                              vg_cpuid.S ---##
+##--- end                                                         ---##
 ##--------------------------------------------------------------------##

diff --git a/coregrind/vg_dispatch.S b/coregrind/x86/dispatch.S
similarity index 98%
rename from coregrind/vg_dispatch.S
rename to coregrind/x86/dispatch.S
index 111a160e1b2d19cef045bc29d1e126970ab8accc..4cf202edf384cb4491ac4bd9dd7e6de3dc2b639f 100644 (file)
--- a/coregrind/vg_dispatch.S
+++ b/coregrind/x86/dispatch.S
@@ -1,7 +1,7 @@
 
 ##--------------------------------------------------------------------##
 ##--- The core dispatch loop, for jumping to a code address.       ---##
-##---                                                vg_dispatch.S ---##
+##---                                               x86/dispatch.S ---##
 ##--------------------------------------------------------------------##
 
 /*
@@ -227,5 +227,5 @@ panic_msg_ebp:
 .section .note.GNU-stack,"",@progbits
 
 ##--------------------------------------------------------------------##
-##--- end                                            vg_dispatch.S ---##
+##--- end                                                          ---##
 ##--------------------------------------------------------------------##

diff --git a/coregrind/vg_helpers.S b/coregrind/x86/helpers.S
similarity index 98%
rename from coregrind/vg_helpers.S
rename to coregrind/x86/helpers.S
index c4e73cd7468dbde50e0bb480c4c7c56910d4e6df..f5a777bd80c00323e00e3830f3bee3867ee35ed7 100644 (file)
--- a/coregrind/vg_helpers.S
+++ b/coregrind/x86/helpers.S
@@ -1,6 +1,6 @@
 ##--------------------------------------------------------------------##
 ##--- Support routines for the JITter output.                      ---##
-##---                                                 vg_helpers.S ---##
+##---                                                x86/helpers.S ---##
 ##--------------------------------------------------------------------##
 
 /*
@@ -728,5 +728,5 @@ VG_(helper_undefined_instruction):
 .section .note.GNU-stack,"",@progbits
                
 ##--------------------------------------------------------------------##
-##--- end                                             vg_helpers.S ---##
+##--- end                                                          ---##
 ##--------------------------------------------------------------------##

diff --git a/coregrind/vg_syscall.S b/coregrind/x86/syscall.S
similarity index 96%
rename from coregrind/vg_syscall.S
rename to coregrind/x86/syscall.S
index 24249c13ac68a599c172b130504e2e8a9fa72507..d0c0696e82790f18d29b9a9c33422e827afcd9f1 100644 (file)
--- a/coregrind/vg_syscall.S
+++ b/coregrind/x86/syscall.S
@@ -1,7 +1,6 @@
 
 ##--------------------------------------------------------------------##
-##--- Support for doing system calls.                              ---##
-##---                                                 vg_syscall.S ---##
+##--- Support for doing system calls.                x86/syscall.S ---##
 ##--------------------------------------------------------------------##
 
 /*