* src/vm/jit/sparc64/codegen.c (createnativestub): Fixed stack argument passing.

* src/vm/jit/sparc64/*: Adapted includes to new cacao structure.

diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c
index 6f09c21e0c836e76eae6197382b855a49c9e51e6..9f5d4b024901f68084b7b3ed6e07c497153b9c91 100644 (file)
--- a/src/vm/jit/sparc64/codegen.c
+++ b/src/vm/jit/sparc64/codegen.c
@@ -22,13 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Andreas Krall
-            Reinhard Grafl
-            Alexander Jordan
-            Edwin Steiner
-
    $Id: codegen.c 4644 2006-03-16 18:44:46Z edwin $
 
 */
@@ -54,9 +47,7 @@
 #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/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
 #include "vm/jit/dseg.h"
@@ -65,6 +56,10 @@
 #include "vm/jit/parse.h"
 #include "vm/jit/patcher.h"
 #include "vm/jit/reg.h"
+#include "vm/jit/replace.h"
+#include "vm/jit/stacktrace.h"
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
 
 /* XXX use something like this for window control ? 
  * #define REG_PV (own_window?REG_PV_CALLEE:REG_PV_CALLER)
@@ -1737,7 +1732,7 @@ bool codegen(jitdata *jd)
 
 #ifdef ENABLE_VERIFIER
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               uc = iptr->sx.s23.s2.uc;
+                               unresolved_class *uc = iptr->sx.s23.s2.uc;
 
                                codegen_add_patch_ref(cd, PATCHER_athrow_areturn, uc, 0);
                        }
@@ -2158,12 +2153,9 @@ bool codegen(jitdata *jd)
 
 #ifdef ENABLE_VERIFIER
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               codegen_addpatchref(cd, PATCHER_athrow_areturn,
-                                                                       iptr->sx.s23.s2.uc, 0);
+                               unresolved_class *uc = iptr->sx.s23.s2.uc;
 
-                               if (opt_showdisassemble) {
-                                       M_NOP; M_NOP;
-                               }
+                               codegen_add_patch_ref(cd, PATCHER_athrow_areturn, uc, 0);
                        }
 #endif /* ENABLE_VERIFIER */
                        goto nowperformreturn;
@@ -3030,13 +3022,13 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
                                        s2 = nat_argintregs[nmd->params[j].regoff];
                                        M_INTMOVE(s1, s2);
                                } else {
-                                       s2 = nmd->params[j].regoff;
+                                       s2 = nmd->params[j].regoff - 6;
                                        M_AST(s1, REG_SP, CSTACK + s2 * 8);
                                }
 
                        } else {
                                s1 = md->params[i].regoff + cd->stackframesize;
-                               s2 = nmd->params[j].regoff;
+                               s2 = nmd->params[j].regoff - 6;
                                M_ALD(REG_ITMP1, REG_SP, CSTACK + s1 * 8);
                                M_AST(REG_ITMP1, REG_SP, CSTACK + s2 * 8);
                        }
@@ -3047,7 +3039,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
                                if (!nmd->params[j].inmemory) {
                                        /* no mapping to regs needed, native flt args use regoff */
-                                       s2 = nmd->params[j].regoff;
+                                       s2 = nmd->params[j].regoff - 6;
                                        
                                        /* we cannot move flt regs to their native arg locations directly */
                                        M_DMOV(s1, s2 + 16);
@@ -3065,7 +3057,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd)
 
                        } else {
                                s1 = md->params[i].regoff + cd->stackframesize;
-                               s2 = nmd->params[j].regoff;
+                               s2 = nmd->params[j].regoff - 6;
                                if (IS_2_WORD_TYPE(t)) {
                                        M_DLD(REG_FTMP1, REG_SP, CSTACK + s1 * 8);
                                        M_DST(REG_FTMP1, REG_SP, CSTACK + s2 * 8);

diff --git a/src/vm/jit/sparc64/emit.c b/src/vm/jit/sparc64/emit.c
index 0b609dfeb760eed90c5b71ab8f514f82cc2c36d8..e9ccbd9bf38554fbde65f90fb9cafd8e6fbe7a5c 100644 (file)
--- a/src/vm/jit/sparc64/emit.c
+++ b/src/vm/jit/sparc64/emit.c
@@ -22,12 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-            Alexander Jordan
-
-   $Id: emitfuncs.c 4398 2006-01-31 23:43:08Z twisti $
+   $Id: emit.c 4398 2006-01-31 23:43:08Z twisti $
 
 */
 
@@ -40,8 +35,6 @@
 
 #include "mm/memory.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"
@@ -51,6 +44,8 @@
 #include "vm/jit/jit.h"
 #include "vm/jit/replace.h"
 
+#include "vmcore/options.h"
+
 /* how to leaf optimization in the emitted stubs?? */
 #define REG_PV REG_PV_CALLEE
 

diff --git a/src/vm/jit/sparc64/linux/md-os.c b/src/vm/jit/sparc64/linux/md-os.c
index b463dd6b222d1a85232e87d5d286bdb446ad3063..a2eed3eb726d11596db814508b31de200bef1b05 100644 (file)
--- a/src/vm/jit/sparc64/linux/md-os.c
+++ b/src/vm/jit/sparc64/linux/md-os.c
@@ -88,9 +88,12 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        } else {
                addr += (long) ((instr << 16) >> 16);
 
+               /*
                throw_cacao_exception_exit(string_java_lang_InternalError,
                                                                   "Segmentation fault: 0x%016lx at 0x%016lx\n",
                                                                   addr, _mc->mc_gregs[MC_PC]);
+                                                                  */
+               assert(0);
        }
 }
 

