#include "tables.h"
#include "builtin.h"
#include "jit.h"
-#ifdef OLD_COMPILER
-#include "compiler.h"
-#endif
#include "asmpart.h"
-#ifdef USE_BOEHM
#include "toolbox/memory.h"
-#endif
#include "toolbox/loging.h"
/* global variables ***********************************************************/
-extern bool newcompiler; /* true if new compiler is used */
bool opt_rt = false; /* true if RTA parse should be used RT-CO */
bool opt_xta = false; /* true if XTA parse should be used XTA-CO */
+bool opt_vta = false; /* true if VTA parse should be used VTA-CO */
int count_class_infos = 0; /* variables for measurements */
int count_const_pool_len = 0;
******************************************************************************/
primitivetypeinfo primitivetype_table[PRIMITIVETYPE_COUNT] = {
- { NULL, NULL, "java/lang/Double", 'D', "double" },
- { NULL, NULL, "java/lang/Float", 'F', "float" },
- { NULL, NULL, "java/lang/Character", 'C', "char" },
{ NULL, NULL, "java/lang/Integer", 'I', "int" },
{ NULL, NULL, "java/lang/Long", 'J', "long" },
+ { NULL, NULL, "java/lang/Float", 'F', "float" },
+ { NULL, NULL, "java/lang/Double", 'D', "double" },
{ NULL, NULL, "java/lang/Byte", 'B', "byte" },
+ { NULL, NULL, "java/lang/Character", 'C', "char" },
{ NULL, NULL, "java/lang/Short", 'S', "short" },
{ NULL, NULL, "java/lang/Boolean", 'Z', "boolean" },
{ NULL, NULL, "java/lang/Void", 'V', "void" }};
d -> arraytype = ARRAYTYPE_OBJECT;
d -> objectclass = class_new ( utf_new(utf_ptr+1, namelen-3) );
- d -> objectclass -> classUsed = 0; /* not used initially CO-RT */
+ d -> objectclass -> classUsed = NOTUSED; /* not used initially CO-RT */
d -> objectclass -> impldBy = NULL;
- d -> objectclass -> nextimpldBy = NULL;
break;
}
return d;
f -> descriptor = class_getconstant (c, suck_u2(), CONSTANT_Utf8); /* JavaVM descriptor */
f -> type = jtype = desc_to_type (f->descriptor); /* data type */
f -> offset = 0; /* offset from start of object */
+ f->xta = NULL;
switch (f->type) {
case TYPE_INT: f->value.i = 0; break;
m -> entrypoint = NULL;
m -> mcode = NULL;
m -> stubroutine = NULL;
- m -> methodUsed = 0;
- m -> XTAclasscount = 0;
- m -> numSubDefs = 0;
+ m -> methodUsed = NOTUSED;
+ m -> monoPoly = MONO;
+ m -> subRedefs = 0;
+ m -> subRedefsUsed = 0;
+
+ m->xta = NULL;
if (! (m->flags & ACC_NATIVE) ) {
m -> stubroutine = createcompilerstub (m);
functionptr f = native_findfunction
(c->name, m->name, m->descriptor, (m->flags & ACC_STATIC) != 0);
if (f) {
-#ifdef OLD_COMPILER
- if (newcompiler)
-#endif
m -> stubroutine = createnativestub (f, m);
-#ifdef OLD_COMPILER
- else
- m -> stubroutine = oldcreatenativestub (f, m);
-#endif
}
}
class_loadcpool (c);
- c -> classUsed = 0; /* not used initially CO-RT */
+ c -> classUsed = NOTUSED; /* not used initially CO-RT */
c -> impldBy = NULL;
- c -> nextimpldBy = NULL;
/* ACC flags */
c -> flags = suck_u2 ();
/* load fields */
c -> fieldscount = suck_u2 ();
-#ifdef USE_BOEHM
c -> fields = GCNEW (fieldinfo, c -> fieldscount);
-#else
- c -> fields = MNEW (fieldinfo, c -> fieldscount);
-#endif
for (i=0; i < c -> fieldscount; i++) {
field_load (&(c->fields[i]), c);
}
*******************************************************************************/
-static void class_link (classinfo *c)
+void class_link (classinfo *c)
{
s4 supervftbllength; /* vftbllegnth of super class */
s4 vftbllength; /* vftbllength of current class */
if (super == NULL) { /* class java.long.Object */
c->index = 0;
- c->classUsed = 1; /* Object class is always used CO-RT*/
+ c->classUsed = USED; /* Object class is always used CO-RT*/
c -> impldBy = NULL;
- c -> nextimpldBy = NULL;
c->instancesize = sizeof(java_objectheader);
vftbllength = supervftbllength = 0;
for (i = 0; i < c->fieldscount; i++)
field_free(&(c->fields[i]));
-#ifndef USE_BOEHM
- MFREE (c->fields, fieldinfo, c->fieldscount);
-#endif
for (i = 0; i < c->methodscount; i++)
method_free(&(c->methods[i]));
if (c->super)
class_init (c->super);
for (i=0; i < c->interfacescount; i++)
- class_init(c->interfaces[i]); // real
+ class_init(c->interfaces[i]); /* real */
m = class_findmethod (c, utf_clinit, utf_fidesc);
if (!m) {
blockInts = 0;
#endif
- exceptionptr = asm_calljavamethod (m, NULL,NULL,NULL,NULL);
+ exceptionptr = asm_calljavamethod(m, NULL, NULL, NULL, NULL);
#ifdef USE_THREADS
assert(blockInts == 0);
blockInts = b;
#endif
- if (exceptionptr) {
- printf ("#### Initializer of ");
- utf_display (c->name);
- printf (" has thrown: ");
- utf_display (exceptionptr->vftbl->class->name);
- printf ("\n");
- fflush (stdout);
- }
+ if (exceptionptr) {
+ printf("#### Initializer of ");
+ utf_display(c->name);
+ printf(" has thrown: ");
+ utf_display(exceptionptr->vftbl->class->name);
+ printf("\n");
+ fflush(stdout);
+ }
if (initverbose) {
- sprintf (logtext, "Finished initializer for class: ");
- utf_sprint (logtext+strlen(logtext), c->name);
- dolog ();
+ sprintf(logtext, "Finished initializer for class: ");
+ utf_sprint(logtext+strlen(logtext), c->name);
+ dolog();
}
if (c->name == utf_systemclass) {
voidptr e;
for (i=0; i<c->cpcount; i++) {
- //printf ("#%d: ", (int) i);
e = c -> cpinfos [i];
if (e) {
}
}
break;
-
- default:
}
}
u4 i = ii;
voidptr e;
-printf ("#%d: ", (int) i);
e = c -> cpinfos [i];
+printf ("#%d: ", (int) i);
if (e) {
switch (c -> cptags [i]) {
case CONSTANT_Class:
for (i=0;i<PRIMITIVETYPE_COUNT;i++) {
/* create primitive class */
classinfo *c = class_new ( utf_new_char(primitivetype_table[i].name) );
- c -> classUsed = 0; /* not used initially CO-RT */
+ c -> classUsed = NOTUSED; /* not used initially CO-RT */
c -> impldBy = NULL;
- c -> nextimpldBy = NULL;
/* prevent loader from loading primitive class */
list_remove (&unloadedclasses, c);
/* create class for wrapping the primitive type */
primitivetype_table[i].class_wrap =
class_new( utf_new_char(primitivetype_table[i].wrapname) );
- primitivetype_table[i].class_wrap -> classUsed = 0; /* not used initially CO-RT */
+ primitivetype_table[i].class_wrap -> classUsed = NOTUSED; /* not used initially CO-RT */
primitivetype_table[i].class_wrap -> impldBy = NULL;
- primitivetype_table[i].class_wrap -> nextimpldBy = NULL;
}
}
/* create class for arrays */
class_array = class_new ( utf_new_char ("The_Array_Class") );
- class_array -> classUsed = 0; /* not used initially CO-RT */
+ class_array -> classUsed = NOTUSED; /* not used initially CO-RT */
class_array -> impldBy = NULL;
- class_array -> nextimpldBy = NULL;
list_remove (&unloadedclasses, class_array);
/* create class for strings, load it after class Object was loaded */
string_class = utf_new_char ("java/lang/String");
class_java_lang_String = class_new(string_class);
- class_java_lang_String -> classUsed = 0; /* not used initially CO-RT */
+ class_java_lang_String -> classUsed = NOTUSED; /* not used initially CO-RT */
class_java_lang_String -> impldBy = NULL;
- class_java_lang_String -> nextimpldBy = NULL;
list_remove (&unloadedclasses, class_java_lang_String);
classinfo *subs;
c->vftbl->baseval = ++classvalue;
+
subs = c->sub;
while (subs != NULL) {
loader_compute_class_values(subs);
subs = subs->nextsub;
}
c->vftbl->diffval = classvalue - c->vftbl->baseval;
-/*
+ /*
{
int i;
for (i = 0; i < c->index; i++)
utf_display(c->name);
printf("\n");
}
-*/
+ */
}
projects / cacao.git / blobdiff