* changed src/vm/jit/m68k/emit.c (builtin_verbosecall_exit): Use
[cacao.git] / src / vm / jit / m68k / emit.c
index 94d1926b3f4ce1f2be1b5a2e11af3b34d524c0e8..3e8b52f2b9bbdf5c83c081f611845a55246867f6 100644 (file)
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 5330 2006-09-05 18:43:12Z edwin $
-
 */
 
 
@@ -36,6 +34,7 @@
 #include "vm/exceptions.h"
 #include "vm/jit/asmpart.h"
 #include "vm/builtin.h"
+#include "vm/jit/trace.h"
 
 #include "mm/memory.h"
 
@@ -166,23 +165,23 @@ inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
                        case TYPE_DBL:
 #endif
                        case TYPE_LNG:
-                               M_LST(d, REG_SP, dst->vv.regoff * 4);
+                               M_LST(d, REG_SP, dst->vv.regoff);
                                break;
 #if defined(ENABLE_SOFTFLOAT)
                        case TYPE_FLT:
 #endif
                        case TYPE_INT:
-                               M_IST(d, REG_SP, dst->vv.regoff * 4);
+                               M_IST(d, REG_SP, dst->vv.regoff);
                                break;
                        case TYPE_ADR:
-                               M_AST(d, REG_SP, dst->vv.regoff * 4);
+                               M_AST(d, REG_SP, dst->vv.regoff);
                                break;
 #if !defined(ENABLE_SOFTFLOAT)
                        case TYPE_DBL:
-                               M_DST(d, REG_SP, dst->vv.regoff * 4);
+                               M_DST(d, REG_SP, dst->vv.regoff);
                                break;
                        case TYPE_FLT:
-                               M_FST(d, REG_SP, dst->vv.regoff * 4);
+                               M_FST(d, REG_SP, dst->vv.regoff);
                                break;
 #endif
                        default:
@@ -211,7 +210,7 @@ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
 
