diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/NameFinder.java | 20 | ||||
| -rw-r--r-- | libjava/stacktrace.cc | 12 |
3 files changed, 38 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 76031d5..8117d08 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2006-06-06 David Daney <ddaney@avtrex.com> + + * gnu/gcj/runtime/NameFinder.java (show_raw): New field. + (showRaw): New method. + * stacktrace.cc : Include gnu/gcj/runtime/StringBuffer.h. + (getLineNumberForFrame): Show IP offset in trace if line number + not available and show_raw true. + 2006-06-06 Gary Benson <gbenson@redhat.com> * java/io/natFilePosix.cc (getCanonicalPath): Rewritten. diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java index e43886f..0742af1 100644 --- a/libjava/gnu/gcj/runtime/NameFinder.java +++ b/libjava/gnu/gcj/runtime/NameFinder.java @@ -67,13 +67,29 @@ public class NameFinder ("gnu.gcj.runtime.NameFinder.use_addr2line", "true") ).booleanValue(); + private static boolean show_raw + = Boolean.valueOf(System.getProperty + ("gnu.gcj.runtime.NameFinder.show_raw", "false") + ).booleanValue(); + + /** + * Return true if raw addresses should be printed in stacktraces + * when no line number information is available. + */ + static final boolean showRaw() + { + return show_raw; + } + private static final boolean remove_unknown = Boolean.valueOf(System.getProperty ("gnu.gcj.runtime.NameFinder.remove_unknown", "true") ).booleanValue(); - // Return true if non-Java frames should be removed from stack - // traces. + /** + * Return true if non-Java frames should be removed from stack + * traces. + */ static final boolean removeUnknown() { return remove_unknown; diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index 6423bbd..5d429e6 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -27,6 +27,7 @@ details. */ #include <java/util/IdentityHashMap.h> #include <gnu/java/lang/MainThread.h> #include <gnu/gcj/runtime/NameFinder.h> +#include <gnu/gcj/runtime/StringBuffer.h> #include <sysdep/backtrace.h> #include <sysdep/descriptor.h> @@ -221,6 +222,17 @@ _Jv_StackTrace::getLineNumberForFrame(_Jv_StackFrame *frame, NameFinder *finder, finder->lookup (binaryName, (jlong) offset); *sourceFileName = finder->getSourceFile(); *lineNum = finder->getLineNum(); + if (*lineNum == -1 && NameFinder::showRaw()) + { + gnu::gcj::runtime::StringBuffer *t = + new gnu::gcj::runtime::StringBuffer(binaryName); + t->append ((jchar)' '); + t->append ((jchar)'['); + // + 1 to compensate for the - 1 adjustment above; + t->append (Long::toHexString (offset + 1)); + t->append ((jchar)']'); + *sourceFileName = t->toString(); + } } #endif } |