calls instead of machine instructions, using the C calling
convention.
- $Id: builtin.c 1022 2004-04-21 18:30:53Z stefan $
+ $Id: builtin.c 1113 2004-06-02 10:31:09Z twisti $
*/
#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"
s4 builtin_isanysubclass(classinfo *sub, classinfo *super)
{
s4 res;
+ castinfo classvalues;
/*classinfo *tmp;*/
if (super->flags & ACC_INTERFACE)
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;
}
char logtext[MAXLOGTEXT];
sprintf(logtext, "Builtin exception thrown: ");
if (local_exceptionptr) {
- utf_sprint(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name);
+ 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;
}
vftbl *valuevftbl;
int dim_m1;
int base;
+ castinfo classvalues;
if (!o) return 1;
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;
}
arraydescriptor *desc;
vftbl *elementvftbl;
vftbl *valuevftbl;
- int base;
s4 res;
+ int base;
+ castinfo classvalues;
if (!o) return 1;
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;
}
vftbl *elementvftbl;
vftbl *valuevftbl;
s4 res;
+ castinfo classvalues;
if (!o) return 1;
if (valuevftbl == elementvftbl)
return 1;
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- cast_lock();
-#endif
+ asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
- res = (unsigned)(valuevftbl->baseval - elementvftbl->baseval)
- <= (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;
}
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
#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.
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;
+ desc = arrayvftbl->arraydesc;
+ dataoffset = desc->dataoffset;
+ componentsize = desc->componentsize;
+
if (size < 0) {
- *exceptionptr = new_exception(string_java_lang_NegativeArraySizeException);
+ *exceptionptr =
+ new_exception(string_java_lang_NegativeArraySizeException);
return NULL;
}
memset(a, 0, actualsize);
- /*printf("builtin_newarray: Created an array of size : %d\n",size);*/
-
a->objheader.vftbl = arrayvftbl;
a->size = size;
#ifdef SIZE_FROM_CLASSINFO
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
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);
}
******************************************************************************/
- /* 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) */
/* 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;
if (verbose || runverbose || verboseexception) {
if (_exceptionptr) {
printf("Exception ");
- utf_display(_exceptionptr->vftbl->class->name);
+ utf_display_classname(_exceptionptr->vftbl->class->name);
} else {
printf("Some Throwable");
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");
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:
}
-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
*****************************************************************************/
}
-inline methodinfo *builtin_asm_get_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;
}
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
return &THREADINFO->_stackframeinfo;
#else
+#if defined(__GNUC__)
#warning FIXME FOR OLD THREAD IMPL (jowenn)
+#endif
return &_thread_nativestackframeinfo; /* no threading, at least no native*/
#endif
}
size_t s;
s=(end-begin);
/*printf ("begin: %p, end: %p, diff: %ld, size :%ld\n",begin,end,s,s*sizeof(stacktraceelement));*/
- *el=GCNEW(stacktraceelement,s+1);
+ *el=MNEW(stacktraceelement,s+1); /*GC*/
memcpy(*el,begin,(end-begin)*sizeof(stacktraceelement));
(*el)[s].method=0;
- (*el)[s].linenumber=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;
}
projects / cacao.git / blobdiff