/* nat/VMThrowable.c - java/lang/Throwable
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
- M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
- P. Tomsich, J. Wenninger
+ Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+ R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+ C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+ Institut f. Computersprachen - TU Wien
This file is part of CACAO.
Authors: Joseph Wenninger
- $Id: VMThrowable.c 1448 2004-11-05 14:06:38Z twisti $
+ $Id: VMThrowable.c 1735 2004-12-07 14:33:27Z twisti $
*/
-#include "global.h"
-#include "jni.h"
-#include "asmpart.h"
-#include "loader.h"
-#include "builtin.h"
-#include "tables.h"
-#include "native.h"
-#include "nat/java_lang_Class.h"
-#include "nat/java_lang_Throwable.h"
-#include "nat/java_lang_VMClass.h"
-#include "nat/java_lang_VMThrowable.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_Class.h"
+#include "native/include/java_lang_Throwable.h"
+#include "native/include/java_lang_VMClass.h"
+#include "native/include/java_lang_VMThrowable.h"
+#include "vm/builtin.h"
+#include "vm/loader.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/stacktrace.h"
/*
if (vmthrow == NULL)
panic("Needed instance of class java.lang.VMThrowable could not be created");
-#if defined(__I386__)
- (void) asm_get_stackTrace(&(vmthrow->vmData));
-#else
- vmthrow->vmData=0;
+#if defined(__I386__) || defined(__ALPHA__)
+ cacao_stacktrace_NormalTrace(&(vmthrow->vmData));
#endif
-
return vmthrow;
}
-
-java_objectarray* generateStackTraceArray(JNIEnv *env,stacktraceelement *source,long pos,long size)
+static
+java_objectarray* generateStackTraceArray(JNIEnv *env,stacktraceelement *el,long size)
{
long resultPos;
methodinfo *m;
return 0;
/* printf("Should return an array with %ld element(s)\n",size);*/
- pos--;
+ /*pos--;*/
-
- for(resultPos=0;pos>=0;resultPos++,pos--) {
+ for(resultPos=0;size>0;size--,el++,resultPos++) {
java_objectheader *element;
- if (source[pos].method==0) {
+ if (el->method==0) {
resultPos--;
continue;
}
#endif
#if 0
(*env)->CallVoidMethod(env,element,m,
- javastring_new(source[pos].method->class->sourcefile),
+ javastring_new(el->method->class->sourcefile),
source[size].linenumber,
- javastring_new(source[pos].method->class->name),
- javastring_new(source[pos].method->name),
- source[pos].method->flags & ACC_NATIVE);
+ javastring_new(el->method->class->name),
+ javastring_new(el->method->name),
+ el->method->flags & ACC_NATIVE);
#else
- if (!(source[pos].method->flags & ACC_NATIVE))setfield_critical(c,element,"fileName",
+ if (!(el->method->flags & ACC_NATIVE))setfield_critical(c,element,"fileName",
"Ljava/lang/String;", jobject,
- (jobject) javastring_new(source[pos].method->class->sourcefile));
+ (jobject) javastring_new(el->method->class->sourcefile));
/* setfield_critical(c,element,"className", "Ljava/lang/String;", jobject, */
-/* (jobject) javastring_new(source[pos].method->class->name)); */
- setfield_critical(c,element,"className", "Ljava/lang/String;", jobject,
- (jobject) Java_java_lang_VMClass_getName(env, NULL, (java_lang_Class *) source[pos].method->class));
+/* (jobject) javastring_new(el->method->class->name)); */
+ setfield_critical(c,element,"declaringClass", "Ljava/lang/String;", jobject,
+ (jobject) Java_java_lang_VMClass_getName(env, NULL, (java_lang_Class *) el->method->class));
setfield_critical(c,element,"methodName", "Ljava/lang/String;", jobject,
- (jobject) javastring_new(source[pos].method->name));
+ (jobject) javastring_new(el->method->name));
setfield_critical(c,element,"lineNumber", "I", jint,
- (jint) ((source[pos].method->flags & ACC_NATIVE) ? -1:(source[pos].linenumber)));
+ (jint) ((el->method->flags & ACC_NATIVE) ? -1:(el->linenumber)));
setfield_critical(c,element,"isNative", "Z", jboolean,
- (jboolean) ((source[pos].method->flags & ACC_NATIVE) ? 1:0));
+ (jboolean) ((el->method->flags & ACC_NATIVE) ? 1:0));
#endif
*/
JNIEXPORT java_objectarray* JNICALL Java_java_lang_VMThrowable_getStackTrace(JNIEnv *env, java_lang_VMThrowable *this, java_lang_Throwable *par1)
{
- long pos;
- long maxpos;
- long sizediff;
- utf* classname=par1->header.vftbl->class->name;
+#if defined(__I386__) || defined(__ALPHA__)
+ stackTraceBuffer *buf=(stackTraceBuffer*)this->vmData;
+ u8 size;
+ stacktraceelement *el;
+ classinfo *excClass=par1->header.vftbl->class;
utf* init=utf_new_char("<init>");
utf* throwable=utf_new_char("java/lang/Throwable");
- stacktraceelement *el=(stacktraceelement*)this->vmData;
-
- /* log_text("Java_java_lang_VMThrowable_getStackTrace");
- utf_display(par1->header.vftbl->class->name);
- printf("\n----------------------------------------------\n");*/
-
- sizediff=0;
- if (el == 0) {
- return generateStackTraceArray(env, el, 0,0);
- }
-
- for (pos = 0; !((el[pos].method == 0) && (el[pos].linenumber ==-1)); pos++) {
- if (el[pos].method==0) sizediff++;
- }
-
- if (pos == 0) {
- panic("Stacktrace cannot have zero length");
- }
-
- pos--;
- pos--;
- maxpos = pos;
- if (el[pos].method!=0) { /* if == 0 -> some builtin native */
- if (el[pos].method->class->name == throwable && el[pos].method->name == init) {
- for (; pos >= 0 && el[pos].method->name == init && el[pos].method->class->name != classname; pos--) {
-/* log_text("ignoring:");
- utf_display(el[pos].method->name);
- log_text("");
- utf_display(el[pos].method->class->name);
- log_text("");*/
-
- };
- pos--;
- if (pos < 0) {
- log_text("Invalid stack trace for Throwable.getStackTrace()");
+ long destElementCount;
+ stacktraceelement *tmpEl;
+ if (!buf) panic("Invalid java.lang.VMThrowable.vmData field in java.lang.VMThrowable.getStackTrace native code");
+
+ size=buf->full;
+ if (size<=2) panic("Invalid java.lang.VMThrowable.vmData field in java.lang.VMThrowable.getStackTrace native code (length<=2)");
+ size -=2;
+ el=&(buf->start[2]); /* element 0==VMThrowable.fillInStackTrace native call, 1==Throwable.fillInStackTrace*/
+ if (el->method!=0) { /* => not a builtin native wrapper*/
+ if ((el->method->class->name==throwable) && (el->method->name == init) ){
+ /* We assume that we are within the initializer of the exception object, the exception object itself should not appear
+ in the stack trace, so we skip till we reach the first function, which is not an init function or till we reach the exception object class*/
+ for (; (size>0) && (el->method->name==init) && (el->method->class!=excClass); el++, size--) {
+ /* just loop*/
+ }
+ size --;
+ el++;
+ if (size<1) {
+ log_text("Invalid stacktrace for VMThrowable.getStackTrace()");
}
}
}
+
- /* build the result array*/
- pos++; /*arraysize*/
+ for (destElementCount = 0, tmpEl=el; size>0; size--,tmpEl++) {
+ if (tmpEl->method!=0) destElementCount++;
+ }
- return generateStackTraceArray(env,el,pos,pos-sizediff);
+ return generateStackTraceArray(env,el,destElementCount);
+#else
+ return 0;
+#endif
}
projects / cacao.git / blobdiff