X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fbuiltin.c;h=6f99656c38b292b4c066fa086a096c729383bf79;hb=3b3e87b38c342b644df42f5f4101c8d1737f895e;hp=a0d141daa1c6cdc9a460427d6dd49ff2c00b4dd4;hpb=8d6ce6d7e3b81bccfc21ced6a5af9eb35dd16b15;p=cacao.git

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index a0d141daa..6f99656c3 100644
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -34,16 +34,16 @@
    calls instead of machine instructions, using the C calling
    convention.
 
-   $Id: builtin.c 930 2004-03-02 21:18:23Z jowenn $
+   $Id: builtin.c 1113 2004-06-02 10:31:09Z twisti $
 
 */
 
 
+#include "global.h"
 #include <assert.h>
 #include <string.h>
 #include <math.h>
 #include "main.h"
-#include "global.h"
 #include "builtin.h"
 #include "native.h"
 #include "loader.h"
@@ -52,7 +52,7 @@
 #include "mm/boehm.h"
 #include "threads/thread.h"
 #include "threads/locks.h"
-#include "toolbox/loging.h"
+#include "toolbox/logging.h"
 #include "toolbox/memory.h"
 #include "nat/java_lang_Cloneable.h"
 #include "nat/java_lang_VMObject.h"
@@ -60,10 +60,8 @@
 
 #undef DEBUG /*define DEBUG 1*/
 
-
 THREADSPECIFIC methodinfo* _threadrootmethod = NULL;
-THREADSPECIFIC native_stackframeinfo _thread_nativestackframeinfo_bottom={0,0,0,0};
-THREADSPECIFIC native_stackframeinfo *_thread_nativestackframeinfo=&_thread_nativestackframeinfo_bottom;
+THREADSPECIFIC void *_thread_nativestackframeinfo=NULL;
 
 /*****************************************************************************
 								TYPE CHECKS
@@ -82,6 +80,7 @@ THREADSPECIFIC native_stackframeinfo *_thread_nativestackframeinfo=&_thread_nati
 s4 builtin_isanysubclass(classinfo *sub, classinfo *super)
 { 
 	s4 res;
+	castinfo classvalues;
 
 	/*classinfo *tmp;*/
 	if (super->flags & ACC_INTERFACE)
@@ -116,40 +115,29 @@ s4 builtin_isanysubclass(classinfo *sub, classinfo *super)
 			sub->vftbl->baseval, super->vftbl->baseval, (unsigned)(sub->vftbl->baseval - super->vftbl->baseval),
 			super->vftbl->diffval); */
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_lock();
-#endif
+	asm_getclassvalues_atomic(super->vftbl, sub->vftbl, &classvalues);
 
