* src/vm/jit/mips/emit.c: Include fixes for cacaoh-changes.

* src/vm/jit/mips/md.c: Likewise.
* src/vm/jit/mips/codegen.c: Likewise
* src/vm/jit/mips/linux/md-os.c: Likewise
* src/vm/jit/mips/disass.c: Likewise
* src/vm/jit/mips/patcher.c: Likewise
* src/vm/jit/mips/md-abi.c: Likewise

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index c7004ba5a85e846774898c9b823d7be36f3a9679..c2817a0b1ea0b26d8383e116461a330ca75d406d 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7243 2007-01-28 23:35:29Z twisti $
+   $Id: codegen.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
@@ -39,6 +39,8 @@
 #include "vm/jit/mips/arch.h"
 #include "vm/jit/mips/codegen.h"
 
+#include "mm/memory.h"
+
 #include "native/native.h"
 
 #if defined(ENABLE_THREADS)
@@ -46,10 +48,7 @@
 #endif
 
 #include "vm/builtin.h"
-#include "vm/class.h"
 #include "vm/exceptions.h"
-#include "vm/options.h"
-#include "vm/stringlocal.h"
 #include "vm/vm.h"
 
 #include "vm/jit/asmpart.h"
@@ -66,6 +65,9 @@
 # include "vm/jit/allocator/lsra.h"
 #endif
 
+#include "vmcore/class.h"
+#include "vmcore/options.h"
+
 
 /* codegen *********************************************************************
 

diff --git a/src/vm/jit/mips/disass.c b/src/vm/jit/mips/disass.c
index 2aaf2cdacbdee7d63556670b805e9b4de993e96b..286667e15d91970e529869fa9fad84684573e63a 100644 (file)
--- a/src/vm/jit/mips/disass.c
+++ b/src/vm/jit/mips/disass.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/mips/disass.c - primitive disassembler for MIPS machine code
 
-   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,22 +22,19 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-
-   Changes: Christian Thalinger
-
-   $Id: disass.c 4357 2006-01-22 23:33:38Z twisti $
+   $Id: disass.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include "config.h"
 #include "vm/types.h"
 
+#include "vm/jit/abi.h"
+
 
 /*  The disassembler uses four tables for decoding the instructions. The first
        table (ops) is used to classify the instructions based on the op code and
@@ -365,47 +362,6 @@ static char *fbra[] = {
 };
 
 
-/* instruction decode table for 32 integer registers                          */
-
-char *regs[] = {
-       /* 0x00 */  "zero", /*  "$0", */
-       /* 0x01 */  "at",   /*  "$1", */
-       /* 0x02 */  "v0",   /*  "$2", */
-       /* 0x03 */  "v1",   /*  "$3", */
-       /* 0x04 */  "a0",   /*  "$4", */
-       /* 0x05 */  "a1",   /*  "$5", */
-       /* 0x06 */  "a2",   /*  "$6", */
-       /* 0x07 */  "a3",   /*  "$7", */
-
-       /* 0x08 */  "a4",   /*  "$8", */
-       /* 0x09 */  "a5",   /*  "$9", */
-       /* 0x0a */  "a6",   /* "$10", */
-       /* 0x0b */  "a7",   /* "$11", */
-       /* 0x0c */  "t0",   /* "$12", */
-       /* 0x0d */  "t1",   /* "$13", */
-       /* 0x0e */  "t2",   /* "$14", */
-       /* 0x0f */  "t3",   /* "$15", */
-
-       /* 0x10 */  "s0",   /* "$16", */
-       /* 0x11 */  "s1",   /* "$17", */
-       /* 0x12 */  "s2",   /* "$18", */
-       /* 0x13 */  "s3",   /* "$19", */
-       /* 0x14 */  "s4",   /* "$20", */
-       /* 0x15 */  "s5",   /* "$21", */
-       /* 0x16 */  "s6",   /* "$22", */
-       /* 0x17 */  "s7",   /* "$23", */
-
-       /* 0x18 */  "t8",   /* "$24", */
-       /* 0x19 */  "t9",   /* "$25", */
-       /* 0x1a */  "k0",   /* "$26", */
-       /* 0x1b */  "k1",   /* "$27", */
-       /* 0x1c */  "gp",   /* "$28", */
-       /* 0x1d */  "sp",   /* "$29", */
-       /* 0x1e */  "s8",   /* "$30", */
-       /* 0x1f */  "ra"    /* "$31"  */
-};
-
-
 /* instruction decode table for 32 floating point registers                   */
 
 #if 0

diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c
index 781fc850c4f30885c1129d1e22e7eddeacd51bc3..60e45e3f51d34ba073fb9df5753b9cf587dca8c6 100644 (file)
--- a/src/vm/jit/mips/emit.c
+++ b/src/vm/jit/mips/emit.c
@@ -36,13 +36,16 @@
 #include "vm/jit/mips/codegen.h"
 #include "vm/jit/mips/md-abi.h"
 
+#include "mm/memory.h"
+
 #if defined(ENABLE_THREADS)
 # include "threads/native/lock.h"
 #endif
 
+#include "vm/builtin.h"
 #include "vm/exceptions.h"
-#include "vm/options.h"
 #include "vm/stringlocal.h" /* XXX for gen_resolvebranch */
+
 #include "vm/jit/abi-asm.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/dseg.h"
