a few finalizer testcases, old thread implementation uses now VMThread, no mor contex...

[cacao.git] / asmpart.h

diff --git a/asmpart.h b/asmpart.h
index b938f1158f52d28d545cb5dbff92e19467a74c76..ca98704c94db47a80a98f7a0695b51922685cf95 100644 (file)
--- a/asmpart.h
+++ b/asmpart.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: asmpart.h 963 2004-03-15 07:37:49Z jowenn $
+   $Id: asmpart.h 1173 2004-06-16 14:56:18Z jowenn $
 
 */
 
@@ -39,6 +39,7 @@
 
 #include "global.h"
 #include "jni.h"
+#include "threads/thread.h"
 
 /* 
    determines if the byte support instruction set (21164a and higher)
@@ -71,10 +72,16 @@ void asm_call_jit_compiler();
 */
 java_objectheader *asm_calljavafunction(methodinfo *m, void *arg1, void *arg2,
                                         void *arg3, void *arg4);
-java_objectheader *asm_calljavafunction2(methodinfo *m, u4 count, u4 size , void *callblock);
-jdouble asm_calljavafunction2double(methodinfo *m, u4 count, u4 size , void *callblock);
-jlong asm_calljavafunction2long(methodinfo *m, u4 count, u4 size , void *callblock);
+java_objectheader *asm_calljavafunction2(methodinfo *m, u4 count, u4 size, void *callblock);
+jdouble asm_calljavafunction2double(methodinfo *m, u4 count, u4 size, void *callblock);
+jlong asm_calljavafunction2long(methodinfo *m, u4 count, u4 size, void *callblock);
 
+/* We need these two labels in codegen.inc to add the asm_calljavafunction*'s
+   into the methodtable */
+#if defined(__I386__) || defined(__X86_64__)
+void calljava_xhandler();
+void calljava_xhandler2();
+#endif
 
 
 void asm_handle_exception();
@@ -83,32 +90,25 @@ void asm_handle_nat_exception();
 void asm_check_clinit();
 
 void asm_handle_builtin_exception(classinfo *);
-
-/* 
-   gets the class of the caller from the stack frame
-*/
-methodinfo *asm_getcallingmethod();
+void asm_throw_and_handle_exception();
+void asm_throw_and_handle_hardware_arithmetic_exception();
 
 java_objectarray* Java_java_lang_VMSecurityManager_getClassContext(JNIEnv *env, jclass clazz);
 stacktraceelement *asm_get_stackTrace();
 
 /*java_lang_ClassLoader* Java_java_lang_VMSecurityManager_currentClassLoader(JNIEnv *env, jclass clazz);*/
-/* 
-   This funtion saves all callee saved registers and calls the function
-   which is passed as parameter.
-   This function is needed by the garbage collector, which needs to access
-   all registers which are stored on the stack. Unused registers are
-   cleared to avoid interferances with the GC.
-*/
-void asm_dumpregistersandcall(functionptr f);
-
 
 void *asm_switchstackandcall(void *stack, void *func, void **stacktopsave, void * p);
 
 void asm_builtin_trace();
 void asm_builtin_exittrace();
 
-int asm_xadd(int *, int);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+extern threadcritnode asm_criticalsections;
+#endif
+
+void asm_getclassvalues_atomic(vftbl *super, vftbl *sub, castinfo *out);
+
 
 #endif /* _ASMPART_H */