- header changes

[cacao.git] / tables.h

diff --git a/tables.h b/tables.h
index c4304b5504da9bc6291d90f70819f5b96bfeff7a..8b37efb023ba665a58c35ebf0fc1ac7b3b6f50b4 100644 (file)
--- a/tables.h
+++ b/tables.h
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: tables.h 700 2003-12-07 15:54:28Z edwin $
+   $Id: tables.h 1087 2004-05-26 21:27:03Z twisti $
 
 */
 
@@ -42,23 +42,33 @@
 /* to determine the end of utf strings */
 #define utf_end(utf) ((char *) utf->text+utf->blength)
 
-/* switches for debug messages */
-extern bool collectverbose;
-extern list unloadedclasses;
-
 /* 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      */
+
 /* creates hashtables for symboltables */
 void tables_init();
 
 /* free memory for hashtables */ 
 void tables_close(stringdeleter del);
 
+/* check if a UTF-8 string is valid */
+bool is_valid_utf(char *utf_ptr, char *end_pos);
+
+/* check if a UTF-8 string may be used as a class/field/method name */
+bool is_valid_name(char *utf_ptr, char *end_pos);
+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);
 
 /* write utf symbol to logfile/stdout */
 void log_utf(utf *u);
@@ -66,6 +76,8 @@ 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_int(char *text, u2 length);
 utf *utf_new_char(char *text);
 utf *utf_new_char_classname(char *text);
 
@@ -80,12 +92,14 @@ 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_int(utf *u);
 
 /* return an array class with the given component class */
 classinfo *class_array_of(classinfo *component);
 
 /* return an array class with the given dimension and element class */
-classinfo *class_multiarray_of(int dim,classinfo *element);
+classinfo *class_multiarray_of(int dim, classinfo *element);
 
 /* get javatype according to a typedescriptor */
 u2 desc_to_type(utf *descriptor);
@@ -102,11 +116,10 @@ void init_hashtable(hashtable *hash, u4 size);
 /* search for class in classtable */
 classinfo *class_get(utf *u);
 
-
-void heap_init (u4 size, u4 startsize, void **stackbottom);
-void heap_close();
-void *heap_allocate(u4 bytelength, bool references, methodinfo *finalizer);
-void heap_addreference(void **reflocation);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+void tables_lock();
+void tables_unlock();
+#endif
 
 #endif /* _TABLES_H */