* Removed all Id tags.

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

diff --git a/src/vm/jit/alpha/freebsd/md-os.c b/src/vm/jit/alpha/freebsd/md-os.c
index 083a76c3951c97247939a6b1f9bf4dcc84af119d..10deba916971329c656e275b2405e1054bcedd78 100644 (file)
--- a/src/vm/jit/alpha/freebsd/md-os.c
+++ b/src/vm/jit/alpha/freebsd/md-os.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/alpha/freebsd/md.c - machine dependent Alpha FreeBSD functions
 
-   Copyright (C) 1996-2005 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) 1996-2005, 2006 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
 
    This file is part of CACAO.
 
@@ -19,42 +19,44 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: md-os.c 3772 2005-11-23 21:36:35Z twisti $
-
 */
 
 
+#include "config.h"
+
 #include <assert.h>
 #include <ucontext.h>
 #include <sys/types.h>                         /* required by <machine/reg.h> */
 #include <machine/reg.h>
 
-#include "config.h"
 #include "vm/types.h"
 
 #include "vm/jit/alpha/md-abi.h"
 
 #include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/signallocal.h"
 #include "vm/stringlocal.h"
 #include "vm/jit/asmpart.h"
 
 
-/* signal_handler_sigsegv ******************************************************
+/* md_signal_handler_sigsegv ***************************************************
 
-   NullPointerException signal handler for hardware null pointer check.
+   NullPointerException signal handler for hardware null pointer
+   check.
 
 *******************************************************************************/
 
-void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
+void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
        ucontext_t  *_uc;
        mcontext_t  *_mc;
@@ -93,7 +95,7 @@ void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 }
 
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
 void thread_restartcriticalsection(ucontext_t *_uc)
 {
        mcontext_t *_mc;
@@ -101,7 +103,7 @@ void thread_restartcriticalsection(ucontext_t *_uc)
 
        _mc = &_uc->uc_mcontext;
 
-       critical = thread_checkcritical((void *) _mc->mc_regs[R_PC]);
+       critical = critical_find_restart_point((void *) _mc->mc_regs[R_PC]);
 
        if (critical)
                _mc->mc_regs[R_PC] = (ptrint) critical;