* src/vm/signal.c (signal_thread): Restart sigwait if it has been

[cacao.git] / src / cacaoh / headers.c

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index 2e597df29033a7e7afbf8cdff2b2b44c3887415f..6f2ec0b5a42d075ab52487ff7040be798c14d43d 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -1,9 +1,7 @@
 /* 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.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: headers.c 8295 2007-08-11 17:57:24Z michi $
-
 */
 
 
@@ -43,7 +39,7 @@
 # include <ucontext.h>
 #endif
 
-#include "mm/gc-common.h"
+#include "mm/gc.hpp"
 #include "mm/memory.h"
 
 #include "toolbox/chain.h"
@@ -51,7 +47,7 @@
 
 #include "vm/builtin.h"
 #include "vm/global.h"
-#include "vm/stringlocal.h"
+#include "vm/string.hpp"
 
 #include "vmcore/class.h"
 #include "vmcore/method.h"
@@ -63,6 +59,12 @@
 
 #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;
@@ -145,7 +147,7 @@ void printOverloadPart(utf *desc)
        }
 }
 
-static char *printtype(char *utf_ptr)
+static char *printtype(char *utf_ptr, char *prefix, char *infix)
 {
        uint16_t c;
 
@@ -174,24 +176,24 @@ static char *printtype(char *utf_ptr)
                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:
@@ -202,7 +204,7 @@ static char *printtype(char *utf_ptr)
                
        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;
@@ -246,14 +248,14 @@ static void printfields(classinfo *c)
                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);
 
@@ -281,7 +283,7 @@ void printmethod(methodinfo *m)
 
        /* 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: ");
@@ -290,9 +292,9 @@ void printmethod(methodinfo *m)
 
        /* 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);
 
@@ -310,8 +312,8 @@ void printmethod(methodinfo *m)
                        
        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");
@@ -320,7 +322,7 @@ void printmethod(methodinfo *m)
        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, ", ");
        }
@@ -397,17 +399,30 @@ void headerfile_generate(classinfo *c, char *opt_directory)
        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);