* Merged in twisti-branch.

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

diff --git a/src/vm/jit/mips/md.c b/src/vm/jit/mips/md.c
index 74bbb342aefdee3f765757776ec1414c37367743..b28f0bd26653321f34e9048e6752ecbdaf569f5a 100644 (file)
--- a/src/vm/jit/mips/md.c
+++ b/src/vm/jit/mips/md.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/mips/md.c - machine dependent MIPS functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,13 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes: Edwin Steiner
-
-   $Id: md.c 4821 2006-04-24 10:08:07Z twisti $
+   $Id: md.c 7486 2007-03-08 13:50:07Z twisti $
 
 */
 
@@ -42,11 +36,15 @@
 #include "vm/types.h"
 
 #include "toolbox/logging.h"
+
 #include "vm/global.h"
+#include "vm/vm.h"
+
+#include "vm/jit/codegen-common.h" /* REMOVEME: only for codegendata */
 #include "vm/jit/stacktrace.h"
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vm/options.h" /* XXX debug */
+#include "vmcore/options.h" /* XXX debug */
 #include "vm/jit/disass.h" /* XXX debug */
 #endif
 
@@ -133,7 +131,9 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 
                offset += (s2) (mcode & 0x0000ffff);
 
-       } else {
+               pa = NULL;
+       }
+       else {
                /* get first instruction (ld) */
 
                mcode = *((u4 *) ra);
@@ -151,9 +151,14 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 #endif
                        /* in this case we use the passed method pointer */
 
-                       pa = mptr + offset;
+                       /* return NULL if no mptr was specified (used for replacement) */
+
+                       if (mptr == NULL)
+                               return NULL;
 
-               } else {
+                       pa = mptr + offset;
+               }
+               else {
                        /* in the normal case we check for a `ld s8,x(s8)' instruction */
 
 #if SIZEOF_VOID_P == 8
@@ -172,7 +177,7 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 }
 
 
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
 
    Machine code:
 
@@ -182,7 +187,7 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 
 *******************************************************************************/
 
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
 {
        u1 *pv;
        u4  mcode;
@@ -212,8 +217,8 @@ u1 *md_codegen_findmethod(u1 *ra)
 #endif
 
                offset += (s2) (mcode & 0x0000ffff);
-
-       } else {
+       }
+       else {
                /* get offset of first instruction (daddiu) */
 
                mcode = *((u4 *) ra);
@@ -278,18 +283,41 @@ void md_dcacheflush(u1 *addr, s4 nbytes)
 
 *******************************************************************************/
 
-void md_patch_replacement_point(rplpoint *rp)
+#if defined(ENABLE_REPLACEMENT)
+void md_patch_replacement_point(codeinfo *code, s4 index, rplpoint *rp,
+                                                               u1 *savedmcode)
 {
-    u8 mcode;
+       s4 disp;
+       union {
+               u8 both;
+               u4 words[2];
+       } mcode;
+
+       if (index < 0) {
+               /* restore the patched-over instruction */
+               *(u8*)(rp->pc) = *(u8*)(savedmcode);
+       }
+       else {
+               /* save the current machine code */
+               *(u8*)(savedmcode) = *(u8*)(rp->pc);
+
+               /* make machine code for patching */
 
-       /* save the current machine code */
-       mcode = *(u8*)rp->pc;
+               disp = ((u4*)code->replacementstubs - (u4*)rp->pc)
+                          + index * REPLACEMENT_STUB_SIZE
+                          - 1;
 
-       /* write the new machine code */
-    *(u8*)(rp->pc) = rp->mcode;
+               if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff))
+                       vm_abort("Jump offset is out of range: %d > +/-%d",
+                                        disp, 0x00007fff);
 
-       /* store saved mcode */
-       rp->mcode = mcode;
+               /* BR */
+        mcode.words[0] = (((0x04) << 26) | ((0) << 21) | ((0) << 16) | ((disp) & 0xffff));
+               mcode.words[1] = 0; /* NOP in delay slot */ 
+
+               /* write the new machine code */
+               *(u8*)(rp->pc) = mcode.both;
+       }
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
        {
@@ -303,6 +331,7 @@ void md_patch_replacement_point(rplpoint *rp)
        /* flush instruction cache */
     md_icacheflush(rp->pc,2*4);
 }
+#endif /* defined(ENABLE_REPLACEMENT) */
 
 /*
  * These are local overrides for various environment variables in Emacs.