diff options
| author | Andrew Haley <aph@redhat.com> | 2004-10-14 15:21:13 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2004-10-14 15:21:13 +0000 |
| commit | 180a373d0d5d4534d7393b1ad5537d9f9ab7e79e (patch) | |
| tree | f9e1b10a90a60b5918f10b2519f9520b57f64915 /libjava/interpret.cc | |
| parent | b79187bb541c3d842f2a3aee554b4b3f2e63f804 (diff) | |
| download | gcc-180a373d0d5d4534d7393b1ad5537d9f9ab7e79e.tar.gz | |
interpret.cc (_Jv_InterpMethod::run): Initialize _Jv_StartOfInterpreter.
2004-10-13 Andrew Haley <aph@redhat.com>
* interpret.cc (_Jv_InterpMethod::run): Initialize
_Jv_StartOfInterpreter.
(_Jv_StartOfInterpreter, _Jv_EndOfInterpreter): Functions removed.
(_Jv_StartOfInterpreter, _Jv_EndOfInterpreter): New variables.
* gnu/gcj/runtime/natStackTrace.cc (fillInStackTrace): Use
_Unwind_FindEnclosingFunction to discover whether PC is within the
interpreter.
From-SVN: r89037
Diffstat (limited to 'libjava/interpret.cc')
| -rw-r--r-- | libjava/interpret.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 109ee10ff8b..0446c729623 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -774,18 +774,25 @@ _Jv_InterpMethod::compile (const void * const *insn_targets) } #endif /* DIRECT_THREADED */ -// This function exists so that the stack-tracing code can find the -// boundaries of the interpreter. -void -_Jv_StartOfInterpreter (void) -{ -} +// These exist so that the stack-tracing code can find the boundaries +// of the interpreter. +void *_Jv_StartOfInterpreter; +void *_Jv_EndOfInterpreter; +extern "C" void *_Unwind_FindEnclosingFunction (void *pc); void _Jv_InterpMethod::run (void *retp, ffi_raw *args) { using namespace java::lang::reflect; + // Record the address of the start of this member function in + // _Jv_StartOfInterpreter. Such a write to a global variable + // without acquiring a lock is correct iff reads and writes of words + // in memory are atomic, but Java requires that anyway. + foo: + if (_Jv_StartOfInterpreter == NULL) + _Jv_StartOfInterpreter = _Unwind_FindEnclosingFunction (&&foo); + // FRAME_DESC registers this particular invocation as the top-most // interpreter frame. This lets the stack tracing code (for // Throwable) print information about the method being interpreted @@ -3219,13 +3226,6 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args) } } -// This function exists so that the stack-tracing code can find the -// boundaries of the interpreter. -void -_Jv_EndOfInterpreter (void) -{ -} - static void throw_internal_error (char *msg) { |