* src/vm/jit/trap.c: Moved to C++
[cacao.git] / src / vm / jit / m68k / emit.c
index 4a0c21ba171433470626c50030849ae1ec710310..f0e3e5fbe7537981ad48419175ff565d6e923e6c 100644 (file)
@@ -1,9 +1,7 @@
 /* src/vm/jit/m68k/emit.c
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
 
 #include <assert.h>
 
-#include "emit.h"
-#include "vm/jit/emit-common.h"
-#include "vm/exceptions.h"
-#include "vm/jit/asmpart.h"
-#include "vm/builtin.h"
-#include "vm/jit/trace.h"
+#include "vm/jit/m68k/codegen.h"
+#include "vm/jit/m68k/emit.h"
+
+#include "mm/memory.hpp"
 
-#include "mm/memory.h"
+#include "vm/jit/builtin.hpp"
 
-#include "threads/lock-common.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/trace.hpp"
+#include "vm/jit/trap.hpp"
 
-#include "codegen.h"
-#include "md-os.h"
 
 /* emit_mov_imm_reg **************************************************************************
  *
@@ -149,7 +146,7 @@ void emit_copy(jitdata *jd, instruction *iptr)
 
 *******************************************************************************/
 
-inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
+void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 {
        codegendata  *cd;
 
@@ -485,47 +482,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_D1, 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_D1, 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;
 }
@@ -557,7 +584,7 @@ void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 r
                        vm_abort("emit_classcast_check: unknown condition %d", condition);
                }
                M_TRAP_SETREGISTER(s1);
-               M_TRAP(EXCEPTION_HARDWARE_CLASSCAST);
+               M_TRAP(TRAP_ClassCastException);
        }
 }
 
@@ -573,7 +600,7 @@ void emit_arrayindexoutofbounds_check(codegendata *cd, instruction *iptr, s4 s1,
                M_ICMP(s2, REG_ITMP3);
                M_BHI(4);
                M_TRAP_SETREGISTER(s2);
-               M_TRAP(EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS);
+               M_TRAP(TRAP_ArrayIndexOutOfBoundsException);
        }
 }
 
@@ -589,8 +616,7 @@ 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);
+               M_TRAP(TRAP_ArrayStoreException);
        }
 }
 
@@ -600,6 +626,7 @@ void emit_arraystore_check(codegendata *cd, instruction *iptr)
    Emit a NullPointerException check.
 
 *******************************************************************************/
+
 void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg)
 {
        if (INSTRUCTION_MUST_CHECK(iptr)) {
@@ -607,7 +634,7 @@ void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg)
                 * invocation at the beginning of codegen.c */
                M_ATST(reg);
                M_BNE(2);
-               M_TRAP(M68K_EXCEPTION_HARDWARE_NULLPOINTER);
+               M_TRAP(TRAP_NullPointerException);
        }
 }
 
@@ -622,7 +649,7 @@ void emit_arithmetic_check(codegendata *cd, instruction *iptr, s4 reg)
        if (INSTRUCTION_MUST_CHECK(iptr)) {
                M_ITST(reg);
                M_BNE(2);
-               M_TRAP(EXCEPTION_HARDWARE_ARITHMETIC);
+               M_TRAP(TRAP_ArithmeticException);
        }
 }
 
@@ -636,8 +663,7 @@ void emit_exception_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_EXCEPTION);*/
-               M_TRAP(EXCEPTION_HARDWARE_EXCEPTION);
+               M_TRAP(TRAP_CHECK_EXCEPTION);
        }
 }
 
@@ -650,7 +676,7 @@ void emit_exception_check(codegendata *cd, instruction *iptr)
 void emit_trap_compiler(codegendata *cd)
 {
        M_TRAP_SETREGISTER(REG_METHODPTR);
-       M_TRAP(EXCEPTION_HARDWARE_COMPILER);
+       M_TRAP(TRAP_COMPILER);
 }
 
 
@@ -662,16 +688,16 @@ void emit_trap_compiler(codegendata *cd)
 
 uint32_t emit_trap(codegendata *cd)
 {
-       uint16_t mcode;
+       uint32_t mcode;
 
        /* Get machine code which is patched back in later. The
           trap is 2 bytes long. */
 
-       mcode = *((uint16_t *) cd->mcodeptr);
+       mcode = *((uint32_t *) cd->mcodeptr);
 
-       M_TRAP(EXCEPTION_HARDWARE_PATCHER);
+       M_TRAP(TRAP_PATCHER);
 
-       return (uint32_t) mcode;
+       return mcode;
 }