#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);
/* wrapper for code patching functions */
void asm_patcher_wrapper(void);
-long asm_compare_and_swap(volatile long *p, long oldval, long newval);
-void asm_memory_barrier(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);
void asm_escape_check(java_object_t *obj);
#endif
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif /* _ASMPART_H */