* src/vm/jit/sparc64/emit.c: Keeping stack 16-byte aligned when calling C/native...

* src/vm/jit/sparc64/codegen.c: Likewise.
* src/vm/jit/sparc64/codegen.h: Likewise.

* src/vm/jit/sparc64/md-abi.c: Removed zero sized abi_register_* arrays. (not allowed in ISO C)

* src/vm/jit/sparc64/solaris/md-os.c: Preliminary hardware exception handling. (untested)

diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c
index 5504b550c0a6759d2586fc91bd041bdfe20f0995..b3b541b5221c2ecb5d225ba0dd93ff5808ece163 100644 (file)
--- a/src/vm/jit/sparc64/codegen.c
+++ b/src/vm/jit/sparc64/codegen.c
@@ -3012,6 +3012,12 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
                nmd->memuse +  /* nmd knows about the native stackframe layout */
                WINSAVE_CNT;
 
+
+       /* keep stack 16-byte aligned (ABI requirement) */
+
+       if (cd->stackframesize & 1)
+               cd->stackframesize++;
+
        /* create method header */
 
        (void) dseg_add_unique_address(cd, code);              /* CodeinfoPointer */

diff --git a/src/vm/jit/sparc64/codegen.h b/src/vm/jit/sparc64/codegen.h
index 9233b2f81418b0de7d10ef6e040a2b7bd8ff602d..e841705736e51bb4fe5408a44374a959c88bc126 100644 (file)
--- a/src/vm/jit/sparc64/codegen.h
+++ b/src/vm/jit/sparc64/codegen.h
@@ -88,6 +88,10 @@ s4 nat_argintregs[INT_NATARG_CNT];
         M_NOP; \
     }
 
+#define ALIGN_STACK_SLOTS(slots) \
+       if (slots & 1) \
+               slots++;
+
 
 /* M_INTMOVE:
      generates an integer-move from register rs to rd.

diff --git a/src/vm/jit/sparc64/emit.c b/src/vm/jit/sparc64/emit.c
index 30f30c12aa15de91b6a62ea2c3bc22e567b674fe..03575db907e0781d85f53762d63603e106f3eabe 100644 (file)
--- a/src/vm/jit/sparc64/emit.c
+++ b/src/vm/jit/sparc64/emit.c
@@ -707,6 +707,7 @@ void emit_verbosecall_enter(jitdata *jd)
        methoddesc   *md;
        s4            disp;
        s4            i, t;
+       s4            stackslots;
 
        /* get required compiler data */
 
@@ -721,7 +722,10 @@ void emit_verbosecall_enter(jitdata *jd)
        M_NOP;
 
        /* XXX jit-c-call */
-       M_LDA(REG_SP, REG_SP, -(1 + FLT_ARG_CNT) * 8);
+       stackslots = 1 + FLT_ARG_CNT;
+       ALIGN_STACK_SLOTS(stackslots);
+
+       M_LDA(REG_SP, REG_SP, -(stackslots * 8));
 
        /* save float argument registers */
 
@@ -809,7 +813,7 @@ void emit_verbosecall_enter(jitdata *jd)
                        M_DLD(rd->tmpfltregs[i], REG_SP, (2 + ARG_CNT + INT_TMP_CNT + i) * 8);
        }
 */
-       M_LDA(REG_SP, REG_SP, (1 + FLT_ARG_CNT) * 8);
+       M_LDA(REG_SP, REG_SP, stackslots * 8);
 
        /* mark trace code */
 
@@ -842,8 +846,8 @@ void emit_verbosecall_exit(jitdata *jd)
 
        M_NOP;
        
-       /* XXX jit-c-call */
-       M_LDA(REG_SP, REG_SP, -(1 * 8));
+       /* XXX jit-c-call (keep stack aligned)*/
+       M_LDA(REG_SP, REG_SP, -(2 * 8));
 
        M_DST(REG_FRESULT, REG_SP, JITSTACK);
 
@@ -861,7 +865,7 @@ void emit_verbosecall_exit(jitdata *jd)
 
        M_DLD(REG_FRESULT, REG_SP, JITSTACK);
 
-       M_LDA(REG_SP, REG_SP, 1 * 8);
+       M_LDA(REG_SP, REG_SP, 2 * 8);
 
        /* mark trace code */
 

diff --git a/src/vm/jit/sparc64/md-abi.c b/src/vm/jit/sparc64/md-abi.c
index af256859df4577965488f5b3d788198bbc525691..faee75458c44fc0232d5e48dc518697f5043895e 100644 (file)
--- a/src/vm/jit/sparc64/md-abi.c
+++ b/src/vm/jit/sparc64/md-abi.c
@@ -91,8 +91,6 @@ const s4 abi_registers_integer_saved[] = {
        28, /* i4  */
 };
 
