This commit merges in changes from branches/ASPACEM (specifically,
changes from r4341 through r4787 inclusive). That branch is now dead.
Please do not commit anything else to it.
For the most part the merge was not troublesome. The main areas of
uncertainty are:
- build system: I had to import by hand Makefile.core-AM_CPPFLAGS.am
and include it in a couple of places. Building etc seems to still
work, but I haven't tried building the documentation.
- syscall wrappers: Following analysis by Greg & Nick, a whole lot of
stuff was moved from -generic to -linux after the branch was created.
I think that is satisfactorily glued back together now.
- Regtests: although this appears to work, no .out files appear, which
is strange, and makes it hard to diagnose regtest failures. In
particular memcheck/tests/x86/scalar.stderr.exp remains in a
conflicted state.
- amd64 is broken (slightly), and ppc32 will be unbuildable. I'll
attend to the former shortly.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4789 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/pub_core_ume.h b/coregrind/pub_core_ume.h
index 91a29ec..fbf414f 100644
--- a/coregrind/pub_core_ume.h
+++ b/coregrind/pub_core_ume.h
@@ -44,25 +44,28 @@
/*------------------------------------------------------------*/
/* This is only here so it can be shared between stage1 and stage2 */
-extern
-void VG_(foreach_map)(int (*fn)(char *start, char *end,
- const char *perm, off_t offset,
- int maj, int min, int ino, void* extra),
- void* extra);
-/* Jump to 'dst', but first set the stack pointer to 'stack'. Also,
- clear all the integer registers before entering 'dst'. It's
- important that the stack pointer is set to exactly 'stack' and not
- (eg) stack - apparently_harmless_looking_small_offset. Basically
- because the code at 'dst' might be wanting to scan the area above
- 'stack' (viz, the auxv array), and putting spurious words on the
- stack confuses it.
-
- This is only exported so that vgtest_ume.c can use it.
-*/
-extern
-__attribute__((noreturn))
-void VG_(jump_and_switch_stacks) ( Addr stack, Addr dst );
+/* JRS 9 Aug 05: both of these are apparently unused, except by
+ memcheck/tests/vgtest_ume.c. */
+//zz extern
+//zz void VG_(foreach_map)(int (*fn)(char *start, char *end,
+//zz const char *perm, off_t offset,
+//zz int maj, int min, int ino, void* extra),
+//zz void* extra);
+//zz
+//zz /* Jump to 'dst', but first set the stack pointer to 'stack'. Also,
+//zz clear all the integer registers before entering 'dst'. It's
+//zz important that the stack pointer is set to exactly 'stack' and not
+//zz (eg) stack - apparently_harmless_looking_small_offset. Basically
+//zz because the code at 'dst' might be wanting to scan the area above
+//zz 'stack' (viz, the auxv array), and putting spurious words on the
+//zz stack confuses it.
+//zz
+//zz This is only exported so that vgtest_ume.c can use it.
+//zz */
+//zz extern
+//zz __attribute__((noreturn))
+//zz void VG_(jump_and_switch_stacks) ( Addr stack, Addr dst );
/*------------------------------------------------------------*/
@@ -73,7 +76,6 @@
// inputs/outputs of do_exec().
struct exeinfo
{
- Addr map_base; // IN: if non-zero, base address of mappings
char** argv; // IN: the original argv
Addr exe_base; // INOUT: lowest (allowed) address of exe
@@ -112,10 +114,6 @@
extern struct ume_auxv *VG_(find_auxv)(UWord* orig_esp);
-/* Our private auxv entries */
-#define AT_UME_PADFD 0xff01 /* padding file fd */
-#define AT_UME_EXECFD 0xff02 /* stage1 executable fd */
-
#endif /* __PUB_CORE_UME_H */
/*--------------------------------------------------------------------*/