-               disp = src->vv.regoff * 4;
+               disp = src->vv.regoff;
        
                switch (src->type)      {
 #if defined(ENABLE_SOFTFLOAT)
@@ -264,78 +263,6 @@ s4 emit_load(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
        return reg;
 }
 
-
-/* emit_patcher_stubs **********************************************************
-
-   Generates the code for the patcher stubs.
-
-*******************************************************************************/
-void emit_patcher_stubs(jitdata *jd)
-{
-       codegendata *cd;
-       patchref    *pref;
-       u8           mcode;
-       u1          *savedmcodeptr;
-       u1          *tmpmcodeptr;
-       s4           targetdisp;
-       s4           disp;
-
-       /* get required compiler data */
-
-       cd = jd->cd;
-
-       /* generate code patching stub call code */
-
-       targetdisp = 0;
-
-       for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
-               /* check code segment size */
-
-               MCODECHECK(512);
-
-               /* Get machine code which is patched back in later. A
-                  `bsr.l' is 6 bytes long. */
-
-               savedmcodeptr = cd->mcodebase + pref->branchpos;
-               mcode = *((u8 *) savedmcodeptr);
-
-               /* patch in `bsr.l' to call the following code */
-
-               tmpmcodeptr  = cd->mcodeptr;    /* save current mcodeptr              */
-               cd->mcodeptr = savedmcodeptr;   /* set mcodeptr to patch position     */
-
-               M_BSR_IMM(tmpmcodeptr - (savedmcodeptr + PATCHER_CALL_SIZE) + 4);
-
-               cd->mcodeptr = tmpmcodeptr;     /* restore the current mcodeptr       */
-
-               /* save REG_ITMP3, restored in asm_patcher_wrapper  */
-               M_IPUSH(REG_ITMP3);             
-
-               /* move pointer to java_objectheader onto stack */
-
-#if defined(ENABLE_THREADS)
-               (void) dseg_add_unique_address(cd, NULL);                  /* flcword */
-               (void) dseg_add_unique_address(cd, lock_get_initial_lock_word());
-               disp = dseg_add_unique_address(cd, NULL);                  /* vftbl   */
-
-               M_IMOV_IMM32(0, REG_ITMP3);
-               dseg_adddata(cd);
-               M_IADD_IMM(disp, REG_ITMP3);
-               M_IPUSH(REG_ITMP3);
-#else
-               M_IPUSH_IMM(0);
-#endif
-
-               /* push move machine code bytes and classinfo pointer */
-
-               M_IPUSH_IMM(mcode >> 32);
-               M_IPUSH_IMM(mcode);
-               M_IPUSH_IMM(pref->ref);
-               M_IPUSH_IMM(pref->patcher);
-
-               M_JMP_IMM(asm_patcher_wrapper);
-       }
-}
 s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg) 
 {
        codegendata  *cd;
@@ -354,7 +281,7 @@ s4 emit_load_low(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
 
-               disp = src->vv.regoff * 4;
+               disp = src->vv.regoff;
                M_ILD(tempreg, REG_SP, disp + 4);
                reg = tempreg;
        } else {
@@ -378,7 +305,7 @@ s4 emit_load_high(jitdata *jd, instruction *iptr, varinfo *src, s4 tempreg)
 
        if (IS_INMEMORY(src->flags)) {
                COUNT_SPILLS;
-               disp = src->vv.regoff * 4;
+               disp = src->vv.regoff;
                M_ILD(tempreg, REG_SP, disp);
                reg = tempreg;
        } else {
@@ -493,8 +420,6 @@ void emit_verbosecall_enter(jitdata* jd)
        codegendata  *cd;
        registerdata *rd;
        methoddesc   *md;
-       s4      disp,i,t;
-
 
        if (!JITDATA_HAS_FLAG_VERBOSECALL(jd))
                return;
@@ -512,58 +437,22 @@ void emit_verbosecall_enter(jitdata* jd)
        M_IPUSH(REG_D1);
        M_APUSH(REG_A0);
        M_APUSH(REG_A1);
+       M_AMOV(REG_SP, REG_A0); /* simpyfy stack offset calculation */
 
 #if !defined(ENABLE_SOFTFLOAT)
        M_AADD_IMM(-8*2, REG_SP);
        M_FSTORE(REG_F0, REG_SP, 8);
        M_FSTORE(REG_F1, REG_SP, 0);
-
-       disp = 4*4 + 8*2 + 4;   /* points to old argument stack initially */
-#else
-       disp = 4*4 + 4;
 #endif
-       /* builtin_verbosecall_enter takes all args as s8 type */
-       /* TRACE_ARGS_NUM is the number of args the builtin_verbosecall_enter expects */
-       M_IPUSH_IMM(m);
        
-
-       /* travel up stack to the first argument of the function which needs to be copied */
-       for (i=0; (i < md->paramcount) && (i < TRACE_ARGS_NUM); i++)    {
-               disp += 4;
-               if (IS_2_WORD_TYPE(md->paramtypes[i].type)) {   
-                       disp += 4;
-               }
-       }
-
-       /* disp now points to the first arg which gets copied to the trace stack, relative to REG_SP! */
-       for (i=TRACE_ARGS_NUM-1; i>=0; --i) {
-               if (i < md->paramcount) {
-                       /* traced function has such an argument */
-                       t = md->paramtypes[i].type;
-                       
-                       if (IS_2_WORD_TYPE(t))  {
-                               /* copy from original argument stack */
-                               M_ILD(REG_ITMP1, REG_SP, disp);
-                               M_IPUSH(REG_ITMP1);
-                               M_ILD(REG_ITMP1, REG_SP, disp);
-                               M_IPUSH(REG_ITMP1);
-                       } else  {
-                               /* displacment is increased as 4 byte on original stack but 8 byte on trace stack */
-                               M_ILD(REG_ITMP1, REG_SP, disp);
-                               M_IPUSH(REG_ITMP1);
-                               M_IPUSH_IMM(0);
-                               disp += 4;
-                       }
-               } else  {
-                       /* function has no arg here, push nothing and adapt displacement */
-                       M_IPUSH_IMM(0);
-                       M_IPUSH_IMM(0);
-                       disp += 8;
-               }
-       }
-       M_JSR_IMM(builtin_verbosecall_enter);
+       M_AADD_IMM(4*4 + 4, REG_A0);
+       M_APUSH(REG_A0);                /* third arg is original argument stack */
+       M_IPUSH_IMM(0);                 /* second arg is number of argument registers (=0) */
+       M_IPUSH_IMM(m);                 /* first arg is methodpointer */
+       
+       M_JSR_IMM(trace_java_call_enter);
        /* pop arguments off stack */
-       M_AADD_IMM(TRACE_ARGS_NUM*8+4, REG_SP);
+       M_AADD_IMM(3*4, REG_SP);
 
 #if !defined(ENABLE_SOFTFLOAT)
        M_FSTORE(REG_F1, REG_SP, 0);
@@ -596,47 +485,77 @@ void emit_verbosecall_exit(jitdata* jd)
 
        /* void builtin_verbosecall_exit(s8 l, double d, float f, methodinfo *m); */
 
+    /* void trace_java_call_exit(methodinfo *m, uint64_t *return_regs) */
 
        /* mark trace code */
        M_NOP;
 
-#if !defined(ENABLE_SOFTFLOAT)
-       M_AADD_IMM(-8, REG_SP);
-       M_FSTORE(REG_F1, REG_SP, 0);
-#endif
+       /* to store result on stack */
+       M_AADD_IMM(-8, REG_SP);                 /* create space for array */
 
-       M_IPUSH_IMM(m);                                 /* push methodinfo */
+       switch (md->returntype.type)    {
+               case TYPE_ADR:
+               case TYPE_INT:
+       #if defined(ENABLE_SOFTFLOAT)
+               case TYPE_FLT:
+       #endif
+                       M_IST(REG_D0, REG_SP, 0);
+                       break;
 
-#if !defined(ENABLE_SOFTFLOAT)
-       M_AADD_IMM(-3*4, REG_SP);
-       M_FST(REG_D0, REG_SP, 8);
-       M_DST(REG_D0, REG_SP, 0);
-#else
-       M_IPUSH_IMM(0);
+               case TYPE_LNG:
+       #if defined(ENABLE_SOFTFLOAT)
+               case TYPE_DBL:
+       #endif
+                       M_LST(REG_D1, REG_SP, 0);
+                       break;
 
-       M_IPUSH_IMM(0);
-       M_IPUSH_IMM(0);
-#endif
+       #if !defined(ENABLE_SOFTFLOAT)
+               case TYPE_FLT:  /* FIXME */
+               case TYPE_DBL:  /* FIXME */
+       #endif
 
-       M_IPUSH(GET_HIGH_REG(REG_RESULT_PACKED))
-       M_IPUSH(GET_LOW_REG(REG_RESULT_PACKED))         /* push long result */
+               case TYPE_VOID: /* nothing */
+                       break;
 
-       M_JSR_IMM(builtin_verbosecall_exit);
+               default:
+                       assert(0);
+       }
+
+       M_APUSH(REG_SP);                                /* push address of array */
+       M_IPUSH_IMM(m);                                 /* push methodinfo */
+       M_JSR_IMM(trace_java_call_exit);
 
+       M_AADD_IMM(8, REG_SP);                  /* remove args */
        /* poping result registers from stack */
-       M_IPOP(GET_LOW_REG(REG_RESULT_PACKED))
-       M_IPOP(GET_HIGH_REG(REG_RESULT_PACKED))
+       switch (md->returntype.type)    {
+               case TYPE_ADR:
+               case TYPE_INT:
+       #if defined(ENABLE_SOFTFLOAT)
+               case TYPE_FLT:
+       #endif
+                       M_ILD(REG_D0, REG_SP, 0);
+                       break;
 
-#if !defined(ENABLE_SOFTFLOAT)
-       M_DLD(REG_D0, REG_SP, 0)
-       M_FLD(REG_D0, REG_SP, 8)
-#endif
-       M_AADD_IMM(3*4 + 4, REG_SP);
+               case TYPE_LNG:
+       #if defined(ENABLE_SOFTFLOAT)
+               case TYPE_DBL:
+       #endif
+                       M_LLD(REG_D1, REG_SP, 0);
+                       break;
 
-#if !defined(ENABLE_SOFTFLOAT)
-       M_FLOAD(REG_F1, REG_SP, 0)
-       M_AADD_IMM(8, REG_SP);
-#endif
+       #if !defined(ENABLE_SOFTFLOAT)
+               case TYPE_FLT:  /* FIXME */
+               case TYPE_DBL:  /* FIXME */
+       #endif
+
+               case TYPE_VOID: /* nothing */
+                       break;
+
+               default:
+                       assert(0);
+       }
+
+       M_AADD_IMM(8, REG_SP);                  /* remove space for array */
 
        M_NOP;
 }
@@ -680,7 +599,7 @@ void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 r
 void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1, s4 s2)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
-               M_ILD(REG_ITMP3, s1, OFFSET(java_arrayheader, size));
+               M_ILD(REG_ITMP3, s1, OFFSET(java_array_t, size));
                M_ICMP(s2, REG_ITMP3);
                M_BHI(4);
                M_TRAP_SETREGISTER(s2);
@@ -688,6 +607,24 @@ void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1,
        }
 }
 
