Next save, with linking started.

[cacao.git] / tables.h

diff --git a/tables.h b/tables.h
index 0984ae7b2ada3db6500f40d61685a7f1c130526a..ffe19b9782b7e1381d329901bec50bd83b91432a 100644 (file)
--- a/tables.h
+++ b/tables.h
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: tables.h 935 2004-03-05 23:49:12Z twisti $
+   $Id: tables.h 1186 2004-06-19 12:24:42Z twisti $
 
 */
 
@@ -42,14 +42,18 @@
 /* to determine the end of utf strings */
 #define utf_end(utf) ((char *) utf->text+utf->blength)
 
-/* function for disposing javastrings */
-typedef void (*stringdeleter) (java_objectheader *string);
-    
+extern hashtable utf_hash;     /* hashtable for utf8-symbols */
+extern hashtable string_hash;  /* hashtable for javastrings  */
+extern hashtable class_hash;   /* hashtable for classes      */
+
+extern list unlinkedclasses;   /* this is only used for eager class loading   */
+
+
 /* creates hashtables for symboltables */
 void tables_init();
 
 /* free memory for hashtables */ 
-void tables_close(stringdeleter del);
+void tables_close();
 
 /* check if a UTF-8 string is valid */
 bool is_valid_utf(char *utf_ptr, char *end_pos);
@@ -60,7 +64,9 @@ bool is_valid_name_utf(utf *u);
 
 /* write utf symbol to file/buffer */
 void utf_sprint(char *buffer, utf *u);
+void utf_sprint_classname(char *buffer, utf *u);
 void utf_fprint(FILE *file, utf *u);
+void utf_fprint_classname(FILE *file, utf *u);
 void utf_display(utf *u);
 void utf_display_classname(utf *u);
 
@@ -70,6 +76,10 @@ void log_plain_utf(utf *u);
 
 /* create new utf-symbol */
 utf *utf_new(char *text, u2 length);
+
+/* without locking (caller already holding lock*/
+utf *utf_new_intern(char *text, u2 length);
+
 utf *utf_new_char(char *text);
 utf *utf_new_char_classname(char *text);
 
@@ -85,6 +95,9 @@ u4 utf_strlen(utf *u);
 /* search for class and create it if not found */
 classinfo *class_new(utf *u);
 
+/* without locking (caller already holding lock*/
+classinfo *class_new_intern(utf *u);
+
 /* return an array class with the given component class */
 classinfo *class_array_of(classinfo *component);
 
@@ -106,6 +119,14 @@ void init_hashtable(hashtable *hash, u4 size);
 /* search for class in classtable */
 classinfo *class_get(utf *u);
 
+/* remove class from classtable */
+bool class_remove(classinfo *c);
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+void tables_lock();
+void tables_unlock();
+#endif
+
 #endif /* _TABLES_H */