* src/mm/memory.cpp,

[cacao.git] / src / vm / jit / intrp / engine.c

diff --git a/src/vm/jit/intrp/engine.c b/src/vm/jit/intrp/engine.c
index 5aba6908a69c62665d82a2ece41eb88d87e80e58..118883f720c09c21215ae8d55979395389073968 100644 (file)
--- a/src/vm/jit/intrp/engine.c
+++ b/src/vm/jit/intrp/engine.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/intrp/engine.c - #included by engine1.c and engine2.c
 
-   Copyright (C) 1996-2005, 2006, 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) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,7 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: engine.c 7366 2007-02-15 19:48:11Z twisti $
 */
 
 
@@ -40,31 +37,21 @@
 
 #include "md-abi.h"                           /* required for TRACE_ARGS_NUM */
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/threads.h"
-#else
-# include "threads/none/threads.h"
-#endif
+#include "threads/thread.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/loader.hpp"
+#include "vm/options.h"
 
 #include "vm/jit/methodheader.h"
 #include "vm/jit/patcher.h"
-#include "vm/jit/stacktrace.h"
-
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
+#include "vm/jit/stacktrace.hpp"
 
 
 #if defined(ENABLE_THREADS)
-# ifndef USE_FAKE_ATOMIC_INSTRUCTIONS
-#  include "machine-instr.h"
-# else
-#  include "threads/native/generic-primitives.h"
-# endif
+# include "threads/atomic.hpp"
 #endif
 
 #if !defined(STORE_ORDER_BARRIER) && !defined(ENABLE_THREADS)