* Removed all Id tags.

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

diff --git a/src/vm/jit/powerpc/md.c b/src/vm/jit/powerpc/md.c
index 8489e223712dfed16d01c252584084dd5b18d304..c583d97abbbc6ed292312b8f6eee30b31a169a36 100644 (file)
--- a/src/vm/jit/powerpc/md.c
+++ b/src/vm/jit/powerpc/md.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/powerpc/md.c - machine dependent PowerPC 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,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-            Edwin Steiner
-
-   $Id: md.c 5942 2006-11-09 10:52:34Z twisti $
-
 */
 
 
@@ -42,11 +35,13 @@
 #include "vm/jit/powerpc/codegen.h"
 
 #include "vm/global.h"
+
 #include "vm/jit/asmpart.h"
+#include "vm/jit/stacktrace.h"
 
 #if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vm/options.h" /* XXX debug */
-#include "vm/jit/disass.h" /* XXX debug */
+# include "vm/jit/disass.h" /* XXX debug */
+# include "vmcore/options.h" /* XXX debug */
 #endif
 
 
@@ -62,60 +57,6 @@ void md_init(void)
 }
 
 
-/* md_codegen_patch_branch *****************************************************
-
-   Back-patches a branch instruction.
-
-*******************************************************************************/
-
-void md_codegen_patch_branch(codegendata *cd, s4 branchmpc, s4 targetmpc)
-{
-       s4 *mcodeptr;
-       s4  mcode;
-       s4  disp;                           /* branch displacement                */
-
-       /* calculate the patch position */
-
-       mcodeptr = (s4 *) (cd->mcodebase + branchmpc);
-
-       /* get the instruction before the exception point */
-
-       mcode = mcodeptr[-1];
-
-       /* Calculate the branch displacement. */
-
-       disp = targetmpc - branchmpc + 4;
-
-       /* Check which branch instruction we have.  Then mask it and patch
-          the displacement. */
-
-       if ((mcode & 0xfc000000) == 0x48000000) {
-               /* bx  (0x48000000) */
-
-               if ((disp < (s4) 0xfe000000) || (disp > (s4) 0x01fffffc))
-                       vm_abort("md_codegen_patch_branch: branch displacement out of range: %d > +/-%d", disp, 0x03fffffc);
-
-               mcode &= ~M_BMASK;     /* mask out previous displacement, probably +4 */
-               mcode |= (disp & M_BMASK);
-       }
-       else if ((mcode & 0xfc000000) == 0x40000000) {
-               /* bcx (0x40000000) */
-
-               if ((disp < (s4) 0xffff8000) || (disp > (s4) 0x00007fff))
-                       vm_abort("md_codegen_patch_branch: branch displacement out of range: %d > +/-%d", disp, 0x00007fff);
-
-               mcode &= ~M_BCMASK;    /* mask out previous displacement, probably +4 */
-               mcode |= (disp & M_BCMASK);
-       }
-       else
-               vm_abort("md_codegen_patch_branch: unknown instruction 0x%08x", mcode);
-
-       /* patch the branch instruction before the mcodeptr */
-
-       mcodeptr[-1] = mcode;
-}
-
-
 /* md_stacktrace_get_returnaddress *********************************************
 
    Returns the return address of the current stackframe, specified by
@@ -182,6 +123,7 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 
        if ((mcode >> 16) == 0x3c19) {
                /* XXX write a regression for this */
+               pa = NULL;
                assert(0);
 
                /* get displacement of first instruction (addis) */
@@ -195,8 +137,8 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
                assert((mcode >> 16) != 0x6739);
 
                offset += (s2) (mcode & 0x0000ffff);
-
-       } else {
+       }
+       else {
                /* get the offset from the instruction */
 
                offset = (s2) (mcode & 0x0000ffff);
@@ -207,16 +149,26 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
                        /* get the final data segment address */
 
                        pa = sfi->pv + offset;
-
-               } else if ((mcode >> 16) == 0x81ac) {
+               }
+               else if ((mcode >> 16) == 0x81ac) {
                        /* 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 {
                        /* catch any problems */
 
-                       assert(0);
+                       vm_abort("md_get_method_patch_address: unknown instruction %x",
+                                        mcode);
+
+                       /* keep compiler happy */
+
+                       pa = NULL;
                }
        }
 
@@ -327,20 +279,28 @@ 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;
+       u4 mcode;
 
-       /* save the current machine code */
-       mcode = *(u4*)rp->pc;
+       if (index < 0) {
+               /* restore the patched-over instruction */
+               *(u4*)(rp->pc) = *(u4*)(savedmcode);
+       }
+       else {
+               /* save the current machine code */
+               *(u4*)(savedmcode) = *(u4*)(rp->pc);
 
-       /* write the new machine code */
-    *(u4*)(rp->pc) = (u4) rp->mcode;
+               /* build the machine code for the patch */
+               assert(0); /* XXX build trap instruction below */
+               mcode = 0;
 
-       /* store saved mcode */
-       rp->mcode = mcode;
+               /* write the new machine code */
+               *(u4*)(rp->pc) = (u4) mcode;
+       }
        
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
+#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER) && 0
        {
                u1* u1ptr = rp->pc;
                DISASSINSTR(u1ptr);
@@ -351,6 +311,7 @@ void md_patch_replacement_point(rplpoint *rp)
        /* flush instruction cache */
     md_icacheflush(rp->pc,4);
 }
+#endif /* defined(ENABLE_REPLACEMENT) */
 
 /*
  * These are local overrides for various environment variables in Emacs.