-	res = (unsigned) (sub->vftbl->baseval - super->vftbl->baseval) <=
-		(unsigned) (super->vftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_unlock();
-#endif
+	res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval) <=
+		(unsigned) classvalues.super_diffval;
 
 	return res;
 }
 
 s4 builtin_isanysubclass_vftbl(vftbl *sub,vftbl *super)
 {
-	int base;
 	s4 res;
+	int base;
+	castinfo classvalues;
 	
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_lock();
-#endif
+	asm_getclassvalues_atomic(super, sub, &classvalues);
 
-	if ((base = super->baseval) <= 0)
+	if ((base = classvalues.super_baseval) <= 0)
 		/* super is an interface */
 		res = (sub->interfacetablelength > -base) &&
 			(sub->interfacetable[base] != NULL);
 	else
-	    res = (unsigned) (sub->baseval - base)
-			<= (unsigned) (super->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_unlock();
-#endif
+	    res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+			<= (unsigned) classvalues.super_diffval;
 
 	return res;
 }
@@ -279,39 +267,21 @@ java_objectheader *builtin_throw_exception(java_objectheader *local_exceptionptr
 	if (verbose) {
 		char logtext[MAXLOGTEXT];
 		sprintf(logtext, "Builtin exception thrown: ");
-		if (local_exceptionptr)
-			utf_sprint(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name);
-		else {
-			sprintf(logtext+strlen(logtext),"%s","Error: <Nullpointer instead of exception>");
-			if (!proto_java_lang_ClassCastException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ClassCastException==0");
-			if (!proto_java_lang_NullPointerException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NullPointerException==0");
-			if (!proto_java_lang_NullPointerException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NullPointerException==0");
-			if (!proto_java_lang_ArrayIndexOutOfBoundsException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArrayIndexOutOfBoundsException==0");
-			if (!proto_java_lang_NegativeArraySizeException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NegativeArraySizeException==0");
-			if (!proto_java_lang_OutOfMemoryError) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_OutOfMemoryError==0");
-			if (!proto_java_lang_ArithmeticException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArithmeticException==0");
-			if (!proto_java_lang_ArrayStoreException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArrayStoreException==0");
-			if (!proto_java_lang_ThreadDeath) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ThreadDeath==0");
-			if (!proto_java_lang_ThreadDeath) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ThreadDeath==0");
-			}
+		if (local_exceptionptr) {
+			utf_sprint_classname(logtext + strlen(logtext),
+								 local_exceptionptr->vftbl->class->name);
+
+		} else {
+			sprintf(logtext + strlen(logtext), "Error: <Nullpointer instead of exception>");
+		}
 		log_text(logtext);
 	}
+
 	*exceptionptr = local_exceptionptr;
+
 	return local_exceptionptr;
 }
 
-void builtin_reset_exceptionptr()
-{
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-	_exceptionptr = NULL;
-#else
-	((nativethread*) pthread_getspecific(tkey_exceptionptr))->_exceptionptr = 0;
-#endif
-#else
-	panic("builtin_reset_exceptionptr should not be used in this configuration");
-#endif
-}
 
 
 /******************* function: builtin_canstore *******************************
@@ -330,6 +300,7 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 	vftbl *valuevftbl;
     int dim_m1;
 	int base;
+	castinfo classvalues;
 	
 	if (!o) return 1;
 
@@ -353,21 +324,15 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 		if (valuevftbl == componentvftbl)
 			return 1;
 
-		if ((base = componentvftbl->baseval) <= 0)
+		asm_getclassvalues_atomic(componentvftbl, valuevftbl, &classvalues);
+
+		if ((base = classvalues.super_baseval) <= 0)
 			/* an array of interface references */
 			return (valuevftbl->interfacetablelength > -base &&
 					valuevftbl->interfacetable[base] != NULL);
 		
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-		cast_lock();
-#endif
-
-		res = (unsigned)(valuevftbl->baseval - base)
-			<= (unsigned)(componentvftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-		cast_unlock();
-#endif
+		res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+			<= (unsigned) classvalues.super_diffval;
 
 		return res;
     }
@@ -389,8 +354,9 @@ s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
 	arraydescriptor *desc;
 	vftbl *elementvftbl;
 	vftbl *valuevftbl;
-	int base;
 	s4 res;
+	int base;
+	castinfo classvalues;
 	
 	if (!o) return 1;
 
@@ -411,21 +377,15 @@ s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
 	if (valuevftbl == elementvftbl)
 		return 1;
 
-	if ((base = elementvftbl->baseval) <= 0)
+	asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
+
+	if ((base = classvalues.super_baseval) <= 0)
 		/* an array of interface references */
 		return (valuevftbl->interfacetablelength > -base &&
 				valuevftbl->interfacetable[base] != NULL);
-	
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_lock();
-#endif
 
-	res = (unsigned)(valuevftbl->baseval - base)
-		<= (unsigned)(elementvftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_unlock();
-#endif
+	res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+		<= (unsigned) classvalues.super_diffval;
 
 	return res;
 }
@@ -438,6 +398,7 @@ s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o)
 	vftbl *elementvftbl;
 	vftbl *valuevftbl;
 	s4 res;
+	castinfo classvalues;
 	
 	if (!o) return 1;
 
@@ -458,16 +419,10 @@ s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o)
 	if (valuevftbl == elementvftbl)
 		return 1;
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_lock();
-#endif
-
-	res = (unsigned)(valuevftbl->baseval - elementvftbl->baseval)
-		<= (unsigned)(elementvftbl->diffval);
+	asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-	cast_unlock();
-#endif
+	res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+		<= (unsigned) classvalues.super_diffval;
 
 	return res;
 }
@@ -488,15 +443,22 @@ java_objectheader *builtin_new(classinfo *c)
 {
 	java_objectheader *o;
 
+	/* is the class loaded */
+	if (!c->loaded)
+		if (!class_load(c))
+			return NULL;
+
+	/* is the class linked */
+	if (!c->linked)
+		if (!class_link(c))
+			return NULL;
+
 	if (!c->initialized) {
-		if (initverbose) {
-			char logtext[MAXLOGTEXT];
-			sprintf(logtext, "Initialize class ");
-			utf_sprint(logtext + strlen(logtext), c->name);
-			sprintf(logtext + strlen(logtext), " (from builtin_new)");
-			log_text(logtext);
-		}
-		class_init(c);
+		if (initverbose)
+			log_message_class("Initialize class (from builtin_new): ", c);
+
+		if (!class_init(c))
+			return NULL;
 	}
 
 #ifdef SIZE_FROM_CLASSINFO
@@ -505,7 +467,9 @@ java_objectheader *builtin_new(classinfo *c)
 #else
 	o = heap_allocate(c->instancesize, true, c->finalizer);
 #endif
-	if (!o) return NULL;
+
+	if (!o)
+		return NULL;
 	
 	memset(o, 0, c->instancesize);
 
@@ -514,6 +478,7 @@ java_objectheader *builtin_new(classinfo *c)
 	return o;
 }
 
+
 /********************** Function: builtin_newarray **************************
 
 	Creates an array with the given vftbl on the heap.
@@ -528,34 +493,39 @@ java_objectheader *builtin_new(classinfo *c)
 java_arrayheader *builtin_newarray(s4 size, vftbl *arrayvftbl)
 {
 	java_arrayheader *a;
-	arraydescriptor *desc = arrayvftbl->arraydesc;
-	s4 dataoffset = desc->dataoffset;
-	s4 componentsize = desc->componentsize;
+	arraydescriptor *desc;
+	s4 dataoffset;
+	s4 componentsize;
 	s4 actualsize;
 
-	if (size<0) {
-		*exceptionptr=native_new_and_init(loader_load(utf_new_char("java/lang/NegativeArraySizeException")));
+	desc = arrayvftbl->arraydesc;
+	dataoffset = desc->dataoffset;
+	componentsize = desc->componentsize;
+
+	if (size < 0) {
+		*exceptionptr =
+			new_exception(string_java_lang_NegativeArraySizeException);
 		return NULL;
 	}
+
 #ifdef SIZE_FROM_CLASSINFO
 	actualsize = align_size(dataoffset + size * componentsize);
-#else
 	actualsize = dataoffset + size * componentsize;
 #endif
 
-	if (((u4)actualsize)<((u4)size)) { /* overflow */
-		*exceptionptr = native_new_and_init(loader_load(utf_new_char("java/lang/OutOfMemoryError")));
+	if (((u4) actualsize) < ((u4) size)) { /* overflow */
+		*exceptionptr = new_exception(string_java_lang_OutOfMemoryError);
 		return NULL;
 	}
+
 	a = heap_allocate(actualsize,
 					  (desc->arraytype == ARRAYTYPE_OBJECT),
 					  NULL);
 
-	if (!a) return NULL;
-	memset(a, 0, actualsize);
-
+	if (!a)
+		return NULL;
 
-	/*printf("builtin_newarray: Created an array of size : %d\n",size);*/
+	memset(a, 0, actualsize);
 
 	a->objheader.vftbl = arrayvftbl;
 	a->size = size;
@@ -571,7 +541,7 @@ java_arrayheader *builtin_newarray(s4 size, vftbl *arrayvftbl)
 
 	Creates an array of references to the given class type on the heap.
 
-	Return value:  pointer to the array or NULL if no memory is available
+	Return value: pointer to the array or NULL if no memory is available
 
     XXX This function does not do The Right Thing, because it uses a
     classinfo pointer at runtime. builtin_newarray should be used
@@ -581,13 +551,17 @@ java_arrayheader *builtin_newarray(s4 size, vftbl *arrayvftbl)
 
 java_objectarray *builtin_anewarray(s4 size, classinfo *component)
 {
-/*
-	printf("builtin_anewarray: classvftbl: %d\n",component->classvftbl);
-	printf("builtin_anewarray: baseval: %d\n",component->vftbl->baseval);
-	utf_display(component->vftbl->class->name);
-	printf("\nbuiltin_anewarray: linked: %d\n",component->linked);
-	utf_display(component->super->name);*/
-	return (java_objectarray*) builtin_newarray(size, class_array_of(component)->vftbl);
+	/* is class loaded */
+	if (!component->loaded)
+		if (!class_load(component))
+			return NULL;
+
+	/* is class linked */
+	if (!component->linked)
+		if (!class_link(component))
+			return NULL;
+
+	return (java_objectarray *) builtin_newarray(size, class_array_of(component)->vftbl);
 }
 
 
@@ -718,24 +692,33 @@ java_booleanarray *builtin_newarray_boolean(s4 size)
 
 ******************************************************************************/
 
-	/* Helper functions */
-
-java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
+java_arrayheader *builtin_nmultianewarray(int n, vftbl *arrayvftbl, long *dims)
+/*  java_arrayheader *builtin_nmultianewarray(int n, classinfo *arrayclass, long *dims) */
 {
-	int size, i;
+	s4 size, i;
 	java_arrayheader *a;
 	vftbl *componentvftbl;
 
+/*  	utf_display(arrayclass->name); */
+
+/*  	class_load(arrayclass); */
+/*  	class_link(arrayclass); */
+	
 	/* create this dimension */
-	size = (int) dims[0];
-	a = builtin_newarray(size,arrayvftbl);
-	if (!a) return NULL;
+	size = (s4) dims[0];
+  	a = builtin_newarray(size, arrayvftbl);
+/*  	a = builtin_newarray(size, arrayclass->vftbl); */
+
+	if (!a)
+		return NULL;
 
 	/* if this is the last dimension return */
-	if (!--n) return a;
+	if (!--n)
+		return a;
 
 	/* get the vftbl of the components to create */
 	componentvftbl = arrayvftbl->arraydesc->componentvftbl;
+/*  	component = arrayclass->vftbl->arraydesc; */
 
 	/* The verifier guarantees this. */
 	/* if (!componentvftbl) */
@@ -744,9 +727,12 @@ java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
 	/* create the component arrays */
 	for (i = 0; i < size; i++) {
 		java_arrayheader *ea = 
-			builtin_nmultianewarray(n,componentvftbl,dims+1);
-		if (!ea) return NULL;
-		((java_objectarray*)a)->data[i] = (java_objectheader *) ea;
+			builtin_nmultianewarray(n, componentvftbl, dims + 1);
+
+		if (!ea)
+			return NULL;
+		
+		((java_objectarray *) a)->data[i] = (java_objectheader *) ea;
 	}
 
 	return a;
@@ -761,11 +747,12 @@ java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
 	
 *****************************************************************************/
 
-
 u4 methodindent = 0;
 
 java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr,
-										   methodinfo *method, int *pos, 
+										   methodinfo *method,
+										   int *pos,
+										   int line,
 										   int noindent)
 {
 	if (!noindent) {
@@ -774,36 +761,35 @@ java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr,
 		else
 			log_text("WARNING: unmatched methodindent--");
 	}
-	if (verbose || runverbose) {
-		printf("Exception ");
+	if (verbose || runverbose || verboseexception) {
 		if (_exceptionptr) {
-			utf_display(_exceptionptr->vftbl->class->name);
+			printf("Exception ");
+			utf_display_classname(_exceptionptr->vftbl->class->name);
 
 		} else {
-			printf("Error: <Nullpointer instead of exception>");
-			if (!proto_java_lang_ClassCastException) printf("%s","proto_java_lang_ClassCastException==0");
-			if (!proto_java_lang_NullPointerException) printf("%s","proto_java_lang_NullPointerException==0");
-			if (!proto_java_lang_NullPointerException) printf("%s","proto_java_lang_NullPointerException==0");
-			if (!proto_java_lang_ArrayIndexOutOfBoundsException) printf("%s","proto_java_lang_ArrayIndexOutOfBoundsException==0");
-			if (!proto_java_lang_NegativeArraySizeException) printf("%s","proto_java_lang_NegativeArraySizeException==0");
-			if (!proto_java_lang_OutOfMemoryError) printf("%s","proto_java_lang_OutOfMemoryError==0");
-			if (!proto_java_lang_ArithmeticException) printf("%s","proto_java_lang_ArithmeticException==0");
-			if (!proto_java_lang_ArrayStoreException) printf("%s","proto_java_lang_ArrayStoreException==0");
-			if (!proto_java_lang_ThreadDeath) printf("%s","proto_java_lang_ThreadDeath==0");
-			if (!proto_java_lang_ThreadDeath) printf("%s","proto_java_lang_ThreadDeath==0");
-
+			printf("Some Throwable");
 		}
 		printf(" thrown in ");
 
 		if (method) {
-			utf_display(method->class->name);
+			utf_display_classname(method->class->name);
 			printf(".");
 			utf_display(method->name);
 			if (method->flags & ACC_SYNCHRONIZED)
-				printf("(SYNC)");
+				printf("(SYNC");
 			else
-				printf("(NOSYNC)");
-			printf("(%p) at position %p\n", method->entrypoint, pos);
+				printf("(NOSYNC");
+			if (method->flags & ACC_NATIVE) {
+				printf(",NATIVE");
+				printf(")(%p) at position %p\n", method->entrypoint, pos);
+			} else {
+				printf(")(%p) at position %p (",method->entrypoint,pos);
+				if (method->class->sourcefile==NULL)
+					printf("<NO CLASSFILE INFORMATION>");
+				else
+					utf_display(method->class->sourcefile);
+				printf(":%d)\n",line);
+			}
 
 		} else
 			printf("call_java_method\n");
@@ -825,11 +811,12 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 	char logtext[MAXLOGTEXT];
 	for (i = 0; i < methodindent; i++)
 		logtext[i] = '\t';
+
 	sprintf(logtext + methodindent, "called: ");
-	utf_sprint(logtext + strlen(logtext), method->class->name);
+	utf_sprint_classname(logtext + strlen(logtext), method->class->name);
 	sprintf(logtext + strlen(logtext), ".");
 	utf_sprint(logtext + strlen(logtext), method->name);
-	utf_sprint(logtext + strlen(logtext), method->descriptor);
+	utf_sprint_classname(logtext + strlen(logtext), method->descriptor);
 
 	if ( method->flags & ACC_PUBLIC )       sprintf (logtext + strlen(logtext)," PUBLIC");
 	if ( method->flags & ACC_PRIVATE )      sprintf (logtext + strlen(logtext)," PRIVATE");
@@ -850,7 +837,7 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 	case 0:
 		break;
 
-#if defined(__I386__)
+#if defined(__I386__) || defined(__POWERPC__)
 	case 1:
 		sprintf(logtext+strlen(logtext), "%llx", a0);
 		break;
@@ -950,7 +937,8 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 #endif
 #endif
 	}
-	sprintf (logtext+strlen(logtext), ")");
+
+	sprintf(logtext + strlen(logtext), ")");
 	log_text(logtext);
 
 	methodindent++;
@@ -995,33 +983,38 @@ void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
 		methodindent--;
 	else
 		log_text("WARNING: unmatched methodindent--");
+
 	sprintf(logtext + methodindent, "finished: ");
-	utf_sprint(logtext + strlen(logtext), method->class->name);
+	utf_sprint_classname(logtext + strlen(logtext), method->class->name);
 	sprintf(logtext + strlen(logtext), ".");
 	utf_sprint(logtext + strlen(logtext), method->name);
-	utf_sprint(logtext + strlen(logtext), method->descriptor);
+	utf_sprint_classname(logtext + strlen(logtext), method->descriptor);
 
 	switch (method->returntype) {
 	case TYPE_INT:
 		sprintf(logtext + strlen(logtext), "->%d", (s4) l);
 		break;
+
 	case TYPE_LONG:
-#if defined(__I386__)
+#if defined(__I386__) || defined(__POWERPC__)
 		sprintf(logtext + strlen(logtext), "->%lld", (s8) l);
 #else
 		sprintf(logtext + strlen(logtext), "->%ld", (s8) l);
 #endif
 		break;
+
 	case TYPE_ADDRESS:
-#if defined(__I386__)
+#if defined(__I386__) || defined(__POWERPC__)
 		sprintf(logtext + strlen(logtext), "->%p", (u1*) ((s4) l));
 #else
 		sprintf(logtext + strlen(logtext), "->%p", (u1*) l);
 #endif
 		break;
+
 	case TYPE_FLOAT:
 		sprintf(logtext + strlen(logtext), "->%g", f);
 		break;
+
 	case TYPE_DOUBLE:
 		sprintf(logtext + strlen(logtext), "->%g", d);
 		break;
@@ -1030,21 +1023,6 @@ void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
 }
 
 
-void builtin_displaymethodexception(methodinfo *method)
-{
-	int i;
-	char logtext[MAXLOGTEXT];
-	for (i = 0; i < methodindent; i++)
-		logtext[i] = '\t';
-	sprintf(logtext + methodindent, "exception abort: ");
-	utf_sprint(logtext + strlen(logtext), method->class->name);
-	sprintf(logtext + strlen(logtext), ".");
-	utf_sprint(logtext + strlen(logtext), method->name);
-	utf_sprint(logtext + strlen(logtext), method->descriptor);
-	log_text(logtext);
-}
-
-
 /****************************************************************************
 			 SYNCHRONIZATION FUNCTIONS
 *****************************************************************************/
@@ -1136,9 +1114,12 @@ void internal_unlock_mutex_for_object (java_objectheader *object)
 
 void builtin_monitorenter(java_objectheader *o)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+#if defined(USE_THREADS)
+#if !defined(NATIVE_THREADS)
 	int hashValue;
 
+	/*log_text("Monitor enter");*/
+
 	assert(blockInts == 0);
 
 	++blockInts;
@@ -1153,15 +1134,22 @@ void builtin_monitorenter(java_objectheader *o)
 	--blockInts;
 
 	assert(blockInts == 0);
+#else
+	monitorEnter((threadobject*) THREADOBJECT, o);
+#endif
 #endif
 }
 
 
 void builtin_monitorexit (java_objectheader *o)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+
+#if defined(USE_THREADS)
+#if !defined(NATIVE_THREADS)
 	int hashValue;
 
+	/* log_text("Monitor leave"); */
+
 	assert(blockInts == 0);
 
 	++blockInts;
@@ -1180,6 +1168,9 @@ void builtin_monitorexit (java_objectheader *o)
 	--blockInts;
 
 	assert(blockInts == 0);
+#else
+	monitorExit((threadobject*) THREADOBJECT, o);
+#endif
 #endif
 }
 
@@ -1779,6 +1770,7 @@ java_arrayheader *builtin_clone_array(void *env, java_arrayheader *o)
 	return (java_arrayheader *) Java_java_lang_VMObject_clone(0, 0, (java_lang_Cloneable *) o);
 }
 
+
 s4 builtin_dummy()
 {
 	panic("Internal error: builtin_dummy called (native function is missing)");
@@ -1786,69 +1778,50 @@ s4 builtin_dummy()
 }
 
 
-inline methodinfo *builtin_asm_get_threadrootmethod() {
-        return *threadrootmethod;
+/* builtin_asm_get_exceptionptrptr *********************************************
+
+   this is a wrapper for calls from asmpart
+
+*******************************************************************************/
+
+java_objectheader **builtin_asm_get_exceptionptrptr()
+{
+	return builtin_get_exceptionptrptr();
 }
 
-inline native_stackframeinfo **builtin_asm_new_stackframeinfo() {
-	native_stackframeinfo **infop;
-	native_stackframeinfo *info;
+
+methodinfo *builtin_asm_get_threadrootmethod()
+{
+	return *threadrootmethod;
+}
+
+
+inline void* builtin_asm_get_stackframeinfo()
+{
+/*log_text("builtin_asm_get_stackframeinfo()");*/
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-/*	log_text("native_stackframeinfo **builtin_asm_new_stackframeinfo(): __thread");*/
-	infop=&_thread_nativestackframeinfo; /*support for __thread attribute*/
-#else
-/*    log_text("native_stackframeinfo **builtin_asm_new_stackframeinfo(): pthread");*/
-    infop= &((nativethread*) pthread_getspecific(tkey_stackframeinfo))->_stackframeinfo /*copied from exception handling, is that really correct */
-	/*old pthread*/
-#endif
+	return &THREADINFO->_stackframeinfo;
 #else
+#if defined(__GNUC__)
 #warning FIXME FOR OLD THREAD IMPL (jowenn)
-/*        log_text("native_stackframeinfo **builtin_asm_new_stackframeinfo(): no thread");*/
-	infop=&_thread_nativestackframeinfo; /* no threading, at least no native*/
 #endif
-	info=*infop;
-	if (!(info->next)) {
-		info->next=MNEW(native_stackframeinfo,1);
-/*
-		info->next->returnFromNative=0;
-		info->next->method=0;
-*/
-		info->next->prev=info;
-		info->next->next=0;
-	}
-	(*infop)=info->next;
-/*	{
-		int i=0;
-		native_stackframeinfo *inf;
-		info=info->next;
-		log_text("returning from:  native_stackframeinfo **builtin_asm_new_stackframeinfo()");
-		for (inf=info;inf;inf=inf->prev) i++;
-		i--;
-		printf ("current depth: %ld\n",i);	
-		for (inf=info->next;inf;inf=inf->next) i++;
-		printf ("max depth: %ld\n",i);
-	}*/
-	return infop;
-}
-
-inline native_stackframeinfo *builtin_asm_get_framestackinfo(){
-        native_stackframeinfo **infop;
-        native_stackframeinfo *info;
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-        return _thread_nativestackframeinfo; /*support for __thread attribute*/
-#else
-    return ((nativethread*) pthread_getspecific(tkey_stackframeinfo))->_stackframeinfo /*copied from exception handling, is that 
-really $
-        /*old pthread*/
+		return &_thread_nativestackframeinfo; /* no threading, at least no native*/
 #endif
-#else
-#warning FIXME FOR OLD THREAD IMPL (jowenn)
-	printf("blockaddr=%p\n",_thread_nativestackframeinfo);
-	printf("retaddr=%p\n",_thread_nativestackframeinfo->returnFromNative);
-        return _thread_nativestackframeinfo; /* no threading, at least no native*/
+}
+
+stacktraceelement *builtin_stacktrace_copy(stacktraceelement **el,stacktraceelement *begin, stacktraceelement *end) {
+/*	stacktraceelement *el;*/
+	size_t s;
+	s=(end-begin);
+	/*printf ("begin: %p, end: %p, diff: %ld, size :%ld\n",begin,end,s,s*sizeof(stacktraceelement));*/
+	*el=MNEW(stacktraceelement,s+1); /*GC*/
+	memcpy(*el,begin,(end-begin)*sizeof(stacktraceelement));
+	(*el)[s].method=0;
+#if defined(__GNUC__)
+#warning change this if line numbers bigger than u2 are allowed, the currently supported class file format does no allow that
 #endif
+	(*el)[s].linenumber=-1; /* -1 can never be reched otherwise, since line numbers are only u2, so it is save to use that as flag */
+	return *el;
 }
 
 /*