typedef a ptrint type to cast function pointers to int.

[cacao.git] / asmpart.h

diff --git a/asmpart.h b/asmpart.h
index 7237ba31107778f9ecd339046c82fab1466c26b2..0ce6e85e76c189eee20118e32c25b8cca6922db9 100644 (file)
--- a/asmpart.h
+++ b/asmpart.h
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: asmpart.h 596 2003-11-09 20:05:07Z twisti $
+   $Id: asmpart.h 1296 2004-07-10 17:02:15Z stefan $
 
 */
 
@@ -38,6 +38,8 @@
 #define _ASMPART_H
 
 #include "global.h"
+#include "jni.h"
+#include "threads/thread.h"
 
 /* 
    determines if the byte support instruction set (21164a and higher)
@@ -61,8 +63,6 @@ void asm_call_jit_compiler();
    with up to 4 parameters. This function calls a Java-method (which
    possibly needs compilation) with up to 4 parameters.
 */
-java_objectheader *asm_calljavamethod(methodinfo *m, void *arg1, void *arg2,
-                                      void *arg3, void *arg4);
 
 /* 
    This function calls a Java-method (which possibly needs compilation)
@@ -72,32 +72,44 @@ java_objectheader *asm_calljavamethod(methodinfo *m, void *arg1, void *arg2,
 */
 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);
+
+/* 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();
 void asm_handle_nat_exception();
-void asm_handle_builtin_exception(classinfo *);
 
-/* 
-   gets the class of the caller from the stack frame
-*/
-methodinfo *asm_getcallingmethod();
+void asm_check_clinit();
 
+void asm_handle_builtin_exception(classinfo *);
+void asm_throw_and_handle_exception();
+void asm_throw_and_handle_hardware_arithmetic_exception();
 
-/* 
-   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);
+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);*/
 
 void *asm_switchstackandcall(void *stack, void *func, void **stacktopsave, void * p);
 
 void asm_builtin_trace();
 void asm_builtin_exittrace();
 
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+extern threadcritnode asm_criticalsections;
+#endif
+
+void asm_getclassvalues_atomic(vftbl_t *super, vftbl_t *sub, castinfo *out);
+
+
 #endif /* _ASMPART_H */