GNU header update.

[cacao.git] / src / vm / tables.h

diff --git a/src/vm/tables.h b/src/vm/tables.h
index bc73ef3bb7f72689c088e85948ac3cae0ee37afd..7c19b1baf53924038720b37abc4631cd74a129b4 100644 (file)
--- a/src/vm/tables.h
+++ b/src/vm/tables.h
@@ -1,9 +1,9 @@
 /* tables.h - 
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 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
 
    This file is part of CACAO.
 
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: tables.h 724 2003-12-09 18:56:11Z edwin $
+   $Id: tables.h 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -42,26 +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;
+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   */
+
 
-/* function for disposing javastrings */
-typedef void (*stringdeleter) (java_objectheader *string);
-    
 /* 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);
 
-/* check if an 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);
@@ -69,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);
 
@@ -84,11 +95,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_intern(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);
@@ -105,11 +119,13 @@ 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);
 
-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 */