|
From: <sv...@va...> - 2009-06-12 02:23:48
|
Author: njn
Date: 2009-06-12 03:23:28 +0100 (Fri, 12 Jun 2009)
New Revision: 10302
Log:
More file selection via preprocessing. And some minor layout changes.
Modified:
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c
branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-12 02:23:28 UTC (rev 10302)
@@ -321,6 +321,14 @@
m_syswrap/syscall-x86-darwin.S \
m_syswrap/syscall-amd64-darwin.S \
m_syswrap/syswrap-main.c \
+ m_syswrap/syswrap-x86-linux.c \
+ m_syswrap/syswrap-amd64-linux.c \
+ m_syswrap/syswrap-ppc32-linux.c \
+ m_syswrap/syswrap-ppc64-linux.c \
+ m_syswrap/syswrap-ppc32-aix5.c \
+ m_syswrap/syswrap-ppc64-aix5.c \
+ m_syswrap/syswrap-x86-darwin.c \
+ m_syswrap/syswrap-amd64-darwin.c \
m_ume/elf.c \
m_ume/macho.c \
m_ume/main.c \
@@ -370,40 +378,35 @@
libcoregrind_x86_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-x86-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX)
libcoregrind_x86_linux_a_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX)
libcoregrind_amd64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-amd64-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX)
libcoregrind_amd64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX)
libcoregrind_ppc32_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-ppc32-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX)
libcoregrind_ppc32_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX)
libcoregrind_ppc64_linux_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_LINUX_SOURCE) \
- m_syswrap/syswrap-ppc64-linux.c
+ $(COREGRIND_LINUX_SOURCE)
libcoregrind_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX)
libcoregrind_ppc64_linux_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX)
libcoregrind_ppc32_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE) \
- m_syswrap/syswrap-ppc32-aix5.c
+ $(COREGRIND_AIX5_SOURCE)
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5)
@@ -411,8 +414,7 @@
libcoregrind_ppc64_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
- $(COREGRIND_AIX5_SOURCE) \
- m_syswrap/syswrap-ppc64-aix5.c
+ $(COREGRIND_AIX5_SOURCE)
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5)
@@ -422,20 +424,17 @@
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
m_mach/mach_traps-x86-darwin.S \
- m_start-x86-darwin.S \
- m_syswrap/syswrap-x86-darwin.c
+ m_start-x86-darwin.S
nodist_libcoregrind_x86_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN)
libcoregrind_x86_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN)
-
libcoregrind_amd64_darwin_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
$(COREGRIND_DARWIN_SOURCE) \
m_mach/mach_traps-amd64-darwin.S \
- m_start-amd64-darwin.S \
- m_syswrap/syswrap-amd64-darwin.c
+ m_start-amd64-darwin.S
nodist_libcoregrind_amd64_darwin_a_SOURCES = $(COREGRIND_DARWIN_BUILT_SOURCES)
libcoregrind_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN)
libcoregrind_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN)
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syscall-ppc32-linux.S 2009-06-12 02:23:28 UTC (rev 10302)
@@ -158,7 +158,7 @@
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
-#endif defined(VGP_ppc32_linux)
+#endif // defined(VGP_ppc32_linux)
/*--------------------------------------------------------------------*/
/*--- end ---*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-darwin.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -455,3 +457,9 @@
/*NOTREACHED*/
vg_assert(0);
}
+
+#endif // defined(VGP_amd64_darwin)
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_amd64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1373,6 +1375,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_amd64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-linux-variants.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -86,7 +86,6 @@
{
}
-
/*--------------------------------------------------------------------*/
-/*--- end syswrap-linux-variants.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-aix5.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc32_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -908,6 +910,8 @@
return &aix5_ppc32_syscall_table[i].wrappers;
}
+#endif // defined(VGP_ppc32_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc32_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1870,6 +1872,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_ppc32_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-aix5.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -33,6 +33,8 @@
without prior written permission.
*/
+#if defined(VGP_ppc64_aix5)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -788,6 +790,8 @@
return &aix5_ppc64_syscall_table[i].wrappers;
}
+#endif // defined(VGP_ppc64_aix5)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_ppc64_linux)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
@@ -1510,6 +1512,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_ppc64_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-darwin.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_darwin)
+
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_threadstate.h"
@@ -497,6 +499,8 @@
vg_assert(0);
}
+#endif // defined(VGP_x86_darwin)
+
/*--------------------------------------------------------------------*/
-/*--- end syswrap-x86-darwin.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
===================================================================
--- branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c 2009-06-11 11:30:02 UTC (rev 10301)
+++ branches/BUILD_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c 2009-06-12 02:23:28 UTC (rev 10302)
@@ -28,6 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
+#if defined(VGP_x86_linux)
+
/* TODO/FIXME jrs 20050207: assignments to the syscall return result
in interrupted_syscall() need to be reviewed. They don't seem
to assign the shadow state.
@@ -2244,6 +2246,8 @@
const UInt ML_(syscall_table_size) =
sizeof(ML_(syscall_table)) / sizeof(ML_(syscall_table)[0]);
+#endif // defined(VGP_x86_linux)
+
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
|