+
+/* emit_arraystore_check *******************************************************
+
+   Emit an ArrayStoreException check.
+
+*******************************************************************************/
+
+void emit_arraystore_check(codegendata *cd, instruction *iptr)
+{
+       if (INSTRUCTION_MUST_CHECK(iptr)) {
+               M_ITST(REG_RESULT);
+               M_BNE(2);
+               /*M_ALD_INTERN(REG_ZERO, REG_ZERO, EXCEPTION_HARDWARE_ARRAYSTORE);*/
+               M_TRAP(EXCEPTION_HARDWARE_ARRAYSTORE);
+       }
+}
+
+
 /* emit_nullpointer_check ******************************************************
 
    Emit a NullPointerException check.
@@ -734,6 +671,40 @@ void emit_exception_check(codegendata *cd, instruction *iptr)
        }
 }
 
+/* emit_trap_compiler **********************************************************
+
+   Emit a trap instruction which calls the JIT compiler.
+
+*******************************************************************************/
+
+void emit_trap_compiler(codegendata *cd)
+{
+       M_TRAP_SETREGISTER(REG_METHODPTR);
+       M_TRAP(EXCEPTION_HARDWARE_COMPILER);
+}
+
+
+/* emit_trap *******************************************************************
+
+   Emit a trap instruction and return the original machine code.
+
+*******************************************************************************/
+
+uint32_t emit_trap(codegendata *cd)
+{
+       uint32_t mcode;
+
+       /* Get machine code which is patched back in later. The
+          trap is 2 bytes long. */
+
+       mcode = *((uint32_t *) cd->mcodeptr);
+
+       M_TRAP(EXCEPTION_HARDWARE_PATCHER);
+
+       return mcode;
+}
+
+
 
 /*
  * These are local overrides for various environment variables in Emacs.