/* src/cacaoh/headers.c - functions for header generation
- Copyright (C) 1996-2005, 2006, 2007 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, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: headers.c 8295 2007-08-11 17:57:24Z michi $
-
*/
#define ACC_NATIVELY_OVERLOADED 0x10000000
+#if defined(ENABLE_HANDLES)
+# define HEAP_PREFIX "heap_"
+#else
+# define HEAP_PREFIX ""
+#endif
+
chain *ident_chain; /* chain with method and field names in current class */
FILE *file = NULL;
static uint32_t outputsize;
}
}
-static char *printtype(char *utf_ptr)
+static char *printtype(char *utf_ptr, char *prefix, char *infix)
{
uint16_t c;
fprintf(file, "double");
break;
case '[':
- addoutputsize ( sizeof(java_arrayheader*) );
+ addoutputsize ( sizeof(java_array_t*) );
switch (utf_nextu2(&utf_ptr)) {
- case 'I': fprintf (file, "java_intarray*"); break;
- case 'J': fprintf (file, "java_longarray*"); break;
- case 'Z': fprintf (file, "java_booleanarray*"); break;
- case 'B': fprintf (file, "java_bytearray*"); break;
- case 'S': fprintf (file, "java_shortarray*"); break;
- case 'C': fprintf (file, "java_chararray*"); break;
- case 'F': fprintf (file, "java_floatarray*"); break;
- case 'D': fprintf (file, "java_doublearray*"); break;
+ case 'I': fprintf (file, "java%s_intarray_t*", infix); break;
+ case 'J': fprintf (file, "java%s_longarray_t*", infix); break;
+ case 'Z': fprintf (file, "java%s_booleanarray_t*", infix); break;
+ case 'B': fprintf (file, "java%s_bytearray_t*", infix); break;
+ case 'S': fprintf (file, "java%s_shortarray_t*", infix); break;
+ case 'C': fprintf (file, "java%s_chararray_t*", infix); break;
+ case 'F': fprintf (file, "java%s_floatarray_t*", infix); break;
+ case 'D': fprintf (file, "java%s_doublearray_t*", infix); break;
- case '[': fprintf(file, "java_objectarray*");
+ case '[': fprintf(file, "java%s_objectarray_t*", infix);
while ((c = utf_nextu2(&utf_ptr)) == '[');
if (c == 'L')
while (utf_nextu2(&utf_ptr) != ';');
break;
- case 'L': fprintf(file, "java_objectarray*");
+ case 'L': fprintf(file, "java%s_objectarray_t*", infix);
while (utf_nextu2(&utf_ptr) != ';');
break;
default:
case 'L':
addoutputsize ( sizeof(java_object_t*));
- fprintf (file, "struct ");
+ fprintf (file, "struct %s", prefix);
while ( (c = utf_nextu2(&utf_ptr)) != ';' ) printIDpart (c);
fprintf (file, "*");
break;
return;
}
- printfields(c->super.cls);
+ printfields(c->super);
for (i = 0; i < c->fieldscount; i++) {
f = &(c->fields[i]);
if (!(f->flags & ACC_STATIC)) {
fprintf(file, " ");
- printtype(f->descriptor->text);
+ printtype(f->descriptor->text, HEAP_PREFIX, "");
fprintf(file, " ");
utf_fprint_printable_ascii(file, f->name);
/* create remarks */
fprintf(file, "\n/*\n * Class: ");
- utf_fprint_printable_ascii(file, m->class->name);
+ utf_fprint_printable_ascii(file, m->clazz->name);
fprintf(file, "\n * Method: ");
utf_fprint_printable_ascii(file, m->name);
fprintf(file, "\n * Signature: ");
/* create prototype */
fprintf(file, "JNIEXPORT ");
- printtype(utf_ptr);
+ printtype(utf_ptr, "", "_handle");
fprintf(file, " JNICALL Java_");
- printID(m->class->name);
+ printID(m->clazz->name);
chain_addlast(ident_chain, m->name);
if (!(m->flags & ACC_STATIC)) {
fprintf(file, ", struct ");
- printID(m->class->name);
- fprintf(file, "* this");
+ printID(m->clazz->name);
+ fprintf(file, "* _this");
} else {
fprintf(file, ", jclass clazz");
if ((*utf_ptr) != ')') fprintf(file, ", ");
while ((*utf_ptr) != ')') {
- utf_ptr = printtype(utf_ptr);
+ utf_ptr = printtype(utf_ptr, "", "_handle");
fprintf(file, " par%d", paramnum++);
if ((*utf_ptr)!=')') fprintf(file, ", ");
}
fprintf(file, "/* Structure information for class: ");
utf_fprint_printable_ascii(file, c->name);
fprintf(file, " */\n\n");
- fprintf(file, "typedef struct ");
- printID(c->name);
+ fprintf(file, "typedef struct %s", HEAP_PREFIX);
+ printID(c->name);
fprintf(file, " {\n");
outputsize = 0;
dopadding = true;
printfields(c);
+ fprintf(file, "} %s", HEAP_PREFIX);
+ printID(c->name);
+ fprintf(file, ";\n\n");
+
+#if defined(ENABLE_HANDLES)
+ /* create structure for indirection cell */
+ fprintf(file, "typedef struct ");
+ printID(c->name);
+ fprintf(file, " {\n");
+ fprintf(file, " %s", HEAP_PREFIX);
+ printID(c->name);
+ fprintf(file, " *heap_object;\n");
fprintf(file, "} ");
printID(c->name);
fprintf(file, ";\n\n");
+#endif
/* create chain for renaming overloaded methods */
chain_free(ident_chain);