-const s4 abi_registers_integer_temporary[] = {
-};
 
 
 s4 nregdescfloat[] = {
@@ -110,9 +108,6 @@ const s4 abi_registers_float_argument[] = {
        12, /* f24  */
 };
 
-const s4 abi_registers_float_saved[] = {
-};
-
 const s4 abi_registers_float_temporary[] = {
        4,  /* f8   */
        5,  /* f10  */

diff --git a/src/vm/jit/sparc64/solaris/md-os.c b/src/vm/jit/sparc64/solaris/md-os.c
index 5addbee442536233eca2141574f41226e4860fe8..546a850a584010ac7b4ad32cb9cb525a679f8712 100644 (file)
--- a/src/vm/jit/sparc64/solaris/md-os.c
+++ b/src/vm/jit/sparc64/solaris/md-os.c
@@ -1,4 +1,4 @@
-/* src/vm/jit/alpha/linux/md.c - machine dependent Alpha Linux functions
+/* src/vm/jit/sparc64/solaris/md-os.c - machine dependent SPARC Solaris functions
 
    Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
@@ -37,10 +37,13 @@
 #include <assert.h>
 #include <ucontext.h>
 
+/* work around name clash */
+#define REG_SP_OS REG_SP
 #undef REG_SP
 
 #include "vm/types.h"
 
+#include "vm/jit/sparc64/codegen.h"
 #include "vm/jit/sparc64/md-abi.h"
 
 #include "vm/exceptions.h"
@@ -50,6 +53,36 @@
 #include "vm/jit/stacktrace.h"
 
 
+ptrint md_get_reg_from_context(mcontext_t *_mc, u4 rindex)
+{
+       ptrint val;     
+       s8     *window;
+       
+       
+       /* return 0 for REG_ZERO */
+       
+       if (rindex == 0)
+               return 0;
+               
+       
+       if (rindex <= 15) {
+               
+               /* register is in global or out range, available in context */
+               
+       }
+       else {
+               assert(rindex <= 31);
+               
+               /* register is local or in, need to fetch from regsave area on stack */
+       /*      
+               window = ctx->sigc_regs.u_regs[REG_SP] + BIAS;
+               val = window[rindex - 16];
+               */
+       }
+       
+       return val;
+}
+
 /* md_signal_handler_sigsegv ***************************************************
 
    NullPointerException signal handler for hardware null pointer
@@ -67,29 +100,72 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        u1          *sp;
        u1          *ra;
        u1          *xpc;
+       s4           d;
+       s4           s1;
+       s4           disp;
+       ptrint       val;
+       s4           type;
+       java_objectheader *e;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
 
-       instr = *((s4 *) (_mc->gregs[REG_PC]));
-       /*addr = _mc->sc_regs[(instr >> 16) & 0x1f];*/
-       addr = 0;
+       pv  = (u1 *) md_get_reg_from_context(_mc, REG_PV_CALLEE);
+#if 0
+       sp  = (u1 *) md_get_reg_from_context(ctx, REG_SP);
+       ra  = (u1 *) md_get_reg_from_context(ctx, REG_RA_CALLEE);  /* this is correct for leafs */
+       xpc = (u1 *) ctx->sigc_regs.tpc;
 
-       if (addr == 0) {
+       /* get exception-throwing instruction */        
+
+       mcode = *((u4 *) xpc);
+
+       d    = M_OP3_GET_RD(mcode);
+       s1   = M_OP3_GET_RS(mcode);
+       disp = M_OP3_GET_IMM(mcode);
+
+       /* flush register windows? */
+       
+       val   = md_get_reg_from_context(ctx, d);
+
+       /* check for special-load */
+
+       if (s1 == REG_ZERO) {
+               /* we use the exception type as load displacement */
+
+               type = disp;
+       }
+       else {
+               /* This is a normal NPE: addr must be NULL and the NPE-type
+                  define is 0. */
+
+               addr  = md_get_reg_from_context(ctx, s1);
+               type = (s4) addr;
+       }
 
+#endif
+       e = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val);
+
+       /* set registers */
+
+       _mc->gregs[REG_G2]  = (ptrint) e; /* REG_ITMP2_XPTR */
+       _mc->gregs[REG_G3]  = (ptrint) xpc; /* REG_ITMP3_XPC */
+       _mc->gregs[REG_PC]  = (ptrint) asm_handle_exception;
+       _mc->gregs[REG_nPC] = (ptrint) asm_handle_exception + 4;        
 #if 0
+       if (addr == 0) {
+
                pv  = (u1 *) _mc->gregs[REG_G3];
-               sp  = (u1 *) _mc->mc_fp;
-               ra  = (u1 *) _mc->mc_i7;       /* this is correct for leafs */
-               xpc = (u1 *) _mc->mc_gregs[MC_PC];
+               sp  = (u1 *) (_uc->uc_stack.ss_sp);
+               /*ra  = (u1 *) _mc->mc_i7;*/       /* this is correct for leafs */
+               ra  = 0;
+               xpc = (u1 *) _mc->gregs[REG_PC];
 
-               _mc->mc_gregs[MC_G4] =
+               _mc->gregs[REG_G4] =
                        (ptrint) stacktrace_hardware_nullpointerexception(pv, sp, ra, xpc);
 
-               _mc->mc_gregs[MC_G5] = (ptrint) xpc;
-               _mc->mc_gregs[MC_PC] = (ptrint) asm_handle_exception;
-#endif
-               assert(0);
+               _mc->gregs[REG_G5] = (ptrint) xpc;
+               _mc->gregs[REG_PC] = (ptrint) asm_handle_exception;
 
        } else {
                addr += (long) ((instr << 16) >> 16);
@@ -101,6 +177,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                                                                   */
                assert(0);
        }
+#endif
 }