* src/vm/jit/asmpart.h (calljava_xhandler2): Not required anymore.

[cacao.git] / src / vm / jit / asmpart.h

diff --git a/src/vm/jit/asmpart.h b/src/vm/jit/asmpart.h
index bf858275aeece66ab7d2c8dc31168eab8a70bfc1..21d8957d8239bd60daaeb23ce7292b3bd05d890a 100644 (file)
--- a/src/vm/jit/asmpart.h
+++ b/src/vm/jit/asmpart.h
@@ -30,7 +30,7 @@
    Changes: Christian Thalinger
             Edwin Steiner
 
-   $Id: asmpart.h 4619 2006-03-15 20:42:00Z edwin $
+   $Id: asmpart.h 4920 2006-05-15 13:13:22Z twisti $
 
 */
 
@@ -45,6 +45,7 @@
 #if defined(USE_THREADS)
 # if defined(NATIVE_THREADS)
 #  include "threads/native/threads.h"
+#  include "threads/native/critical.h"
 # else
 #  include "threads/green/threads.h"
 # endif
@@ -54,8 +55,8 @@
 #include "vm/linker.h"
 #include "vm/resolve.h"
 #include "vm/vm.h"
-#include "vm/jit/stacktrace.h"
 #include "vm/jit/replace.h"
+#include "vm/jit/stacktrace.h"
 
 
 /* some macros ****************************************************************/
@@ -98,10 +99,7 @@ struct castinfo {
 /* function prototypes ********************************************************/
 
 /* machine dependent initialization */
-s4 asm_md_init(void);
-
-void asm_sync_instruction_cache(void);
-
+s4   asm_md_init(void);
 
 /* 
    invokes the compiler for untranslated JavaVM methods.
@@ -110,7 +108,6 @@ void asm_sync_instruction_cache(void);
 */
 void asm_call_jit_compiler(void);
 
-
 #if defined(ENABLE_JIT)
 java_objectheader *asm_vm_call_method(methodinfo *m, s4 vmargscount,
                                                                          vm_arg *vmargs);
@@ -119,6 +116,8 @@ s4     asm_vm_call_method_int(methodinfo *m, s4 vmargscount, vm_arg *vmargs);
 s8     asm_vm_call_method_long(methodinfo *m, s4 vmargscount, vm_arg *vmargs);
 float  asm_vm_call_method_float(methodinfo *m, s4 vmargscount, vm_arg *vmargs);
 double asm_vm_call_method_double(methodinfo *m, s4 vmargscount, vm_arg *vmargs);
+
+void   asm_vm_call_method_exception_handler(void);
 #endif
 
 #if defined(ENABLE_INTRP)
@@ -135,13 +134,6 @@ double intrp_asm_vm_call_method_double(methodinfo *m, s4 vmargscount,
                                                                           vm_arg *vmargs);
 #endif
 
-
-/* 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_xhandler2(void);
-#endif
-
 /* exception handling functions */
 
 #if defined(ENABLE_JIT)
@@ -159,7 +151,7 @@ void asm_replacement_in(executionstate *es);
 void *asm_switchstackandcall(void *stack, void *func, void **stacktopsave, void * p);
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-extern threadcritnode asm_criticalsections;
+extern critical_section_node_t asm_criticalsections;
 #endif
 
 
@@ -177,8 +169,10 @@ void asm_perform_threadswitch(u1 **from, u1 **to, u1 **stackTop);
 u1*  asm_initialize_thread_stack(void *func, u1 *stack);
 #endif
 
-/* may be required on some architectures (at least for PowerPC and ARM) */
-void asm_cacheflush(void *p, s4 size);
+/* cache flush function */
+void asm_cacheflush(u1 *addr, s4 nbytes);
+
+u8 asm_get_cycle_count(void);
 
 #endif /* _ASMPART_H */