/* 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
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>
+#include <stdint.h>
#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/vm.h"
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-#include "vm/options.h" /* XXX debug */
-#include "vm/jit/disass.h" /* XXX debug */
-#endif
+#include "vm/jit/asmpart.h"
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/md.h"
/* md_init *********************************************************************
}
-/* md_get_method_patch_address *************************************************
+/* md_jit_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
*******************************************************************************/
-u1 *md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
+void *md_jit_method_patch_address(void *pv, void *ra, void *mptr)
{
- u4 mcode;
- s4 offset;
- u1 *pa;
+ uint32_t *pc;
+ uint32_t mcode;
+ int32_t offset;
+ void *pa;
/* go back to the actual load instruction (3 instructions) */
- ra = ra - 3 * 4;
+ pc = ((uint32_t *) ra) - 3;
/* get first instruction word (lwz) */
- mcode = *((u4 *) ra);
+ mcode = *pc;
/* check if we have 2 instructions (addis, addi) */
if ((mcode >> 16) == 0x3c19) {
/* XXX write a regression for this */
+ pa = NULL;
assert(0);
/* get displacement of first instruction (addis) */
- offset = (s4) (mcode << 16);
+ offset = (int32_t) (mcode << 16);
/* get displacement of second instruction (addi) */
- mcode = *((u4 *) (ra + 1 * 4));
+ mcode = *(pc + 1);
assert((mcode >> 16) != 0x6739);
- offset += (s2) (mcode & 0x0000ffff);
-
- } else {
+ offset += (int16_t) (mcode & 0x0000ffff);
+ }
+ else {
/* get the offset from the instruction */
- offset = (s2) (mcode & 0x0000ffff);
+ offset = (int16_t) (mcode & 0x0000ffff);
/* check for load from PV */
if ((mcode >> 16) == 0x81ad) {
/* get the final data segment address */
- pa = sfi->pv + offset;
-
- } else if ((mcode >> 16) == 0x81ac) {
+ pa = ((uint8_t *) pv) + offset;
+ }
+ 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 = ((uint8_t *) mptr) + offset;
+ }
+ else {
/* catch any problems */
- assert(0);
+ vm_abort("md_jit_method_patch_address: unknown instruction %x",
+ mcode);
+
+ /* keep compiler happy */
+
+ pa = NULL;
}
}
}
-/* md_codegen_findmethod *******************************************************
+/* md_codegen_get_pv_from_pc ***************************************************
Machine code:
*******************************************************************************/
-u1 *md_codegen_findmethod(u1 *ra)
+u1 *md_codegen_get_pv_from_pc(u1 *ra)
{
u1 *pv;
u4 mcode;
*******************************************************************************/
-void md_patch_replacement_point(rplpoint *rp)
+#if defined(ENABLE_REPLACEMENT)
+void md_patch_replacement_point(u1 *pc, u1 *savedmcode, bool revert)
{
- u8 mcode;
+ u4 mcode;
- /* save the current machine code */
- mcode = *(u4*)rp->pc;
+ if (revert) {
+ /* restore the patched-over instruction */
+ *(u4*)(pc) = *(u4*)(savedmcode);
+ }
+ else {
+ /* save the current machine code */
+ *(u4*)(savedmcode) = *(u4*)(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;
-
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
- {
- u1* u1ptr = rp->pc;
- DISASSINSTR(u1ptr);
- fflush(stdout);
+ /* write the new machine code */
+ *(u4*)(pc) = (u4) mcode;
}
-#endif
-
+
/* flush instruction cache */
- md_icacheflush(rp->pc,4);
+ md_icacheflush(pc,4);
}
+#endif /* defined(ENABLE_REPLACEMENT) */
/*
* These are local overrides for various environment variables in Emacs.