From 18744d9b72b028b5612e250966f9d165a40ae9d8 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Thu, 10 Mar 2005 19:02:21 +0000 Subject: New Stack Trace infrastructure. 2005-03-10 Bryce McKinlay New Stack Trace infrastructure. * Makefile.am (libgcj0_convenience_la_SOURCES): Add stacktrace.cc. (gnu/gcj/runtime/StackTrace.lo): Removed. (ordinary_java_source_files): Remove obsolete files. (nat_source_files): Remove obsolete files. Add natVMThrowable.cc. * configure.host (fallback_backtrace_h): Set backtrace header for mingw and cygwin targets. * configure.ac: Make symlink for fallback backtrace headers. * Makefile.in, configure: Rebuilt. * defineclass.cc (_Jv_ClassReader::read_one_code_attribute): Read 'LineNumberTable' attribute. (_Jv_ClassReader::read_one_class_attribute): Read 'SourceFile' attribute. (_Jv_ClassReader::handleCodeAttribute): Initialize method line table fields. * exception.cc: Remove unused include. * interpret.cc (DIRECT_THREADED, insn_slot): Moved to java-interp.h. (SAVE_PC): New macro. Save current PC in the interpreter frame. (NULLCHECK, NULLARRAYCHECK): Use SAVE_PC. (_Jv_InterpMethod::compile): Translate bytecode PC values in the line table to direct threaded instruction values. (_Jv_StartOfInterpreter, _Jv_EndOfInterpreter): Removed. (_Jv_InterpMethod::run): No longer member function. All callers updated. Remove _Unwind calls. Call SAVE_PC whenever a call is made or where an instruction could throw. (_Jv_InterpMethod::get_source_line): New. Look up source line numbers in line_table. * prims.cc (catch_segv): Construct exception after MAKE_THROW_FRAME. (catch_fpe): Likewise. * stacktrace.cc: New file. Stack trace code now here. * gnu/gcj/runtime/MethodRef.java: * gnu/gcj/runtime/NameFinder.java: Mostly reimplemented. Now simply calls addr2line to look up PC addresses in a given binary or shared library. * gnu/gcj/runtime/StackTrace.java, gnu/gcj/runtime/natNameFinder.cc, gnu/gcj/runtime/natStackTrace.cc: Removed. * gnu/java/lang/MainThread.java (call_main): Add comment warning that this function name is specially recognised by the stack trace code and shouldn't be changed. * include/java-interp.h (DIRECT_THREADED, insn_slot): Moved here. (struct _Jv_LineTableEntry, line_table, line_table_len): New. (_Jv_InterpMethod::run): Update declaration. (_Jv_StackTrace_): New friend. NameFinder and StackTrace no longer friends. (_Jv_InterpFrame): Renamed from _Jv_MethodChain. Add PC field. * include/java-stack.h: New file. Declarations for stack tracing. * include/jvm.h (_Jv_Frame_info): Removed. * java/lang/Class.h: Update friend declarations. * java/lang/VMClassLoader.java (getSystemClassLoader): Simplify exception message. * java/lang/VMThrowable.java (fillInStackTrace): Now native. (getStackTrace): Now native. (data): New RawDataManaged field. * java/lang/natClass.cc: Update includes. (forName): Use _Jv_StackTrace::GetCallingClass for calling-classloader check. (getClassLoader): Likewise. * java/lang/natRuntime.cc: Update includes. (_load): Use _Jv_StackTrace::GetFirstNonSystemClassLoader. * java/lang/natVMSecurityManager.cc: Update includes. (getClassContext): Use _Jv_StackTrace::GetClassContext. * java/lang/natVMThrowable.cc: New file. Native methods for VMThrowable. * java/lang/reflect/natArray.cc: Update includes. (newInstance): Use _Jv_StackTrace::GetCallingClass to implement accessibility check. * java/lang/reflect/natConstructor.cc: Update includes. (newInstance): Use _Jv_StackTrace::GetCallingClass to implement accessibility check. * java/lang/reflect/natField.cc: Update includes. (getAddr): Use _Jv_StackTrace::GetCallingClass to implement accessibility check. * java/lang/reflect/natMethod.cc: Update includes. (invoke): Use _Jv_StackTrace::GetCallingClass to implement accessibility check. * java/util/natResourceBundle.cc: Update includes. (getCallingClassLoader): Use _Jv_StackTrace::GetCallingClass. * java/util/logging/natLogger.cc: Update includes. Use _Jv_StackTrace::GetCallerInfo to get call-site info. * sysdep/generic/backtrace.h: Fallback backtrace code. Stub implementation. * sysdep/i386/backtrace.h: New. Fallback backtrace code. i386 implementation. From-SVN: r96253 --- libjava/java/lang/VMThrowable.java | 44 ++++++++------------------------------ 1 file changed, 9 insertions(+), 35 deletions(-) (limited to 'libjava/java/lang/VMThrowable.java') diff --git a/libjava/java/lang/VMThrowable.java b/libjava/java/lang/VMThrowable.java index 102916a5d7c..f3b079a566e 100644 --- a/libjava/java/lang/VMThrowable.java +++ b/libjava/java/lang/VMThrowable.java @@ -1,5 +1,5 @@ /* java.lang.VMThrowable -- VM support methods for Throwable. - Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,7 @@ exception statement from your version. */ package java.lang; -import gnu.gcj.runtime.NameFinder; -import gnu.gcj.runtime.StackTrace; +import gnu.gcj.RawDataManaged; /** * VM dependent state and support methods Throwable. @@ -51,10 +50,8 @@ import gnu.gcj.runtime.StackTrace; */ final class VMThrowable { - private gnu.gcj.runtime.StackTrace trace; - /** - * Private contructor, create VMThrowables with fillInStackTrace(); + * Private contructor, create VMThrowables with StackTrace(); */ private VMThrowable() { } @@ -67,20 +64,7 @@ final class VMThrowable * @return a new VMThrowable containing the current execution stack trace. * @see Throwable#fillInStackTrace() */ - static VMThrowable fillInStackTrace(Throwable t) - { - VMThrowable state = null; - - /* FIXME: size of the stack trace is limited to 128 elements. - It's undoubtedly sensible to limit the stack trace, but 128 is - rather arbitrary. It may be better to configure this. */ - if (trace_enabled) - { - state = new VMThrowable (); - state.trace = new gnu.gcj.runtime.StackTrace(128); - } - return state; - } + static native VMThrowable fillInStackTrace(Throwable t); /** * Returns an StackTraceElement array based on the execution @@ -90,21 +74,11 @@ final class VMThrowable * @return a non-null but possible zero length array of StackTraceElement. * @see Throwable#getStackTrace() */ - StackTraceElement[] getStackTrace(Throwable t) - { - StackTraceElement[] result; - if (trace != null) - { - NameFinder nameFinder = new NameFinder(); - result = nameFinder.lookup(t, trace); - nameFinder.close(); - } - else - result = new StackTraceElement[0]; - - return result; - } - + native StackTraceElement[] getStackTrace(Throwable t); + // Setting this flag to false prevents fillInStackTrace() from running. static boolean trace_enabled = true; + + // Native stack data. + private RawDataManaged data; } -- cgit v1.2.3