From: Nicholas Nethercote Date: Tue, 19 Oct 2004 13:48:06 +0000 (+0000) Subject: Arch-abstraction: X-Git-Tag: svn/VALGRIND_3_0_0~1496 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b44d1df7d2ecc25a4a75c374975978b5040a6ad;p=thirdparty%2Fvalgrind.git 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 2e889b4f10..ddf6578ee3 100644 --- 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 2d4497b86d..6bbdaf9615 100644 --- 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 c0142a6305..ca3e831a6b 100644 --- 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 439e6e1258..4e067f2f08 100644 --- 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 111a160e1b..4cf202edf3 100644 --- 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 c4e73cd746..f5a777bd80 100644 --- 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 24249c13ac..d0c0696e82 100644 --- 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 ---## ##--------------------------------------------------------------------## /*