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 adad8cd1e015b4f2e832a9c76de36a323caddf60..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"
 
@@ -229,12 +230,12 @@ struct sourcestate_t {
                cd->replacementpoint[-1].callsize = (cd->mcodeptr - cd->mcodebase)\
                                        - (ptrint) cd->replacementpoint[-1].pc;
 
-#else /* defined(ENABLE_GC_CACAO) */
+#else // ENABLE_GC_CACAO
 
 #define REPLACEMENT_POINT_FORGC_BUILTIN(cd, iptr)
 #define REPLACEMENT_POINT_FORGC_BUILTIN_RETURN(cd, iptr)
 
-#endif /* defined(ENABLE_GC_CACAO) */
+#endif // ENABLE_GC_CACAO
 
 
 /*** prototypes ********************************************************/
@@ -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);
@@ -265,12 +266,12 @@ void replace_source_frame_println(sourceframe_t *frame);
 void md_patch_replacement_point(u1 *pc, u1 *savedmcode, bool revert);
 #endif
 
-#endif /* defined(ENABLE_REPLACEMENT) */
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif // ENABLE_REPLACEMENT
+
 #endif // _REPLACE_HPP