* src/vm/jit/x86_64/codegen.h: Use multi-byte NOP for code alignment.

[cacao.git] / src / vm / jit / x86_64 / freebsd / md-os.c

diff --git a/src/vm/jit/x86_64/freebsd/md-os.c b/src/vm/jit/x86_64/freebsd/md-os.c
index 6e4a2b227853841547c3ab343db497ff64399165..62ac3da95a795c4f31979f30b0f99d9a90350c08 100644 (file)
--- a/src/vm/jit/x86_64/freebsd/md-os.c
+++ b/src/vm/jit/x86_64/freebsd/md-os.c
@@ -2,6 +2,7 @@
 
    Copyright (C) 2007, 2008
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+   Copyright (C) 2009 Theobroma Systems Ltd.
 
    This file is part of CACAO.
 
@@ -29,12 +30,12 @@
 #include <stdlib.h>
 #include <ucontext.h>
 
-#include "threads/thread.h"
+#include "threads/thread.hpp"
 
-#include "vm/signallocal.h"
+#include "vm/signallocal.hpp"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/stacktrace.hpp"
 
 
 /* md_signal_handler_sigsegv ***************************************************
@@ -129,25 +130,6 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 #endif
 
 
-#if defined(ENABLE_THREADS)
-void thread_restartcriticalsection(ucontext_t *_uc)
-{
-       mcontext_t *_mc;
-       u1         *pc;
-       void       *critical;
-
-       _mc = &_uc->uc_mcontext;
-
-       pc = (u1 *) _mc->mc_rip;
-
-       critical = critical_find_restart_point(pc);
-
-       if (critical != NULL)
-               _mc->mc_rip = (ptrint) critical;
-}
-#endif
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where