fix // comment

[cacao.git] / builtin.h

diff --git a/builtin.h b/builtin.h
index bc290a4568ba8d2233d652510f37732389f58868..0cd80547c50402dabb8ec8347cd4cc34b6e966c7 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -28,7 +28,7 @@
 
    Changes: Edwin Steiner
 
-   $Id: builtin.h 963 2004-03-15 07:37:49Z jowenn $
+   $Id: builtin.h 1369 2004-08-01 21:53:32Z stefan $
 
 */
 
@@ -37,7 +37,8 @@
 #define _BUILTIN_H
 
 #include "config.h"
-#include "toolbox/loging.h"
+#include "toolbox/logging.h"
+#include "threads/thread.h"
 
 
 /* define infinity for floating point numbers */
@@ -107,18 +108,18 @@ extern builtin_descriptor builtin_desc[];
 #undef THREADSPECIFIC
 #define THREADSPECIFIC __thread
 
-#else
+#endif
 
 #undef exceptionptr
 #undef threadrootmethod
 #define exceptionptr builtin_get_exceptionptrptr()
 #define threadrootmethod  builtin_get_threadrootmethod()
 #endif
-#endif
 
-extern THREADSPECIFIC java_objectheader* _exceptionptr;
-extern THREADSPECIFIC methodinfo* _threadrootmethod;
-extern THREADSPECIFIC void* _threadnativestackframeinfo;
+#if !defined(USE_THREADS) || !defined(NATIVE_THREADS)
+extern java_objectheader *_exceptionptr;
+extern methodinfo* _threadrootmethod;
+#endif
 
 
 /**********************************************************************/
@@ -150,11 +151,11 @@ s4 builtin_instanceof(java_objectheader *obj, classinfo *class);
 #define BUILTIN_instanceof (functionptr) builtin_instanceof
 s4 builtin_isanysubclass (classinfo *sub, classinfo *super);
 /* NOT AN OP */
-s4 builtin_isanysubclass_vftbl (vftbl *sub, vftbl *super);
+s4 builtin_isanysubclass_vftbl (vftbl_t *sub, vftbl_t *super);
 /* NOT AN OP */
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class);
 /* NOT AN OP */
-s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl *target);
+s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target);
 #define BUILTIN_arrayinstanceof (functionptr) builtin_arrayinstanceof
 
 #if defined(__I386__)
@@ -163,22 +164,18 @@ s4 asm_builtin_arrayinstanceof(java_objectheader *obj, classinfo *class); /* XXX
 #define BUILTIN_arrayinstanceof (functionptr) asm_builtin_arrayinstanceof
 #endif
 
-s4 builtin_checkarraycast(java_objectheader *obj, vftbl *target);
+s4 builtin_checkarraycast(java_objectheader *obj, vftbl_t *target);
 /* NOT AN OP */
-s4 asm_builtin_checkarraycast(java_objectheader *obj, vftbl *target);
+s4 asm_builtin_checkarraycast(java_objectheader *obj, vftbl_t *target);
 #define BUILTIN_checkarraycast (functionptr) asm_builtin_checkarraycast
 
 java_objectheader *builtin_throw_exception(java_objectheader *exception);
 /* NOT AN OP */
-java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr,
-                                                                                  methodinfo *method, 
-                                                                                  int *pos, int line, int noindent);
-/* NOT AN OP */
-
-static inline java_objectheader **builtin_get_exceptionptrptr();
-static inline methodinfo **builtin_get_threadrootmethod();
-/* NOT AN OP */
-void builtin_reset_exceptionptr();
+java_objectheader *builtin_trace_exception(java_objectheader *xptr,
+                                                                                  methodinfo *m,
+                                                                                  void *pos,
+                                                                                  s4 line,
+                                                                                  s4 noindent);
 /* NOT AN OP */
 
 java_objectheader *builtin_new(classinfo *c);
@@ -189,13 +186,13 @@ java_objectheader *asm_builtin_new(classinfo *c);
 #define BUILTIN_new (functionptr) builtin_new
 #endif
 
-java_arrayheader *builtin_newarray(s4 size, vftbl *arrayvftbl);
+java_arrayheader *builtin_newarray(s4 size, vftbl_t *arrayvftbl);
 #define BUILTIN_newarray (functionptr) builtin_newarray
 java_objectarray *builtin_anewarray(s4 size, classinfo *component);
 /* NOT AN OP */
 
 #if defined(__I386__)
