Merge from subtype.

[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 1bbeab093f65e06fbb335bfffc58f6865de80939..4b683342a409e8298af3c8e412e57cb0b6db21e5 100644 (file)
--- a/src/vm/jit/x86_64/freebsd/md-os.c
+++ b/src/vm/jit/x86_64/freebsd/md-os.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/x86_64/freebsd/md-os.c - machine dependent x86_64 FreeBSD functions
 
-   Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md.c 7249 2007-01-29 19:32:52Z twisti $
-
 */
 
 
@@ -33,14 +29,12 @@
 #include <stdlib.h>
 #include <ucontext.h>
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/threads.h"
-#endif
+#include "threads/thread.hpp"
 
 #include "vm/signallocal.h"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/stacktrace.hpp"
 
 
 /* md_signal_handler_sigsegv ***************************************************
@@ -135,25 +129,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