Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md.c 7246 2007-01-29 18:49:05Z twisti $
-
*/
#include "config.h"
#include <assert.h>
+#include <stdint.h>
#include "vm/types.h"
#include "vm/jit/powerpc/codegen.h"
#include "vm/global.h"
+#include "vm/vm.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/stacktrace.h"
-
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER)
-# include "vm/jit/disass.h" /* XXX debug */
-# include "vmcore/options.h" /* XXX debug */
-#endif
+#include "vm/jit/codegen-common.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/md.h"
/* md_init *********************************************************************
}
-/* 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
}
-/* 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 */
/* return NULL if no mptr was specified (used for replacement) */
if (mptr == NULL)
return NULL;
- pa = mptr + offset;
-
- } 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;
}
}
*******************************************************************************/
#if defined(ENABLE_REPLACEMENT)
-void md_patch_replacement_point(codeinfo *code, s4 index, rplpoint *rp, u1 *savedmcode)
+void md_patch_replacement_point(u1 *pc, u1 *savedmcode, bool revert)
{
- s4 disp;
u4 mcode;
- if (index < 0) {
+ if (revert) {
/* restore the patched-over instruction */
- *(u4*)(rp->pc) = *(u4*)(savedmcode);
+ *(u4*)(pc) = *(u4*)(savedmcode);
}
else {
/* save the current machine code */
- *(u4*)(savedmcode) = *(u4*)(rp->pc);
+ *(u4*)(savedmcode) = *(u4*)(pc);
/* build the machine code for the patch */
- disp = ((u4*)code->replacementstubs - (u4*)rp->pc)
- + index * REPLACEMENT_STUB_SIZE
- - 1;
-
- mcode = (18 << 26) | ((((disp) * 4) + 4) & M_BMASK);
+ assert(0); /* XXX build trap instruction below */
+ mcode = 0;
/* write the new machine code */
- *(u4*)(rp->pc) = (u4) mcode;
+ *(u4*)(pc) = (u4) mcode;
}
-#if !defined(NDEBUG) && defined(ENABLE_DISASSEMBLER) && 0
- {
- u1* u1ptr = rp->pc;
- DISASSINSTR(u1ptr);
- fflush(stdout);
- }
-#endif
-
/* flush instruction cache */
- md_icacheflush(rp->pc,4);
+ md_icacheflush(pc,4);
}
#endif /* defined(ENABLE_REPLACEMENT) */
projects / cacao.git / blobdiff