/* src/native/vm/VMThrowable.c - java/lang/VMThrowable
- 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
+ Copyright (C) 1996-2005, 2006 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.
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.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Joseph Wenninger
Changes: Christian Thalinger
- $Id: VMThrowable.c 2945 2005-07-09 12:16:18Z twisti $
+ $Id: VMThrowable.c 4357 2006-01-22 23:33:38Z twisti $
*/
#include <assert.h>
+#include "config.h"
+#include "vm/types.h"
+
#include "native/jni.h"
#include "native/native.h"
#include "native/include/java_lang_Class.h"
+#include "native/include/java_lang_StackTraceElement.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/class.h"
+#include "vm/exceptions.h"
#include "vm/loader.h"
#include "vm/stringlocal.h"
-#include "vm/tables.h"
-#include "vm/jit/asmpart.h"
#include "vm/jit/stacktrace.h"
-#include "vm/exceptions.h"
/*
{
java_lang_VMThrowable *vmthrow;
- if ((*dontfillinexceptionstacktrace) == true) {
- /*log_text("dontfillinexceptionstacktrace");*/
- return 0;
- }
-
vmthrow = (java_lang_VMThrowable *)
native_new_and_init(class_java_lang_VMThrowable);
assert(0);
}
-#if defined(__ALPHA__) || defined(__I386__) || defined(__POWERPC__) || defined(__X86_64__)
- cacao_stacktrace_NormalTrace((void **) &(vmthrow->vmData));
+#if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__X86_64__)
+ if (!cacao_stacktrace_NormalTrace((void **) &(vmthrow->vmData)))
+ return NULL;
#endif
- return vmthrow;
-}
-
-
-static java_objectarray *generateStackTraceArray(JNIEnv *env,stacktraceelement *el, s4 size)
-{
- long resultPos;
- methodinfo *m;
- java_objectarray *oa;
-
- m = class_findmethod(class_java_lang_StackTraceElement,
- utf_init,
- utf_new_char("(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V"));
-
- if (!m) {
- log_text("java.lang.StackTraceElement misses needed constructor");
- assert(0);
- }
- oa = builtin_anewarray(size, class_java_lang_StackTraceElement);
-
- if (!oa)
- return 0;
-
-/* printf("Should return an array with %ld element(s)\n",size);*/
- /*pos--;*/
-
- for(resultPos = 0; size > 0; size--, el++, resultPos++) {
- java_objectheader *element;
-
- if (el->method == NULL) {
- resultPos--;
- continue;
- }
-
- element = builtin_new(class_java_lang_StackTraceElement);
- if (!element) {
- log_text("Memory for stack trace element could not be allocated");
- assert(0);
- }
-
- /* XXX call constructor once jni is fixed to allow more than three parameters */
-
-#if 0
- (*env)->CallVoidMethod(env,element,m,
- javastring_new(el->method->class->sourcefile),
- source[size].linenumber,
- javastring_new(el->method->class->name),
- javastring_new(el->method->name),
- el->method->flags & ACC_NATIVE);
-#else
- if (!(el->method->flags & ACC_NATIVE))
- setfield_critical(class_java_lang_StackTraceElement,
- element,
- "fileName",
- "Ljava/lang/String;",
- jobject,
- (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(class_java_lang_StackTraceElement,
- element,
- "declaringClass",
- "Ljava/lang/String;",
- jobject,
- (jobject) Java_java_lang_VMClass_getName(env, NULL, (java_lang_Class *) el->method->class));
-
- setfield_critical(class_java_lang_StackTraceElement,
- element,
- "methodName",
- "Ljava/lang/String;",
- jobject,
- (jobject) javastring_new(el->method->name));
-
- setfield_critical(class_java_lang_StackTraceElement,
- element,
- "lineNumber",
- "I",
- jint,
- (jint) ((el->method->flags & ACC_NATIVE) ? -1 : (el->linenumber)));
-
- setfield_critical(class_java_lang_StackTraceElement,
- element,
- "isNative",
- "Z",
- jboolean,
- (jboolean) ((el->method->flags & ACC_NATIVE) ? 1 : 0));
-#endif
-
- oa->data[resultPos] = element;
- }
-
- return oa;
+ return vmthrow;
}
*/
JNIEXPORT java_objectarray* JNICALL Java_java_lang_VMThrowable_getStackTrace(JNIEnv *env, java_lang_VMThrowable *this, java_lang_Throwable *t)
{
-#if defined(__ALPHA__) || defined(__I386__) || defined(__POWERPC__) || defined(__X86_64__)
- stackTraceBuffer *buf;
- stacktraceelement *elem;
- stacktraceelement *tmpelem;
- u8 size;
- s4 elemcount;
- classinfo *c;
- bool inexceptionclass;
- bool leftexceptionclass;
+#if defined(__ALPHA__) || defined(__ARM__) || defined(__I386__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__X86_64__)
+ stackTraceBuffer *buf;
+ stacktraceelement *elem;
+ stacktraceelement *tmpelem;
+ s4 size;
+ s4 i;
+ classinfo *c;
+ bool inexceptionclass;
+ bool leftexceptionclass;
+
+ methodinfo *m;
+ java_objectarray *oa;
+ s4 oalength;
+ java_lang_StackTraceElement *ste;
+ java_lang_String *filename;
+ s4 linenumber;
+ java_lang_String *declaringclass;
buf = (stackTraceBuffer *) this->vmData;
c = t->header.vftbl->class;
}
}
}
-
- for (elemcount = 0, tmpelem = elem; size > 0; size--, tmpelem++) {
+
+
+ /* now fill the stacktrace into java objects */
+
+ m = class_findmethod(class_java_lang_StackTraceElement,
+ utf_init,
+ utf_new_char("(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V"));
+
+ if (!m)
+ return NULL;
+
+ /* count entries with a method name */
+
+ for (oalength = 0, i = size, tmpelem = elem; i > 0; i--, tmpelem++)
if (tmpelem->method)
- elemcount++;
+ oalength++;
+
+ /* create the stacktrace element array */
+
+ oa = builtin_anewarray(oalength, class_java_lang_StackTraceElement);
+
+ if (!oa)
+ return NULL;
+
+ for (i = 0; size > 0; size--, elem++, i++) {
+ if (elem->method == NULL) {
+ i--;
+ continue;
+ }
+
+ /* allocate a new stacktrace element */
+
+ ste = (java_lang_StackTraceElement *)
+ builtin_new(class_java_lang_StackTraceElement);
+
+ if (!ste)
+ return NULL;
+
+ /* get filename */
+
+ if (!(elem->method->flags & ACC_NATIVE)) {
+ if (elem->method->class->sourcefile)
+ filename = javastring_new(elem->method->class->sourcefile);
+ else
+ filename = NULL;
+
+ } else {
+ filename = NULL;
+ }
+
+ /* get line number */
+
+ if (elem->method->flags & ACC_NATIVE)
+ linenumber = -1;
+ else
+ linenumber = (elem->linenumber == 0) ? -1 : elem->linenumber;
+
+ /* get declaring class name */
+
+ declaringclass = Java_java_lang_VMClass_getName(env, NULL, (java_lang_Class *) elem->method->class);
+
+
+ /* fill the stacktrace element */
+
+ ste->fileName = filename;
+ ste->lineNumber = linenumber;
+ ste->declaringClass = declaringclass;
+ ste->methodName = javastring_new(elem->method->name);
+ ste->isNative = (elem->method->flags & ACC_NATIVE) ? 1 : 0;
+
+ oa->data[i] = (java_objectheader *) ste;
}
- return generateStackTraceArray(env, elem, elemcount);
+ return oa;
#else
- return 0;
+ return NULL;
#endif
}
projects / cacao.git / blobdiff