diff options
author | Andrew Haley <aph@redhat.com> | 2007-01-24 17:13:50 +0000 |
---|---|---|
committer | Andrew Haley <aph@gcc.gnu.org> | 2007-01-24 17:13:50 +0000 |
commit | 8cda32ad5652b9af45466973f1d0c0c8fec2f1de (patch) | |
tree | 921c73a3acbebbe5bffac1e41ad9a7332e15199f /libjava/gnu/classpath | |
parent | c863b570e4f51fd56a80bec9d9aaeb51f9847543 (diff) | |
download | gcc-8cda32ad5652b9af45466973f1d0c0c8fec2f1de.zip gcc-8cda32ad5652b9af45466973f1d0c0c8fec2f1de.tar.gz gcc-8cda32ad5652b9af45466973f1d0c0c8fec2f1de.tar.bz2 |
natVMStackWalker.cc: Call InitClass everywhere.
2007-01-24 Andrew Haley <aph@redhat.com>
* gnu/classpath/natVMStackWalker.cc: Call InitClass everywhere.
(getClassContext) Add a barrier to prevent GetStackWalkerStack()
from being sibcalled.
2007-01-24 Andrew Haley <aph@redhat.com>
* scripts/makemake.tcl (emit_bc_rule): Set the source filename.
* sources.am: Rebuild.
From-SVN: r121119
Diffstat (limited to 'libjava/gnu/classpath')
-rw-r--r-- | libjava/gnu/classpath/natVMStackWalker.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libjava/gnu/classpath/natVMStackWalker.cc b/libjava/gnu/classpath/natVMStackWalker.cc index 07ec48c..621a95b 100644 --- a/libjava/gnu/classpath/natVMStackWalker.cc +++ b/libjava/gnu/classpath/natVMStackWalker.cc @@ -17,22 +17,29 @@ details. */ #include <gnu/classpath/VMStackWalker.h> #include <gnu/gcj/RawData.h> #include <java/lang/ClassLoader.h> +#include <java/lang/Class.h> JArray<jclass> * gnu::classpath::VMStackWalker::getClassContext(void) { - return _Jv_StackTrace::GetStackWalkerStack (); + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); + JArray<jclass> *result = _Jv_StackTrace::GetStackWalkerStack (); + // Prevent GetStackWalkerStack() from being sibcalled. + __asm__ __volatile__ ("" : : "g" (result)); + return result; } jclass gnu::classpath::VMStackWalker::getCallingClass(void) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); return _Jv_StackTrace::GetStackWalkerCallingClass (); } jclass gnu::classpath::VMStackWalker::getCallingClass(::gnu::gcj::RawData *pc) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); void *f = _Unwind_FindEnclosingFunction (pc); // FIXME: it might well be a good idea to cache pc values here in @@ -57,12 +64,14 @@ gnu::classpath::VMStackWalker::getCallingClass(::gnu::gcj::RawData *pc) ::java::lang::ClassLoader * gnu::classpath::VMStackWalker::getClassLoader(::java::lang::Class *c) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); return c->getClassLoaderInternal (); } ::java::lang::ClassLoader * gnu::classpath::VMStackWalker::getCallingClassLoader(void) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); return _Jv_StackTrace::GetStackWalkerCallingClass ()->getClassLoaderInternal (); } @@ -70,11 +79,13 @@ gnu::classpath::VMStackWalker::getCallingClassLoader(void) ::java::lang::ClassLoader * gnu::classpath::VMStackWalker::getCallingClassLoader(::gnu::gcj::RawData *pc) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); return getCallingClass (pc)->getClassLoaderInternal (); } ::java::lang::ClassLoader * gnu::classpath::VMStackWalker::firstNonNullClassLoader(void) { + _Jv_InitClass (&::gnu::classpath::VMStackWalker::class$); return _Jv_StackTrace::GetStackWalkerFirstNonNullLoader (); } |