|
From: <sv...@va...> - 2005-06-19 21:50:31
|
Author: njn
Date: 2005-06-19 22:49:28 +0100 (Sun, 19 Jun 2005)
New Revision: 3961
Log:
Put VG_(client_trampoline_code) in m_trampoline.
Modified:
trunk/coregrind/m_aspacemgr/aspacemgr.c
trunk/coregrind/m_stacktrace.c
trunk/coregrind/m_trampoline.S
trunk/coregrind/pub_core_aspacemgr.h
trunk/coregrind/pub_core_trampoline.h
Modified: trunk/coregrind/m_aspacemgr/aspacemgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_aspacemgr/aspacemgr.c 2005-06-19 21:10:42 UTC (rev =
3960)
+++ trunk/coregrind/m_aspacemgr/aspacemgr.c 2005-06-19 21:49:28 UTC (rev =
3961)
@@ -60,7 +60,6 @@
Addr VG_(client_base); /* client address space limits */
Addr VG_(client_end);
Addr VG_(client_mapbase);
-Addr VG_(client_trampoline_code);
Addr VG_(clstk_base);
Addr VG_(clstk_end);
UWord VG_(clstk_id);
Modified: trunk/coregrind/m_stacktrace.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_stacktrace.c 2005-06-19 21:10:42 UTC (rev 3960)
+++ trunk/coregrind/m_stacktrace.c 2005-06-19 21:49:28 UTC (rev 3961)
@@ -31,6 +31,7 @@
#include "pub_core_basics.h"
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
+#include "pub_core_debuginfo.h"
#include "pub_core_libcbase.h"
#include "pub_core_libcassert.h"
#include "pub_core_libcprint.h"
Modified: trunk/coregrind/m_trampoline.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_trampoline.S 2005-06-19 21:10:42 UTC (rev 3960)
+++ trunk/coregrind/m_trampoline.S 2005-06-19 21:49:28 UTC (rev 3961)
@@ -37,6 +37,7 @@
space at an arbitary address. Therefore, this code must be completel=
y
position-independent.
*/
+.global VG_(client_trampoline_code)
.global VG_(trampoline_code_start)
.global VG_(trampoline_code_length)
.global VG_(tramp_sigreturn_offset)
@@ -101,6 +102,8 @@
tramp_code_end:
=09
.data
+VG_(client_trampoline_code):
+ .long 0
VG_(trampoline_code_length):
.long tramp_code_end - VG_(trampoline_code_start)
VG_(tramp_sigreturn_offset):
Modified: trunk/coregrind/pub_core_aspacemgr.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_aspacemgr.h 2005-06-19 21:10:42 UTC (rev 396=
0)
+++ trunk/coregrind/pub_core_aspacemgr.h 2005-06-19 21:49:28 UTC (rev 396=
1)
@@ -50,7 +50,6 @@
extern Addr VG_(clstk_base); // client stack range
extern Addr VG_(clstk_end);
extern UWord VG_(clstk_id); // client stack id
-extern Addr VG_(client_trampoline_code);
=20
extern Addr VG_(brk_base); // start of brk
extern Addr VG_(brk_limit); // current brk
Modified: trunk/coregrind/pub_core_trampoline.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_trampoline.h 2005-06-19 21:10:42 UTC (rev 39=
60)
+++ trunk/coregrind/pub_core_trampoline.h 2005-06-19 21:49:28 UTC (rev 39=
61)
@@ -36,6 +36,8 @@
// over the client's, for arcane signal return and syscall purposes...
//--------------------------------------------------------------------
=20
+extern Addr VG_(client_trampoline_code);
+
// Platform-specifics aren't neatly factored out here, since some of the
// constants are not used on all platforms. But it's non-obvious how
// to do it better.
|