* src/vm/jit/codegen-common.cpp (codegen_emit): New generic version of the

[cacao.git] / src / vm / jit / mips / md.h

diff --git a/src/vm/jit/mips/md.h b/src/vm/jit/mips/md.h
index 50743ce7e8a4853b96727bd0d9cb31658fd92ce4..67bb24cdc8100045f0c891c2028abf2dc3ddacd5 100644 (file)
--- a/src/vm/jit/mips/md.h
+++ b/src/vm/jit/mips/md.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/mips/md.h - machine dependent MIPS functions
 
-   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.
 
@@ -40,6 +38,21 @@
 #include "vm/vm.hpp"
 
 
+/**
+ * Returns the size (in bytes) of the current stackframe, specified by
+ * the passed codeinfo structure.
+ */
+inline static int32_t md_stacktrace_get_framesize(codeinfo* code)
+{
+       // Check for the asm_vm_call_method special case.
+       if (code == NULL)
+               return 0;
+
+       // On MIPS we use 8-byte stackslots.
+       return code->stackframesize * 8;
+}
+
+
 /* md_stacktrace_get_returnaddress *********************************************
 
    Returns the return address of the current stackframe, specified by
@@ -70,28 +83,28 @@ inline static void *md_stacktrace_get_returnaddress(void *sp, int32_t stackframe
 
 *******************************************************************************/
 
-inline static u1 *md_codegen_get_pv_from_pc(u1 *ra)
+inline static void* md_codegen_get_pv_from_pc(void* ra)
 {
-       u1 *pv;
-       u4  mcode;
-       s4  offset;
+       int32_t offset;
+
+       uint32_t* pc = (uint32_t*) ra;
 
        /* get the offset of the instructions */
 
        /* get first instruction word after jump */
 
-       mcode = *((u4 *) ra);
+       uint32_t mcode = pc[0];
 
        /* check if we have 2 instructions (lui, daddiu) */
 
        if ((mcode >> 16) == 0x3c19) {
                /* get displacement of first instruction (lui) */
 
-               offset = (s4) (mcode << 16);
+               offset = (int32_t) (mcode << 16);
 
                /* get displacement of second instruction (daddiu) */
 
-               mcode = *((u4 *) (ra + 1 * 4));
+               mcode = pc[1];
 
 #if SIZEOF_VOID_P == 8
                assert((mcode >> 16) == 0x6739);
@@ -99,25 +112,23 @@ inline static u1 *md_codegen_get_pv_from_pc(u1 *ra)
                assert((mcode >> 16) == 0x2739);
 #endif
 
-               offset += (s2) (mcode & 0x0000ffff);
+               offset += (int16_t) (mcode & 0x0000ffff);
        }
        else {
                /* get offset of first instruction (daddiu) */
 
-               mcode = *((u4 *) ra);
-
 #if SIZEOF_VOID_P == 8
                assert((mcode >> 16) == 0x67fe);
 #else
                assert((mcode >> 16) == 0x27fe);
 #endif
 
-               offset = (s2) (mcode & 0x0000ffff);
+               offset = (int16_t) (mcode & 0x0000ffff);
        }
 
        /* calculate PV via RA + offset */
 
-       pv = ra + offset;
+       void* pv = (void*) (((uintptr_t) ra) + offset);
 
        return pv;
 }