diff --git a/src/vm/jit/sparc64/md-abi.c b/src/vm/jit/sparc64/md-abi.c
index fd373779037679028c9260106cd25b4095b80731..2e89ba8b6fc151b5eb50ad297222e4fcb6547adf 100644 (file)
--- a/src/vm/jit/sparc64/md-abi.c
+++ b/src/vm/jit/sparc64/md-abi.c
@@ -22,12 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Alexander Jordan
-
-   Changes:
-
    $Id: md-abi.h 4357 2006-01-22 23:33:38Z twisti $
 
 */
@@ -38,10 +32,12 @@
 
 #include "vm/jit/sparc64/md-abi.h"
 
-#include "vm/descriptor.h"
 #include "vm/global.h"
+
 #include "vm/jit/abi.h"
 
+#include "vmcore/descriptor.h"
+
 /* temp */
 #include "mm/memory.h"
 #include <assert.h>

diff --git a/src/vm/jit/sparc64/md.c b/src/vm/jit/sparc64/md.c
index 2894fbc497592591cc8b1ad47b9761af63c853b4..ee1bdfe29ab8164ce5231fec7dba95a423282399 100644 (file)
--- a/src/vm/jit/sparc64/md.c
+++ b/src/vm/jit/sparc64/md.c
@@ -1,8 +1,37 @@
+/* src/vm/jit/alpha/md.c - machine dependent SPARC functions
+
+   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.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   $Id: md.c 6265 2007-01-02 20:40:57Z edwin $
+
+*/
 
-#include <assert.h>
 
 #include "config.h"
 
+#include <assert.h>
+
+
 #include "vm/types.h"
 
 #include "vm/jit/sparc64/md-abi.h"
@@ -12,10 +41,6 @@
 #include "vm/jit/asmpart.h"
 #include "vm/jit/stacktrace.h"
 
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vm/options.h" /* XXX debug */
-#include "vm/jit/disass.h" /* XXX debug */
-#endif
 
 /* shift away 13-bit immediate,  mask rd and rs1    */
 #define SHIFT_AND_MASK(instr) \

diff --git a/src/vm/jit/sparc64/patcher.c b/src/vm/jit/sparc64/patcher.c
index 1029642f6c7032496172f036fed46d773f7930c1..1f99e92dcfb4c7e056787249bad4e211b33cec32 100644 (file)
--- a/src/vm/jit/sparc64/patcher.c
+++ b/src/vm/jit/sparc64/patcher.c
@@ -22,10 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-            Alexander Jordan
    $Id: patcher.c 5164 2006-07-19 15:54:01Z twisti $
 
 */
@@ -37,22 +33,27 @@
 
 #include "vm/types.h"
 
+#include "mm/memory.h"
+
+#include "vm/jit/sparc64/md-abi.h"
 #include "vm/jit/sparc64/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/asmpart.h"
 #include "vm/jit/patcher.h"
-
-#include "vm/jit/sparc64/md-abi.h"
+#include "vm/jit/md.h"
+#include "vm/jit/methodheader.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/references.h"
+#include "vmcore/resolve.h"
 
 
 /* patcher_wrapper *************************************************************