@@ -50,6 +53,8 @@
 #include "vm/jit/jit.h"
 #include "vm/jit/replace.h"
 
+#include "vmcore/options.h"
+
 
 /* emit_load *******************************************************************
 

diff --git a/src/vm/jit/mips/linux/md-os.c b/src/vm/jit/mips/linux/md-os.c
index 86d5c731c107d7b805a5edef81afa7db124506de..cb8e2639e0aa3dc7d3184e4ac0fd3691c969b918 100644 (file)
--- a/src/vm/jit/mips/linux/md-os.c
+++ b/src/vm/jit/mips/linux/md-os.c
@@ -22,13 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Reinhard Grafl
-            Christian Thalinger
-
-   $Id: md-os.c 7206 2007-01-11 22:39:52Z twisti $
+   $Id: md-os.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
@@ -45,9 +39,10 @@
 #include "vm/jit/mips/md-abi.h"
 
 #include "mm/gc-common.h"
+
 #include "vm/exceptions.h"
-#include "vm/signallocal.h"
 #include "vm/stringlocal.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/stacktrace.h"
 
@@ -138,11 +133,11 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 #endif
        }
        else {
-               addr += (long) ((instr << 16) >> 16);
+               codegen_get_pv_from_pc(xpc);
+
+               /* this should not happen */
 
-               throw_cacao_exception_exit(string_java_lang_InternalError,
-                                                                  "faulting address: 0x%lx at 0x%lx\n",
-                                                                  addr, xpc);
+               assert(0);
        }
 }
 

diff --git a/src/vm/jit/mips/md-abi.c b/src/vm/jit/mips/md-abi.c
index 680236cdbf1732aaf0a61b1641228703dcd1a43d..8efa0fe5b3c26aeac4ee82e3bf24549650d22a16 100644 (file)
--- a/src/vm/jit/mips/md-abi.c
+++ b/src/vm/jit/mips/md-abi.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/mips/md-abi.c - functions for MIPS 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 Thalinger
-
-   Changes: Christian Ullrich
-
-   $Id: md-abi.c 7206 2007-01-11 22:39:52Z twisti $
+   $Id: md-abi.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
@@ -38,10 +32,12 @@
 
 #include "vm/jit/mips/md-abi.h"
 
-#include "vm/descriptor.h"
 #include "vm/global.h"
+
 #include "vm/jit/abi.h"
 
+#include "vmcore/descriptor.h"
+
 
 /* register descripton array **************************************************/
 
@@ -57,6 +53,14 @@ s4 nregdescint[] = {
        REG_END
 };
 
+char *regs[] = {
+       "zero",  "at",    "v0",    "v1",    "a0",    "a1",    "a2",    "a3",
+       "a4",    "a5",    "a6",    "a7",    "t0",    "t1",    "t2",    "t3",
+       "s0",    "s1",    "s2",    "s3",    "s4",    "s5",    "s6",    "s7",
+       "t8",    "t9",    "k0",    "k1",    "gp",    "sp",    "s8",    "ra"
+};
+
+
 s4 nregdescfloat[] = {
        /*  fv0,   ftmp1,   ftmp2,   ftmp3,     ft0,     ft1,     ft2,     ft3,   */
        REG_RET, REG_RES, REG_RES, REG_RES, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
@@ -93,6 +97,14 @@ s4 nregdescint[] = {
        REG_END
 };
 
+char *regs[] = {
+       "zero",  "at",    "v0",    "v1",    "a0",    "a1",    "a2",    "a3",
+       "a4",    "a5",    "a6",    "a7",    "t0",    "t1",    "t2",    "t3",
+       "s0",    "s1",    "s2",    "s3",    "s4",    "s5",    "s6",    "s7",
+       "t8",    "t9",    "k0",    "k1",    "gp",    "sp",    "s8",    "ra"
+};
+
+
 #if !defined(ENABLE_SOFT_FLOAT)
 
 s4 nregdescfloat[] = {

diff --git a/src/vm/jit/mips/md.c b/src/vm/jit/mips/md.c
index 30c782c673aeb892dc0f718dc60daa88e321a6b5..9b48914cfdd8008efb74f093d32b812393e4c776 100644 (file)
--- a/src/vm/jit/mips/md.c
+++ b/src/vm/jit/mips/md.c
@@ -22,12 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-            Edwin Steiner
-
-   $Id: md.c 7233 2007-01-22 15:59:42Z twisti $
+   $Id: md.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
@@ -41,12 +36,14 @@
 #include "vm/types.h"
 
 #include "toolbox/logging.h"
+
 #include "vm/global.h"
 #include "vm/vm.h"
+
 #include "vm/jit/stacktrace.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/mips/patcher.c b/src/vm/jit/mips/patcher.c
index ca9837d44d663c82a3bdd57c467d26ca789ce93e..fb11caf336097f800342b609f139d52c4ed23b5a 100644 (file)
--- a/src/vm/jit/mips/patcher.c
+++ b/src/vm/jit/mips/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7241 2007-01-27 15:52:01Z twisti $
+   $Id: patcher.c 7252 2007-01-29 21:09:01Z twisti $
 
 */
 
@@ -40,18 +40,19 @@
 #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/asmpart.h"
 #include "vm/jit/md.h"
 #include "vm/jit/patcher.h"
 
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/resolve.h"
+#include "vmcore/references.h"
+
 
 /* patcher_wrapper *************************************************************