From d763a5b6c7ee474cd888388c6f59a8ece405f653 Mon Sep 17 00:00:00 2001
From: twisti <none@none>
Date: Mon, 29 Jan 2007 21:39:38 +0000
Subject: [PATCH] * src/vm/jit/i386/emit.c: Includes fixed for cacaoh-changes.
 * src/vm/jit/i386/md.c: Likewise. * src/vm/jit/i386/codegen.c: Likewise. *
 src/vm/jit/i386/patcher.c: Likewise. * src/vm/jit/i386/md-abi.c: Likewise.

---
 src/vm/jit/i386/codegen.c | 19 +++++++------------
 src/vm/jit/i386/emit.c    | 16 ++++++++--------
 src/vm/jit/i386/md-abi.c  | 14 +++++---------
 src/vm/jit/i386/md.c      |  6 ++++--
 src/vm/jit/i386/patcher.c | 28 ++++++++++++++--------------
 5 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index e38ef26d6..a63eed19e 100644
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -22,15 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Christian Thalinger
-            Joseph Wenninger
-            Christian Ullrich
-            Edwin Steiner
-
-   $Id: codegen.c 6286 2007-01-10 10:03:38Z twisti $
+   $Id: codegen.c 7255 2007-01-29 21:39:38Z twisti $
 
 */
 
@@ -58,11 +50,9 @@
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
-#include "vm/loader.h"
-#include "vm/options.h"
 #include "vm/stringlocal.h"
-#include "vm/utf8.h"
 #include "vm/vm.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
 #include "vm/jit/dseg.h"
@@ -72,6 +62,7 @@
 #include "vm/jit/patcher.h"
 #include "vm/jit/reg.h"
 #include "vm/jit/replace.h"
+#include "vm/jit/stacktrace.h"
 
 #if defined(ENABLE_SSA)
 # include "vm/jit/optimizing/lsra.h"
@@ -80,6 +71,10 @@
 # include "vm/jit/allocator/lsra.h"
 #endif
 
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+#include "vmcore/utf8.h"
+
 
 /* codegen *********************************************************************
 
diff --git a/src/vm/jit/i386/emit.c b/src/vm/jit/i386/emit.c
index 5a321b6e1..d6cbb88ea 100644
--- a/src/vm/jit/i386/emit.c
+++ b/src/vm/jit/i386/emit.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/i386/emit.c - i386 code emitter functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,11 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   $Id: emit.c 6265 2007-01-02 20:40:57Z edwin $
+   $Id: emit.c 7255 2007-01-29 21:39:38Z twisti $
 
 */
 
@@ -41,19 +37,23 @@
 #include "vm/jit/i386/emit.h"
 #include "vm/jit/i386/md-abi.h"
 
+#include "mm/memory.h"
+
 #if defined(ENABLE_THREADS)
 # include "threads/native/lock.h"
 #endif
 
 #include "vm/builtin.h"
-#include "vm/options.h"
-#include "vm/statistics.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/dseg.h"
 #include "vm/jit/emit-common.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/replace.h"
 
+#include "vmcore/options.h"
+#include "vmcore/statistics.h"
+
 
 /* emit_load ******************************************************************
 
diff --git a/src/vm/jit/i386/md-abi.c b/src/vm/jit/i386/md-abi.c
index 4a780c646..1c6f59768 100644
--- a/src/vm/jit/i386/md-abi.c
+++ b/src/vm/jit/i386/md-abi.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/i386/md-abi.c - functions for i386 Linux ABI
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,13 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Ullrich
-
-   Changes: Christian Thalinger
-
-   $Id: md-abi.c 6260 2006-12-28 20:56:09Z twisti $
+   $Id: md-abi.c 7255 2007-01-29 21:39:38Z twisti $
 
 */
 
@@ -38,10 +32,12 @@
 
 #include "vm/jit/i386/md-abi.h"
 
-#include "vm/descriptor.h"
 #include "vm/global.h"
+
 #include "vm/jit/abi.h"
 
+#include "vmcore/descriptor.h"
+
 
 /* register descripton - array ************************************************/
 
diff --git a/src/vm/jit/i386/md.c b/src/vm/jit/i386/md.c
index 4accdd911..91aaf4128 100644
--- a/src/vm/jit/i386/md.c
+++ b/src/vm/jit/i386/md.c
@@ -27,7 +27,7 @@
    Authors: Christian Thalinger
             Edwin Steiner
 
-   $Id: md.c 6265 2007-01-02 20:40:57Z edwin $
+   $Id: md.c 7255 2007-01-29 21:39:38Z twisti $
 
 */
 
@@ -39,11 +39,13 @@
 #include "vm/types.h"
 
 #include "vm/global.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
+#include "vm/jit/md.h"
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vm/options.h" /* XXX debug */
+#include "vmcore/options.h" /* XXX debug */
 #include "vm/jit/disass.h" /* XXX debug */
 #endif
 
diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c
index d0e693ca0..4a14e3646 100644
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/i386/patcher.c - i386 code patching functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,13 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: patcher.c 5233 2006-08-14 10:59:39Z twisti $
+   $Id: patcher.c 7255 2007-01-29 21:39:38Z twisti $
 
 */
 
@@ -36,18 +30,24 @@
 #include "config.h"
 #include "vm/types.h"
 
+#include "vm/jit/i386/codegen.h"
+
 #include "mm/memory.h"
+
 #include "native/native.h"
+
 #include "vm/builtin.h"
-#include "vm/class.h"
 #include "vm/exceptions.h"
-#include "vm/field.h"
 #include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
+
 #include "vm/jit/patcher.h"
-#include "vm/jit/i386/codegen.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/resolve.h"
+#include "vmcore/references.h"
 
 
 /* patcher_wrapper *************************************************************
-- 
2.25.1