* Removed all Id tags.

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

diff --git a/src/vm/jit/powerpc64/md.c b/src/vm/jit/powerpc64/md.c
index e93db940b975499bc9dc6574223439935f02e327..85741ef7924865bab635b018445efd3d0eeb4159 100644 (file)
--- a/src/vm/jit/powerpc64/md.c
+++ b/src/vm/jit/powerpc64/md.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/powerpc64/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,16 +22,9 @@
    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 5933 2006-11-08 13:03:42Z tbfg $
-
 */
 
+
 #include "config.h"
 
 #include <assert.h>
@@ -40,11 +33,15 @@
 
 #include "md-abi.h"
 
+#include "vm/jit/powerpc64/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 "vmcore/options.h" /* XXX debug */
 #include "vm/jit/disass.h" /* XXX debug */
 #endif
 
@@ -105,13 +102,13 @@ void md_codegen_patch_branch(codegendata *cd, s4 branchmpc, s4 targetmpc)
                        vm_abort("jump displacement is out of range: %d > +/-%d", disp, 0x00007fff);
 
                mcode &= 0xffff0000;
-               mcode |= (((disp)&0xfffc));
+               mcode |= (((disp)& M_BCMASK));
        } else if ((mcode & 0xfc000000) == 0x48000000) {
                /* unconditional jump bx */
                if ((disp < (s4) 0xfc000000) || (disp > (s4) 0x03ffffff))
                        vm_abort("jump displacement is out of range: %d > +/-%d", disp, 0x0cffffff);
                mcode &= 0xfc000000;
-               mcode |= (((disp)&0x03ffffff));
+               mcode |= (((disp)& M_BMASK));
        } else {
                vm_abort("md_codegen_patch_branch, patching unsupported branch: %xd", mcode);
        }
@@ -169,6 +166,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) */
@@ -182,8 +180,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);
@@ -194,16 +192,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) == 0xe9cc) { 
+               }
+               else if ((mcode >> 16) == 0xe9cc) { 
                        /* 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;
                }
        }
 
@@ -252,16 +260,19 @@ u1 *md_codegen_get_pv_from_pc(u1 *ra)
                assert((mcode >> 16) == 0x39ce);
 
                offset += (s2) (mcode & 0x0000ffff);
-
-       } else {
-               /* check for addi instruction */
-
-               assert((mcode >> 16) == 0x39cb);
-
+       }
+       else if ((mcode >> 16) == 0x39cb) {
                /* get offset of first instruction (addi) */
 
                offset = (s2) (mcode & 0x0000ffff);
        }
+       else {
+               vm_abort("md_codegen_get_pv_from_pc: unknown instruction %x", mcode);
+
+               /* keep compiler happy */
+
+               offset = 0;
+       }
 
        /* calculate PV via RA + offset */
 
@@ -314,18 +325,26 @@ 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)
        {
@@ -338,6 +357,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.