X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fbuiltin.c;h=6f99656c38b292b4c066fa086a096c729383bf79;hb=3b3e87b38c342b644df42f5f4101c8d1737f895e;hp=acd8f50709abfe1c059d5316e3464f808d0c298b;hpb=a99bacb6174d51571e29ec0e141a9b4db38db54d;p=cacao.git diff --git a/src/vm/builtin.c b/src/vm/builtin.c index acd8f5070..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 957 2004-03-14 21:01:12Z twisti $ + $Id: builtin.c 1113 2004-06-02 10:31:09Z twisti $ */ +#include "global.h" #include #include #include #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,7 +60,6 @@ #undef DEBUG /*define DEBUG 1*/ - THREADSPECIFIC methodinfo* _threadrootmethod = NULL; THREADSPECIFIC void *_thread_nativestackframeinfo=NULL; @@ -81,6 +80,7 @@ THREADSPECIFIC void *_thread_nativestackframeinfo=NULL; s4 builtin_isanysubclass(classinfo *sub, classinfo *super) { s4 res; + castinfo classvalues; /*classinfo *tmp;*/ if (super->flags & ACC_INTERFACE) @@ -115,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 - - res = (unsigned) (sub->vftbl->baseval - super->vftbl->baseval) <= - (unsigned) (super->vftbl->diffval); + asm_getclassvalues_atomic(super->vftbl, sub->vftbl, &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; } 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; } @@ -278,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: "); - 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: "); + } 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 ******************************* @@ -329,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; @@ -352,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; } @@ -388,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; @@ -410,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; } @@ -437,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; @@ -457,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; } @@ -486,20 +442,23 @@ s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o) java_objectheader *builtin_new(classinfo *c) { java_objectheader *o; -/*DEBUGING - NOT THREAD SAFE*/ -/* static long depth=0; - depth++; - printf("Entering builtin_new:depth(%ld)",depth);*/ + + /* 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 @@ -508,23 +467,18 @@ java_objectheader *builtin_new(classinfo *c) #else o = heap_allocate(c->instancesize, true, c->finalizer); #endif - if (!o) { - /*DEBUGING - NOT THREAD SAFE*/ - /*printf("Leaving builtin_new: depth(%ld): NULL",depth); - depth--;*/ + + if (!o) return NULL; - } memset(o, 0, c->instancesize); o->vftbl = c->vftbl; - /*DEBUGING - NOT THREAD SAFE*/ - /* printf("Leaving builtin_new: depth(%ld): object",depth); - depth--;*/ return o; } + /********************** Function: builtin_newarray ************************** Creates an array with the given vftbl on the heap. @@ -539,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; @@ -582,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 @@ -592,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); } @@ -729,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) */ @@ -755,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; @@ -776,7 +751,8 @@ u4 methodindent = 0; java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr, methodinfo *method, - int *pos, + int *pos, + int line, int noindent) { if (!noindent) { @@ -785,24 +761,13 @@ 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) { + printf("Exception "); utf_display_classname(_exceptionptr->vftbl->class->name); } else { - printf("Error: "); - 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 "); @@ -811,10 +776,20 @@ java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr, 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(""); + else + utf_display(method->class->sourcefile); + printf(":%d)\n",line); + } } else printf("call_java_method\n"); @@ -838,10 +813,10 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, 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"); @@ -1010,10 +985,10 @@ void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f) 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: @@ -1048,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 *****************************************************************************/ @@ -1154,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; @@ -1171,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; @@ -1198,6 +1168,9 @@ void builtin_monitorexit (java_objectheader *o) --blockInts; assert(blockInts == 0); +#else + monitorExit((threadobject*) THREADOBJECT, o); +#endif #endif } @@ -1797,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)"); @@ -1804,25 +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(); +} + + +methodinfo *builtin_asm_get_threadrootmethod() +{ + return *threadrootmethod; } -inline void* -builtin_asm_get_stackframeinfo(){ +inline void* builtin_asm_get_stackframeinfo() +{ /*log_text("builtin_asm_get_stackframeinfo()");*/ #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*/ -#endif + return &THREADINFO->_stackframeinfo; #else +#if defined(__GNUC__) #warning FIXME FOR OLD THREAD IMPL (jowenn) - return &_thread_nativestackframeinfo; /* no threading, at least no native*/ #endif + return &_thread_nativestackframeinfo; /* no threading, at least no native*/ +#endif +} + +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; } /*