diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-08-24 22:46:19 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-08-24 22:46:19 +0000 |
| commit | 6e0532cdf6f9fb4776bfa0f05a29c06a362d466b (patch) | |
| tree | 2194f5746d8d192d6202800f3df90a8ccb1675e0 /libjava/prims.cc | |
| parent | 4906d5d83e08494b70297808d6818faffd89c2a0 (diff) | |
| download | gcc-6e0532cdf6f9fb4776bfa0f05a29c06a362d466b.zip gcc-6e0532cdf6f9fb4776bfa0f05a29c06a362d466b.tar.gz gcc-6e0532cdf6f9fb4776bfa0f05a29c06a362d466b.tar.bz2 | |
Makefile.am (libgcj_la_SOURCES): Remove name-finder.cc.
* 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.
From-SVN: r56556
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 054290b..710139b 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -53,6 +53,7 @@ details. */ #include <java/lang/NullPointerException.h> #include <java/lang/OutOfMemoryError.h> #include <java/lang/System.h> +#include <java/lang/VMThrowable.h> #include <java/lang/reflect/Modifier.h> #include <java/io/PrintStream.h> #include <java/lang/UnsatisfiedLinkError.h> @@ -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 (); |