-void asm_builtin_newarray(s4 size, vftbl *arrayvftbl);
+void asm_builtin_newarray(s4 size, vftbl_t *arrayvftbl);
 #undef  BUILTIN_newarray
 #define BUILTIN_newarray (functionptr) asm_builtin_newarray
 #endif
@@ -216,8 +213,8 @@ java_intarray *builtin_newarray_int(s4 size);
 #define BUILTIN_newarray_int (functionptr) builtin_newarray_int
 java_longarray *builtin_newarray_long(s4 size);
 #define BUILTIN_newarray_long (functionptr) builtin_newarray_long
-java_arrayheader *builtin_nmultianewarray(int n,
-                                          vftbl *arrayvftbl, long *dims);
+java_arrayheader *builtin_nmultianewarray(int n, vftbl_t *arrayvftbl, long *dims);
+/*  java_arrayheader *builtin_nmultianewarray(int n, classinfo *arrayclass, long *dims); */
 /* NOT AN OP */
 
 s4 builtin_canstore(java_objectarray *a, java_objectheader *o);
@@ -227,28 +224,27 @@ void asm_builtin_aastore(java_objectarray *a, s4 index, java_objectheader *o);
 
 #ifdef TRACE_ARGS_NUM
 #if TRACE_ARGS_NUM == 6
-void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, methodinfo *method);
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, methodinfo *m);
 /* NOT AN OP */
 #else
-void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, s8 a6, s8 a7, methodinfo *method);
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, s8 a6, s8 a7, methodinfo *m);
 /* NOT AN OP */
 #endif
 #endif
-void builtin_displaymethodstart(methodinfo *method);
-/* NOT AN OP */
-void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f);
+void builtin_displaymethodstart(methodinfo *m);
 /* NOT AN OP */
-/* void builtin_displaymethodstop(methodinfo *method); */
-void builtin_displaymethodexception(methodinfo *method);
+void builtin_displaymethodstop(methodinfo *m, s8 l, double d, float f);
 /* NOT AN OP */
 
 void builtin_monitorenter(java_objectheader *o);
 /* NOT AN OP */
+void builtin_staticmonitorenter(classinfo *c);
+/* NOT AN OP */
 void asm_builtin_monitorenter(java_objectheader *o);
 #define BUILTIN_monitorenter (functionptr) asm_builtin_monitorenter
-void builtin_monitorexit(java_objectheader *o);
+void *builtin_monitorexit(java_objectheader *o);
 /* NOT AN OP */
-void asm_builtin_monitorexit(java_objectheader *o);
+void *asm_builtin_monitorexit(java_objectheader *o);
 #define BUILTIN_monitorexit (functionptr) asm_builtin_monitorexit
 
 s4 builtin_idiv(s4 a, s4 b);
@@ -370,38 +366,29 @@ s4 builtin_dummy();
 /* NOT AN OP */
 
 /* conversion helper functions */
-
 inline float intBitsToFloat(s4 i);
 inline float longBitsToDouble(s8 l);
 
+/* this is a wrapper for calls from asmpart */
+java_objectheader **builtin_asm_get_exceptionptrptr();
 
-static inline java_objectheader **builtin_get_exceptionptrptr()
-{
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-    return &_exceptionptr;
-#else
-    return &((nativethread*) pthread_getspecific(tkey_exceptionptr))->_exceptionptr;
-#endif
-#else
-    panic("builtin_get_exceptionptrptr should not be used in this configuration");
-    return NULL;
-#endif
+static inline java_objectheader **builtin_get_exceptionptrptr();
+/* NOT AN OP */
+static inline methodinfo **builtin_get_threadrootmethod();
+/* NOT AN OP */
+
+inline java_objectheader **builtin_get_exceptionptrptr()
+{
+       return &THREADINFO->_exceptionptr;
 }
 
-static inline methodinfo **builtin_get_threadrootmethod()
+inline methodinfo **builtin_get_threadrootmethod()
 {
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-    return &_threadrootmethod;
-#else
-    return &((nativethread*) pthread_getspecific(tkey_threadrootmethod))->_threadrootmethod;
-#endif
-#else
-    panic("builting_get_threadrootmethod should not be used in this configuration");
-    return NULL;
-#endif
+       return &THREADINFO->_threadrootmethod;
 }
+#endif
+
 
 /* returns the root method of a thread. this is used in asmpart.S and delivers the abort condition
    for the stack unwinding for getClassContext and getClassLoader. For the main thread this is the main function.