From 22bd464fb14254908fedcdc08a0a8a3068c62098 Mon Sep 17 00:00:00 2001 From: mark Date: Sat, 24 Aug 2002 22:46:19 +0000 Subject: * Makefile.am (libgcj_la_SOURCES): Remove name-finder.cc. (core_java_source_files): Add VMThrowable.java and NameFinder.java (nat_source_files): Remove natThrowable.cc, add natVMThrowable.cc and natNameFinder.cc. * Makefile.in: Regenerate. * prims.cc: Use trace_enabled from VMThrowable. * name-finder.cc: Removed. * gcj/javaprims.h: Add class VMThrowable. * gnu/gcj/runtime/NameFinder.java: New file. * gnu/gcj/runtime/natNameFinder.cc: Likewise. * include/name-finder.h: Removed. * java/lang/Throwable.java (printStackTrace (PrintStream)): Use new method stackTraceString(). (printStackTrace (PrintWriter)): Likewise. (stackTraceString): Complete rewrite of old printStackTrace using StringBuffer. (stackTraceStringBuffer): New helper method for stackTraceString(). (fillInStackTrace): Delegate to VMTrowable. (getStackTrace): Likewise. (getStackTrace0): Removed. (trace_enabled, stackTraceBytes): Moved to new VMThrowable.java. (setStackTrace): Copy given array. * java/lang/natThrowable.cc: Removed (replaced by natVMThrowable). * java/lang/VMThrowable.java: New class. * java/lang/natVMThrowable.cc: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56556 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/prims.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libjava/prims.cc') diff --git a/libjava/prims.cc b/libjava/prims.cc index 054290b16ad..710139bab06 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -53,6 +53,7 @@ details. */ #include #include #include +#include #include #include #include @@ -910,8 +911,8 @@ _Jv_CreateJavaVM (void* /*vm_args*/) _Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0, &_Jv_voidVTable); // Turn stack trace generation off while creating exception objects. - _Jv_InitClass (&java::lang::Throwable::class$); - java::lang::Throwable::trace_enabled = 0; + _Jv_InitClass (&java::lang::VMThrowable::class$); + java::lang::VMThrowable::trace_enabled = 0; INIT_SEGV; #ifdef HANDLE_FPE @@ -923,7 +924,7 @@ _Jv_CreateJavaVM (void* /*vm_args*/) no_memory = new java::lang::OutOfMemoryError; - java::lang::Throwable::trace_enabled = 1; + java::lang::VMThrowable::trace_enabled = 1; #ifdef USE_LTDL LTDL_SET_PRELOADED_SYMBOLS (); -- cgit v1.2.1