merged volatile memory barriers

[cacao.git] / src / vm / jit / replace.hpp

diff --git a/src/vm/jit/replace.hpp b/src/vm/jit/replace.hpp
index 20b61ec7051fd06e5af27b991797d0f1baaf6623..e83134904b8a49ad4f1016bb9ff27913266b9a20 100644 (file)
--- a/src/vm/jit/replace.hpp
+++ b/src/vm/jit/replace.hpp
@@ -57,8 +57,9 @@ typedef union  replace_val_t replace_val_t;
 #include "arch.h"
 #include "md-abi.h"
 
-#include "vm/method.h"
+#include "vm/method.hpp"
 
+#include "vm/jit/executionstate.h"
 #include "vm/jit/reg.h"
 #include "vm/jit/stacktrace.hpp"
 
@@ -249,7 +250,7 @@ void replace_free_replacement_points(codeinfo *code);
 void replace_activate_replacement_points(codeinfo *code, bool mappable);
 void replace_deactivate_replacement_points(codeinfo *code);
 
-bool replace_me_wrapper(u1 *pc, void *context);
+bool replace_handler(u1 *pc, executionstate_t *es);
 
 #if !defined(NDEBUG)
 void replace_show_replacement_points(codeinfo *code);