* Removed all Id tags.

[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 e991f6f8f41301378f6edd3aba625952af964c01..d675d64ceddc7b5fc5c28c93211d639038e42855 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,14 +22,6 @@
    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 4744 2006-04-06 12:51:53Z twisti $
-
 */
 
 
@@ -42,11 +34,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
 
@@ -72,15 +68,36 @@ u1 *md_stacktrace_get_returnaddress(u1 *sp, u4 framesize)
 }
 
 
-/* md_assembler_get_patch_address **********************************************
+/* md_get_method_patch_address *************************************************
 
    Gets the patch address of the currently compiled method. The offset
    is extracted from the load instruction(s) before the jump and added
    to the right base address (PV or REG_METHODPTR).
 
+   INVOKESTATIC/SPECIAL:
+
+   dfdeffb8    ld       s8,-72(s8)
+   03c0f809    jalr     s8
+   00000000    nop
+
+   INVOKEVIRTUAL:
+
+   dc990000    ld       t9,0(a0)
+   df3e0000    ld       s8,0(t9)
+   03c0f809    jalr     s8
+   00000000    nop
+
+   INVOKEINTERFACE:
+
+   dc990000    ld       t9,0(a0)
+   df39ff90    ld       t9,-112(t9)
+   df3e0018    ld       s8,24(t9)
+   03c0f809    jalr     s8
+   00000000    nop
+
 *******************************************************************************/
 
-u1 *md_assembler_get_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
+u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 {
        u4  mcode;
        s4  offset;
@@ -112,7 +129,9 @@ u1 *md_assembler_get_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 
                offset += (s2) (mcode & 0x0000ffff);
 
-       } else {
+               pa = NULL;
+       }
+       else {
                /* get first instruction (ld) */
 
                mcode = *((u4 *) ra);
@@ -130,9 +149,14 @@ u1 *md_assembler_get_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
@@ -151,7 +175,7 @@ u1 *md_assembler_get_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 }
 
 
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
 
    Machine code:
 
@@ -161,7 +185,7 @@ u1 *md_assembler_get_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;
@@ -191,8 +215,8 @@ u1 *md_codegen_findmethod(u1 *ra)
 #endif
 
                offset += (s2) (mcode & 0x0000ffff);
-
-       } else {
+       }
+       else {
                /* get offset of first instruction (daddiu) */
 
                mcode = *((u4 *) ra);
@@ -257,18 +281,30 @@ 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;
-
-       /* save the current machine code */
-       mcode = *(u8*)rp->pc;
+       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);
 
-       /* write the new machine code */
-    *(u8*)(rp->pc) = rp->mcode;
+               /* build the machine code for the patch */
+               assert(0); /* XXX build trap instruction below */
+               mcode.both = 0;
 
-       /* store saved mcode */
-       rp->mcode = mcode;
+               /* write the new machine code */
+               *(u8*)(rp->pc) = mcode.both;
+       }
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
        {
@@ -282,6 +318,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.