* 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 26b728ba03c60512681d153784331657cd4fe1fd..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,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 4820 2006-04-24 10:00:13Z twisti $
-
 */
 
+
 #include "config.h"
 
 #include <assert.h>
@@ -39,13 +32,16 @@
 #include "vm/types.h"
 
 #include "md-abi.h"
+#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
 
 
@@ -127,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) */
@@ -140,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);
@@ -152,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;
                }
        }
 
@@ -169,7 +176,7 @@ u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
 }
 
 
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
 
    Machine code:
 
@@ -184,7 +191,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;
@@ -272,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);
@@ -296,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.