-#include "global.h"
-#include "jni.h"
-#include "java_lang_Throwable.h"
-#include "java_lang_VMThrowable.h"
-#include "asmpart.h"
-#include "loader.h"
-#include "builtin.h"
-#include "tables.h"
-#include "native.h"
+/* nat/VMThrowable.c - java/lang/Throwable
+
+ 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.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ Contact: cacao@complang.tuwien.ac.at
+
+ Authors: Joseph Wenninger
+
+ $Id: VMThrowable.c 1735 2004-12-07 14:33:27Z twisti $
+
+*/
+
+
+#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"
/*
* Method: fillInStackTrace
* Signature: (Ljava/lang/Throwable;)Ljava/lang/VMThrowable;
*/
-JNIEXPORT struct java_lang_VMThrowable* JNICALL Java_java_lang_VMThrowable_fillInStackTrace(JNIEnv *env,
- jclass clazz, struct java_lang_Throwable* par1) {
-
- classinfo *class_java_lang_VMThrowable=0;
+JNIEXPORT java_lang_VMThrowable* JNICALL Java_java_lang_VMThrowable_fillInStackTrace(JNIEnv *env, jclass clazz, java_lang_Throwable *par1)
+{
+ classinfo *class_java_lang_VMThrowable = NULL;
java_lang_VMThrowable *vmthrow;
- log_text("java_lang_VMThrowable");
-
- if (!class_java_lang_VMThrowable)
- class_java_lang_VMThrowable = class_new(utf_new_char ("java/lang/VMThrowable"));
+ if (!class_java_lang_VMThrowable)
+ class_java_lang_VMThrowable = class_new(utf_new_char("java/lang/VMThrowable"));
- if (class_java_lang_VMThrowable==0)
+ if (class_java_lang_VMThrowable == NULL)
panic("Needed class java.lang.VMThrowable missing");
- vmthrow=(java_lang_VMThrowable*)native_new_and_init(class_java_lang_VMThrowable);
+ vmthrow = (java_lang_VMThrowable *) native_new_and_init(class_java_lang_VMThrowable);
- if (vmthrow==0)
+ if (vmthrow == NULL)
panic("Needed instance of class java.lang.VMThrowable could not be created");
-
-
-#ifdef __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 size) {
+static
+java_objectarray* generateStackTraceArray(JNIEnv *env,stacktraceelement *el,long size)
+{
long resultPos;
- methodinfo *constructor;
- classinfo *class_stacktraceelement;
- java_objectarray *array_stacktraceelement;
- class_stacktraceelement = (classinfo *) loader_load(utf_new_char ("java/lang/StackTraceElement"));
+ methodinfo *m;
+ classinfo *c;
+ java_objectarray *oa;
- if (!class_stacktraceelement)
- return 0;
+ c = class_new(utf_new_char("java/lang/StackTraceElement"));
+
+ if (!c->loaded)
+ class_load(c);
+
+ if (!c->linked)
+ class_link(c);
+ m = class_findmethod(c,
+ utf_new_char("<init>"),
+ utf_new_char("(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V"));
- constructor=class_findmethod(class_stacktraceelement,utf_new_char("<init>"),
- utf_new_char("(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V"));
- if (!constructor)
+ if (!m)
panic("java.lang.StackTraceElement misses needed constructor");
- array_stacktraceelement = builtin_anewarray(size, class_stacktraceelement);
+ oa = builtin_anewarray(size, c);
- if (!array_stacktraceelement)
- return 0;
+ if (!oa)
+ return 0;
/* printf("Should return an array with %ld element(s)\n",size);*/
- size--;
-
+ /*pos--;*/
- for(resultPos=0;size>=0;resultPos++,size--) {
- java_objectheader *element=builtin_new(class_stacktraceelement);
+ for(resultPos=0;size>0;size--,el++,resultPos++) {
+ java_objectheader *element;
+
+ if (el->method==0) {
+ resultPos--;
+ continue;
+ }
+
+ element=builtin_new(c);
if (!element) {
panic("Memory for stack trace element could not be allocated");
}
#warning call constructor once jni is fixed to allow more than three parameters
#endif
#if 0
- (*env)->CallVoidMethod(env,element,constructor,
- javastring_new(source[size].method->class->sourcefile),
+ (*env)->CallVoidMethod(env,element,m,
+ javastring_new(el->method->class->sourcefile),
source[size].linenumber,
- javastring_new(source[size].method->class->name),
- javastring_new(source[size].method->name),
- source[size].method->flags & ACC_NATIVE);
+ javastring_new(el->method->class->name),
+ javastring_new(el->method->name),
+ el->method->flags & ACC_NATIVE);
#else
- if (!(source[size].method->flags & ACC_NATIVE))setfield_critical(class_stacktraceelement,element,"fileName",
+ if (!(el->method->flags & ACC_NATIVE))setfield_critical(c,element,"fileName",
"Ljava/lang/String;", jobject,
- (jobject) javastring_new(source[size].method->class->sourcefile));
- setfield_critical(class_stacktraceelement,element,"className", "Ljava/lang/String;", jobject,
- (jobject) javastring_new(source[size].method->class->name));
- setfield_critical(class_stacktraceelement,element,"methodName", "Ljava/lang/String;", jobject,
- (jobject) javastring_new(source[size].method->name));
- setfield_critical(class_stacktraceelement,element,"lineNumber", "I", jint,
- (jint) ((source[size].method->flags & ACC_NATIVE) ? -1:(source[size].linenumber)));
- setfield_critical(class_stacktraceelement,element,"isNative", "Z", jboolean,
- (jboolean) ((source[size].method->flags & ACC_NATIVE) ? 1:0));
+ (jobject) javastring_new(el->method->class->sourcefile));
+/* setfield_critical(c,element,"className", "Ljava/lang/String;", jobject, */
+/* (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(el->method->name));
+ setfield_critical(c,element,"lineNumber", "I", jint,
+ (jint) ((el->method->flags & ACC_NATIVE) ? -1:(el->linenumber)));
+ setfield_critical(c,element,"isNative", "Z", jboolean,
+ (jboolean) ((el->method->flags & ACC_NATIVE) ? 1:0));
#endif
- array_stacktraceelement->data[resultPos]=element;
+ oa->data[resultPos]=element;
}
- return array_stacktraceelement;
+ return oa;
}
-
/*
* Class: java/lang/VMThrowable
* Method: getStackTrace
* Signature: (Ljava/lang/Throwable;)[Ljava/lang/StackTraceElement;
*/
-JNIEXPORT java_objectarray* JNICALL Java_java_lang_VMThrowable_getStackTrace(JNIEnv *env,
- struct java_lang_VMThrowable* this, struct java_lang_Throwable* par1) {
-
- long pos;
- long maxpos;
- utf* classname=par1->header.vftbl->class->name;
+JNIEXPORT java_objectarray* JNICALL Java_java_lang_VMThrowable_getStackTrace(JNIEnv *env, java_lang_VMThrowable *this, java_lang_Throwable *par1)
+{
+#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");*/
-
- if (el==0) {
- return generateStackTraceArray(env,el,0);
- }
- for (pos=0;el[pos].method!=0;pos++);
- if (pos==0) {
- panic("Stacktrace cannot have zero length");
- }
- pos--;
- pos--;
- maxpos=pos;
- 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--);
- pos --;
- if (pos<0) {
- panic("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*/
- return generateStackTraceArray(env,el,pos);
+ for (destElementCount = 0, tmpEl=el; size>0; size--,tmpEl++) {
+ if (tmpEl->method!=0) destElementCount++;
+ }
+ return generateStackTraceArray(env,el,destElementCount);
+#else
+ return 0;
+#endif
}
-
-
-
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
projects / cacao.git / blobdiff