merged volatile memory barriers

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

diff --git a/src/vm/jit/asmpart.h b/src/vm/jit/asmpart.h
index 65638faf7fc0022b7a40a7585eba830d9df7af3a..8769403d7392d8aae2776f220cd5489846f349d7 100644 (file)
--- a/src/vm/jit/asmpart.h
+++ b/src/vm/jit/asmpart.h
@@ -33,13 +33,15 @@
 #include "vm/types.h"
 
 #include "vm/global.h"
-#include "vm/vm.h"
-
-#include "vmcore/linker.h"
+#include "vm/vm.hpp"
 
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* machine dependent initialization */
 s4   asm_md_init(void);
 
@@ -98,9 +100,7 @@ void intrp_asm_abstractmethoderror(void);
 void asm_patcher_wrapper(void);
 
 /* cache flush function */
-void asm_cacheflush(u1 *addr, s4 nbytes);
-
-u8 asm_get_cycle_count(void);
+void asm_cacheflush(void* addr, int nbytes);
 
 void *md_asm_codegen_get_pv_from_pc(void *ra);
 
@@ -108,6 +108,10 @@ void *md_asm_codegen_get_pv_from_pc(void *ra);
 void asm_escape_check(java_object_t *obj);
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* _ASMPART_H */