-/* jit/mips/codegen.c - machine code generator for mips
+/* src/vm/jit/mips/codegen.c - machine code generator for MIPS
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Institut f. Computersprachen, TU Wien
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
- S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
- J. Wenninger
+ Copyright (C) 1996-2005 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
This file is part of CACAO.
Authors: Andreas Krall
Reinhard Grafl
+ Changes: Christian Thalinger
+
Contains the codegenerator for an MIPS (R4000 or higher) processor.
This module generates MIPS machine code for a sequence of
intermediate code commands (ICMDs).
- $Id: codegen.c 1349 2004-07-22 12:08:29Z twisti $
+ $Id: codegen.c 2478 2005-05-13 14:19:50Z twisti $
*/
#include <signal.h>
#include <unistd.h>
#include <sys/mman.h>
-#include "jit/mips/types.h"
-#include "main.h"
-#include "builtin.h"
-#include "asmpart.h"
-#include "jni.h"
-#include "loader.h"
-#include "tables.h"
-#include "native.h"
-#include "jit/jit.h"
-#include "jit/reg.h"
-#include "jit/mips/codegen.h"
-
-/* include independent code generation stuff */
-#include "jit/codegen.inc"
-#include "jit/reg.inc"
+
+#include "config.h"
+#include "cacao/cacao.h"
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/stringlocal.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#ifdef LSRA
+#include "vm/jit/lsra.h"
+#endif
+
+#include "vm/jit/patcher.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/mips/codegen.h"
+#include "vm/jit/mips/arch.h"
+#include "vm/jit/mips/types.h"
/* *****************************************************************************
/* #define REG_END -1 last entry in tables */
-int nregdescint[] = {
+static int nregdescint[] = {
REG_RES, REG_RES, REG_RET, REG_RES, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV, REG_SAV,
/* for use of reserved registers, see comment above */
-int nregdescfloat[] = {
+static int nregdescfloat[] = {
REG_RET, REG_RES, REG_RES, REG_RES, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_ARG, REG_ARG, REG_ARG, REG_ARG,
REG_ARG, REG_ARG, REG_ARG, REG_ARG, REG_TMP, REG_TMP, REG_TMP, REG_TMP,
/* for use of reserved registers, see comment above */
+/* Include independent code generation stuff -- include after register */
+/* descriptions to avoid extern definitions. */
+
+#include "vm/jit/codegen.inc"
+#include "vm/jit/reg.inc"
+#ifdef LSRA
+#include "vm/jit/lsra.inc"
+#endif
+
+
/* NullPointerException handlers and exception handling initialisation */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
/* NullPointerException signal handler for hardware null pointer check */
-void catch_NullPointerException(int sig, int code, struct sigcontext *sigctx)
+void catch_NullPointerException(int sig, siginfo_t *siginfo, void *_p)
{
sigset_t nsig;
int instr;
long faultaddr;
java_objectheader *xptr;
- /* Reset signal handler - necessary for SysV, does no harm for BSD */
+ struct ucontext *_uc = (struct ucontext *) _p;
+ mcontext_t *sigctx = &_uc->uc_mcontext;
+ struct sigaction act;
- instr = *((int*)(sigctx->sc_pc));
- faultaddr = sigctx->sc_regs[(instr >> 21) & 0x1f];
+ instr = *((s4 *) (sigctx->gregs[CTX_EPC]));
+ faultaddr = sigctx->gregs[(instr >> 21) & 0x1f];
if (faultaddr == 0) {
+ /* Reset signal handler - necessary for SysV, does no harm for BSD */
+
+ act.sa_sigaction = catch_NullPointerException;
+ act.sa_flags = SA_SIGINFO;
+ sigaction(sig, &act, NULL);
+
sigemptyset(&nsig);
sigaddset(&nsig, sig);
sigprocmask(SIG_UNBLOCK, &nsig, NULL); /* unblock signal */
- xptr = new_exception(string_java_lang_NullPointerException);
+ xptr = new_nullpointerexception();
-
- sigctx->sc_regs[REG_ITMP1_XPTR] = (u8) xptr;
- sigctx->sc_regs[REG_ITMP2_XPC] = sigctx->sc_pc;
- sigctx->sc_pc = (u8) asm_handle_exception;
+ sigctx->gregs[REG_ITMP1_XPTR] = (u8) xptr;
+ sigctx->gregs[REG_ITMP2_XPC] = sigctx->gregs[CTX_EPC];
+ sigctx->gregs[CTX_EPC] = (u8) asm_handle_exception;
} else {
faultaddr += (long) ((instr << 16) >> 16);
- fprintf(stderr, "faulting address: 0x%lx at 0x%lx\n", (long) faultaddr, (long) sigctx->sc_pc);
+ fprintf(stderr, "faulting address: 0x%lx at 0x%lx\n", (long) faultaddr, (long) sigctx->gregs[CTX_EPC]);
panic("Stack overflow");
}
}
void init_exceptions(void)
{
- struct sigaction sa;
- sigset_t unblockmask;
+ struct sigaction act;
/* The Boehm GC initialization blocks the SIGSEGV signal. So we do a
dummy allocation here to ensure that the GC is initialized.
/* install signal handlers we need to convert to exceptions */
- sigemptyset(&unblockmask);
- sa.sa_flags = 0;
- sa.sa_sigaction = catch_NullPointerException;
- sigemptyset(&sa.sa_mask);
+ sigemptyset(&act.sa_mask);
if (!checknull) {
+ act.sa_sigaction = catch_NullPointerException;
+ act.sa_flags = SA_SIGINFO;
+
#if defined(SIGSEGV)
- sigaction(SIGSEGV, &sa, NULL);
- sigaddset(&unblockmask, SIGSEGV);
+ sigaction(SIGSEGV, &act, NULL);
#endif
#if defined(SIGBUS)
- sigaction(SIGBUS, &sa, NULL);
- sigaddset(&unblockmask, SIGBUS);
+ sigaction(SIGBUS, &act, NULL);
#endif
}
- sigprocmask(SIG_UNBLOCK, &unblockmask, NULL);
-
/* Turn off flush-to-zero */
{
union fpc_csr n;
*******************************************************************************/
-void codegen(methodinfo *m)
+void codegen(methodinfo *m, codegendata *cd, registerdata *rd)
{
- s4 len, s1, s2, s3, d;
- s4 a;
+ s4 len, s1, s2, s3, d;
+ ptrint a;
s4 parentargs_base;
s4 *mcodeptr;
stackptr src;
basicblock *bptr;
instruction *iptr;
exceptiontable *ex;
- registerdata *r;
- codegendata *cd;
-
- /* keep code size smaller */
- r = m->registerdata;
- cd = m->codegendata;
{
s4 i, p, pa, t, l;
/* space to save used callee saved registers */
- savedregs_num += (r->savintregcnt - r->maxsavintreguse);
- savedregs_num += (r->savfltregcnt - r->maxsavfltreguse);
+ savedregs_num += (rd->savintregcnt - rd->maxsavintreguse);
+ savedregs_num += (rd->savfltregcnt - rd->maxsavfltreguse);
- parentargs_base = r->maxmemuse + savedregs_num;
+ parentargs_base = rd->maxmemuse + savedregs_num;
#if defined(USE_THREADS) /* space to save argument of monitor_enter */
/* create method header */
#if POINTERSIZE == 4
- (void) dseg_addaddress(m, m); /* Filler */
+ (void) dseg_addaddress(cd, m); /* Filler */
#endif
- (void) dseg_addaddress(m, m); /* MethodPointer */
- (void) dseg_adds4(m, parentargs_base * 8); /* FrameSize */
+ (void) dseg_addaddress(cd, m); /* MethodPointer */
+ (void) dseg_adds4(cd, parentargs_base * 8); /* FrameSize */
#if defined(USE_THREADS)
*/
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_adds4(m, (r->maxmemuse + 1) * 8); /* IsSync */
+ (void) dseg_adds4(cd, (rd->maxmemuse + 1) * 8); /* IsSync */
else
#endif
- (void) dseg_adds4(m, 0); /* IsSync */
+ (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(m, m->isleafmethod); /* IsLeaf */
- (void) dseg_adds4(m, r->savintregcnt - r->maxsavintreguse);/* IntSave */
- (void) dseg_adds4(m, r->savfltregcnt - r->maxsavfltreguse);/* FltSave */
- (void) dseg_adds4(m, m->exceptiontablelength); /* ExTableSize */
+ (void) dseg_adds4(cd, m->isleafmethod); /* IsLeaf */
+ (void) dseg_adds4(cd, rd->savintregcnt - rd->maxsavintreguse);/* IntSave */
+ (void) dseg_adds4(cd, rd->savfltregcnt - rd->maxsavfltreguse);/* FltSave */
+ (void) dseg_adds4(cd, cd->exceptiontablelength); /* ExTableSize */
/* create exception table */
- for (ex = m->exceptiontable; ex != NULL; ex = ex->down) {
- dseg_addtarget(m, ex->start);
- dseg_addtarget(m, ex->end);
- dseg_addtarget(m, ex->handler);
- (void) dseg_addaddress(m, ex->catchtype);
+ for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
+ dseg_addtarget(cd, ex->start);
+ dseg_addtarget(cd, ex->end);
+ dseg_addtarget(cd, ex->handler);
+ (void) dseg_addaddress(cd, ex->catchtype.cls);
}
/* initialize mcode variables */
p = parentargs_base;
if (!m->isleafmethod) {
- p--; M_LST(REG_RA, REG_SP, 8 * p);
+ p--; M_LST(REG_RA, REG_SP, p * 8);
}
- for (i = r->savintregcnt - 1; i >= r->maxsavintreguse; i--) {
- p--; M_LST(r->savintregs[i], REG_SP, 8 * p);
+ for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
+ p--; M_LST(rd->savintregs[i], REG_SP, p * 8);
}
- for (i = r->savfltregcnt - 1; i >= r->maxsavfltreguse; i--) {
- p--; M_DST(r->savfltregs[i], REG_SP, 8 * p);
+ for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
+ p--; M_DST(rd->savfltregs[i], REG_SP, p * 8);
}
- /* save monitorenter argument */
+ /* take arguments out of register or stack frame */
+
+ for (p = 0, l = 0; p < m->paramcount; p++) {
+ t = m->paramtypes[p];
+ var = &(rd->locals[l][t]);
+ l++;
+ if (IS_2_WORD_TYPE(t)) /* increment local counter for 2 word types */
+ l++;
+ if (var->type < 0)
+ continue;
+ if (IS_INT_LNG_TYPE(t)) { /* integer args */
+ if (p < INT_ARG_CNT) { /* register arguments */
+ if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ M_INTMOVE(rd->argintregs[p], var->regoff);
+ } else { /* reg arg -> spilled */
+ M_LST(rd->argintregs[p], REG_SP, 8 * var->regoff);
+ }
+
+ } else { /* stack arguments */
+ pa = p - INT_ARG_CNT;
+ if (!(var->flags & INMEMORY)) { /* stack arg -> register */
+ M_LLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
+
+ } else { /* stack arg -> spilled */
+/* M_LLD(REG_ITMP1, REG_SP, 8 * (parentargs_base + pa)); */
+/* M_LST(REG_ITMP1, REG_SP, 8 * var->regoff); */
+ var->regoff = parentargs_base + pa;
+ }
+ }
+
+ } else { /* floating args */
+ if (p < FLT_ARG_CNT) { /* register arguments */
+ if (!(var->flags & INMEMORY)) { /* reg arg -> register */
+ M_TFLTMOVE(var->type, rd->argfltregs[p], var->regoff);
+
+ } else { /* reg arg -> spilled */
+ M_DST(rd->argfltregs[p], REG_SP, var->regoff * 8);
+ }
+
+ } else { /* stack arguments */
+ pa = p - FLT_ARG_CNT;
+ if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
+ M_DLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
+
+ } else { /* stack-arg -> spilled */
+/* M_DLD(REG_FTMP1, REG_SP, 8 * (parentargs_base + pa)); */
+/* M_DST(REG_FTMP1, REG_SP, 8 * var->regoff); */
+ var->regoff = parentargs_base + pa;
+ }
+ }
+ }
+ } /* end for */
+
+ /* call monitorenter function */
#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
+ s4 disp;
+
+ /* stack offset for monitor argument */
+
+ s1 = rd->maxmemuse;
+
+ if (runverbose) {
+ M_LDA(REG_SP, REG_SP, -(INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
+
+ for (p = 0; p < INT_ARG_CNT; p++)
+ M_LST(rd->argintregs[p], REG_SP, p * 8);
+
+ for (p = 0; p < FLT_ARG_CNT; p++)
+ M_DST(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+
+ if (m->isleafmethod) {
+ for (p = 0; p < INT_TMP_CNT; p++)
+ M_LST(rd->tmpintregs[p], REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
+
+ for (p = 0; p < FLT_TMP_CNT; p++)
+ M_DST(rd->tmpfltregs[p], REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
+ }
+
+ s1 += INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT;
+ }
+
+ /* decide which monitor enter function to call */
+
if (m->flags & ACC_STATIC) {
- p = dseg_addaddress(m, m->class);
+ p = dseg_addaddress(cd, m->class);
M_ALD(REG_ITMP1, REG_PV, p);
- M_AST(REG_ITMP1, REG_SP, r->maxmemuse * 8);
-
+ M_AST(REG_ITMP1, REG_SP, s1 * 8);
+ p = dseg_addaddress(cd, BUILTIN_staticmonitorenter);
+ M_ALD(REG_ITMP3, REG_PV, p);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_INTMOVE(REG_ITMP1, rd->argintregs[0]); /* branch delay */
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, disp);
+
} else {
- M_AST(r->argintregs[0], REG_SP, r->maxmemuse * 8);
+ M_BEQZ(rd->argintregs[0], 0);
+ codegen_addxnullrefs(cd, mcodeptr);
+ p = dseg_addaddress(cd, BUILTIN_monitorenter);
+ M_ALD(REG_ITMP3, REG_PV, p);
+ M_JSR(REG_RA, REG_ITMP3);
+ M_AST(rd->argintregs[0], REG_SP, s1 * 8); /* br delay */
+ disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
+ M_LDA(REG_PV, REG_RA, disp);
+ }
+
+ if (runverbose) {
+ for (p = 0; p < INT_ARG_CNT; p++)
+ M_LLD(rd->argintregs[p], REG_SP, p * 8);
+
+ for (p = 0; p < FLT_ARG_CNT; p++)
+ M_DLD(rd->argfltregs[p], REG_SP, (INT_ARG_CNT + p) * 8);
+
+
+ if (m->isleafmethod) {
+ for (p = 0; p < INT_TMP_CNT; p++)
+ M_LLD(rd->tmpintregs[p], REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
+
+ for (p = 0; p < FLT_TMP_CNT; p++)
+ M_DLD(rd->tmpfltregs[p], REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
+ }
+
+ M_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
}
- }
+ }
#endif
- /* copy argument registers to stack and call trace function with pointer
- to arguments on stack. ToDo: save floating point registers !!!!!!!!!
- */
+ /* copy argument registers to stack and call trace function */
if (runverbose) {
- M_LDA(REG_SP, REG_SP, -(18 * 8));
+ M_LDA(REG_SP, REG_SP, -(2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
M_LST(REG_RA, REG_SP, 1 * 8);
/* save integer argument registers */
- for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
- M_LST(r->argintregs[p], REG_SP, (2 + p) * 8);
- }
+
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++)
+ M_LST(rd->argintregs[p], REG_SP, (2 + p) * 8);
/* save and copy float arguments into integer registers */
+
for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
t = m->paramtypes[p];
if (IS_FLT_DBL_TYPE(t)) {
if (IS_2_WORD_TYPE(t)) {
- M_DST(r->argfltregs[p], REG_SP, (10 + p) * 8);
- M_LLD(r->argintregs[p], REG_SP, (10 + p) * 8);
+ M_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
+ M_LLD(rd->argintregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
} else {
- M_FST(r->argfltregs[p], REG_SP, (10 + p) * 8);
- M_ILD(r->argintregs[p], REG_SP, (10 + p) * 8);
+ M_FST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
+ M_ILD(rd->argintregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
}
} else {
- M_DST(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
}
}
- p = dseg_addaddress(m, m);
+ /* save temporary registers for leaf methods */
+
+ if (m->isleafmethod) {
+ for (p = 0; p < INT_TMP_CNT; p++)
+ M_LST(rd->tmpintregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
+
+ for (p = 0; p < FLT_TMP_CNT; p++)
+ M_DST(rd->tmpfltregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
+ }
+
+ p = dseg_addaddress(cd, m);
M_ALD(REG_ITMP1, REG_PV, p);
M_LST(REG_ITMP1, REG_SP, 0);
- p = dseg_addaddress(m, (void *) builtin_trace_args);
+ p = dseg_addaddress(cd, (void *) builtin_trace_args);
M_ALD(REG_ITMP3, REG_PV, p);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_RA, REG_SP, 1 * 8);
- for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
- M_LLD(r->argintregs[p], REG_SP, (2 + p) * 8);
- }
+ /* restore integer argument registers */
+
+ for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++)
+ M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
+
+ /* restore float argument registers */
for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
t = m->paramtypes[p];
if (IS_FLT_DBL_TYPE(t)) {
if (IS_2_WORD_TYPE(t)) {
- M_DLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
} else {
- M_FLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_FLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
}
} else {
- M_DLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
}
}
- M_LDA(REG_SP, REG_SP, 18 * 8);
- }
-
- /* take arguments out of register or stack frame */
-
- for (p = 0, l = 0; p < m->paramcount; p++) {
- t = m->paramtypes[p];
- var = &(r->locals[l][t]);
- l++;
- if (IS_2_WORD_TYPE(t)) /* increment local counter for 2 word types */
- l++;
- if (var->type < 0)
- continue;
- if (IS_INT_LNG_TYPE(t)) { /* integer args */
- if (p < INT_ARG_CNT) { /* register arguments */
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- M_INTMOVE(r->argintregs[p], var->regoff);
- } else { /* reg arg -> spilled */
- M_LST(r->argintregs[p], REG_SP, 8 * var->regoff);
- }
-
- } else { /* stack arguments */
- pa = p - INT_ARG_CNT;
- if (!(var->flags & INMEMORY)) { /* stack arg -> register */
- M_LLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
-
- } else { /* stack arg -> spilled */
- M_LLD(REG_ITMP1, REG_SP, 8 * (parentargs_base + pa));
- M_LST(REG_ITMP1, REG_SP, 8 * var->regoff);
- }
- }
-
- } else { /* floating args */
- if (p < FLT_ARG_CNT) { /* register arguments */
- if (!(var->flags & INMEMORY)) { /* reg arg -> register */
- M_TFLTMOVE(var->type, r->argfltregs[p], var->regoff);
-
- } else { /* reg arg -> spilled */
- M_DST(r->argfltregs[p], REG_SP, var->regoff * 8);
- }
+ /* restore temporary registers for leaf methods */
- } else { /* stack arguments */
- pa = p - FLT_ARG_CNT;
- if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
- M_DLD(var->regoff, REG_SP, 8 * (parentargs_base + pa));
+ if (m->isleafmethod) {
+ for (p = 0; p < INT_TMP_CNT; p++)
+ M_LLD(rd->tmpintregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + p) * 8);
- } else { /* stack-arg -> spilled */
- M_DLD(REG_FTMP1, REG_SP, 8 * (parentargs_base + pa));
- M_DST(REG_FTMP1, REG_SP, 8 * var->regoff);
- }
- }
+ for (p = 0; p < FLT_TMP_CNT; p++)
+ M_DLD(rd->tmpfltregs[p], REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + p) * 8);
}
- } /* end for */
-
- /* call monitorenter function */
-#if defined(USE_THREADS)
- if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
- s4 disp;
- s8 func_enter = (m->flags & ACC_STATIC) ?
- (s8) builtin_staticmonitorenter : (s8) builtin_monitorenter;
- p = dseg_addaddress(m, (void *) func_enter);
- M_ALD(REG_ITMP3, REG_PV, p);
- M_JSR(REG_RA, REG_ITMP3);
- M_ALD(r->argintregs[0], REG_SP, r->maxmemuse * 8);
- disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, disp);
+ M_LDA(REG_SP, REG_SP, (2 + INT_ARG_CNT + FLT_ARG_CNT + INT_TMP_CNT + FLT_TMP_CNT) * 8);
}
-#endif
+
}
/* end of header generation */
/* walk through all basic blocks */
+
for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next) {
bptr->mpc = (s4) ((u1 *) mcodeptr - cd->mcodebase);
src = bptr->instack;
len = bptr->indepth;
MCODECHECK(64+len);
+#ifdef LSRA
+ if (opt_lsra) {
+ while (src != NULL) {
+ len--;
+ if ((len == 0) && (bptr->type != BBTYPE_STD)) {
+ /* d = reg_of_var(m, src, REG_ITMP1); */
+ if (!(src->flags & INMEMORY))
+ d= src->regoff;
+ else
+ d=REG_ITMP1;
+ M_INTMOVE(REG_ITMP1, d);
+ store_reg_to_var_int(src, d);
+ }
+ src = src->prev;
+ }
+ } else {
+#endif
while (src != NULL) {
len--;
if ((len == 0) && (bptr->type != BBTYPE_STD)) {
- d = reg_of_var(m, src, REG_ITMP1);
+ d = reg_of_var(rd, src, REG_ITMP1);
M_INTMOVE(REG_ITMP1, d);
store_reg_to_var_int(src, d);
} else {
- d = reg_of_var(m, src, REG_IFTMP);
+ d = reg_of_var(rd, src, REG_IFTMP);
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
- if (!(r->interfaces[len][s2].flags & INMEMORY)) {
- s1 = r->interfaces[len][s2].regoff;
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ s1 = rd->interfaces[len][s2].regoff;
M_TFLTMOVE(s2, s1, d);
} else {
- M_DLD(d, REG_SP, 8 * r->interfaces[len][s2].regoff);
+ M_DLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
store_reg_to_var_flt(src, d);
} else {
- if (!(r->interfaces[len][s2].flags & INMEMORY)) {
- s1 = r->interfaces[len][s2].regoff;
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ s1 = rd->interfaces[len][s2].regoff;
M_INTMOVE(s1,d);
} else {
- M_LLD(d, REG_SP, 8 * r->interfaces[len][s2].regoff);
+ M_LLD(d, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
store_reg_to_var_int(src, d);
}
}
src = src->prev;
}
-
+#ifdef LSRA
+ }
+#endif
/* walk through all instructions */
src = bptr->instack;
len = bptr->icount;
+
for (iptr = bptr->iinstr; len > 0; src = iptr->dst, len--, iptr++) {
- MCODECHECK(64); /* an instruction usually needs < 64 words */
- switch (iptr->opc) {
+ MCODECHECK(64); /* an instruction usually needs < 64 words */
+
+ switch (iptr->opc) {
case ICMD_NOP: /* ... ==> ... */
break;
- case ICMD_NULLCHECKPOP: /* ..., objectref ==> ... */
+ case ICMD_CHECKNULL: /* ..., objectref ==> ..., objectref */
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addxnullrefs(m, mcodeptr);
+ codegen_addxnullrefs(cd, mcodeptr);
M_NOP;
break;
case ICMD_ICONST: /* ... ==> ..., constant */
/* op1 = 0, val.i = constant */
- d = reg_of_var(m, iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
ICONST(d, iptr->val.i);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LCONST: /* ... ==> ..., constant */
/* op1 = 0, val.l = constant */
- d = reg_of_var(m, iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
LCONST(d, iptr->val.l);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_FCONST: /* ... ==> ..., constant */
/* op1 = 0, val.f = constant */
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
- a = dseg_addfloat(m, iptr->val.f);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ a = dseg_addfloat(cd, iptr->val.f);
M_FLD(d, REG_PV, a);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_DCONST: /* ... ==> ..., constant */
/* op1 = 0, val.d = constant */
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
- a = dseg_adddouble(m, iptr->val.d);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ a = dseg_adddouble(cd, iptr->val.d);
M_DLD(d, REG_PV, a);
store_reg_to_var_flt (iptr->dst, d);
break;
case ICMD_ACONST: /* ... ==> ..., constant */
/* op1 = 0, val.a = constant */
- d = reg_of_var(m, iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
if (iptr->val.a) {
- a = dseg_addaddress(m, iptr->val.a);
+ a = dseg_addaddress(cd, iptr->val.a);
M_ALD(d, REG_PV, a);
} else {
M_INTMOVE(REG_ZERO, d);
case ICMD_LLOAD: /* op1 = local variable */
case ICMD_ALOAD:
- d = reg_of_var(m, iptr->dst, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- var = &(r->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
if (var->flags & INMEMORY) {
M_LLD(d, REG_SP, 8 * var->regoff);
} else {
case ICMD_FLOAD: /* ... ==> ..., content of local variable */
case ICMD_DLOAD: /* op1 = local variable */
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
if ((iptr->dst->varkind == LOCALVAR) &&
(iptr->dst->varnum == iptr->op1))
break;
- var = &(r->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ILOAD]);
{
int t2 = ((iptr->opc == ICMD_FLOAD) ? TYPE_FLT : TYPE_DBL);
if (var->flags & INMEMORY) {
if ((src->varkind == LOCALVAR) &&
(src->varnum == iptr->op1))
break;
- var = &(r->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
if (var->flags & INMEMORY) {
var_to_reg_int(s1, src, REG_ITMP1);
M_LST(s1, REG_SP, 8 * var->regoff);
if ((src->varkind == LOCALVAR) &&
(src->varnum == iptr->op1))
break;
- var = &(r->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
+ var = &(rd->locals[iptr->op1][iptr->opc - ICMD_ISTORE]);
{
int t1 = ((iptr->opc == ICMD_FSTORE) ? TYPE_FLT : TYPE_DBL);
if (var->flags & INMEMORY) {
case ICMD_INEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_LNEG: /* ..., value ==> ..., - value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSUB(REG_ZERO, s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_I2L: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_L2I: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL_IMM(s1, 0, d );
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2BYTE: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, 56, d);
M_LSRA_IMM( d, 56, d);
store_reg_to_var_int(iptr->dst, d);
case ICMD_INT2CHAR: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_CZEXT(s1, d);
store_reg_to_var_int(iptr->dst, d);
break;
case ICMD_INT2SHORT: /* ..., value ==> ..., value */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, 48, d);
M_LSRA_IMM( d, 48, d);
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= -32768) && (iptr->val.i <= 32767)) {
M_IADD_IMM(s1, iptr->val.i, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LADD(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= -32768) && (iptr->val.l <= 32767)) {
M_LADD_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= -32767) && (iptr->val.i <= 32768)) {
M_IADD_IMM(s1, -iptr->val.i, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSUB(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= -32767) && (iptr->val.l <= 32768)) {
M_LADD_IMM(s1, -iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LMUL(s1, s2);
M_MFLO(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LMUL(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IDIV(s1, s2);
M_MFLO(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IDIV(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LDIV(s1, s2);
M_MFLO(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LDIV(s1, REG_ITMP2);
M_MFLO(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_IDIV(s1, s2);
M_MFHI(d);
M_NOP;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
ICONST(REG_ITMP2, iptr->val.i);
M_IDIV(s1, REG_ITMP2);
M_MFHI(d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LDIV(s1, s2);
M_MFHI(d);
M_NOP;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
LCONST(REG_ITMP2, iptr->val.l);
M_LDIV(s1, REG_ITMP2);
M_MFHI(d);
case ICMD_LDIVPOW2: /* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA_IMM(s1, 63, REG_ITMP2);
M_LSRL_IMM(REG_ITMP2, 64 - iptr->val.i, REG_ITMP2);
M_LADD(s1, REG_ITMP2, REG_ITMP2);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISLL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRA_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ISRL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSLL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRA_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRL(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LSRL_IMM(s1, iptr->val.i, d);
store_reg_to_var_int(iptr->dst, d);
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_AND(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_AND_IMM(s1, iptr->val.i, d);
}
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_AND_IMM(s1, iptr->val.l, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (s1 == d) {
M_MOV(s1, REG_ITMP1);
s1 = REG_ITMP1;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_OR( s1,s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_OR_IMM(s1, iptr->val.i, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_OR_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_XOR(s1, s2, d);
store_reg_to_var_int(iptr->dst, d);
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.i >= 0) && (iptr->val.i <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.i, d);
}
/* val.l = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if ((iptr->val.l >= 0) && (iptr->val.l <= 0xffff)) {
M_XOR_IMM(s1, iptr->val.l, d);
}
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_CMPLT(s1, s2, REG_ITMP3);
M_CMPLT(s2, s1, REG_ITMP1);
M_LSUB (REG_ITMP1, REG_ITMP3, d);
case ICMD_IINC: /* ..., value ==> ..., value + constant */
/* op1 = variable, val.i = constant */
- var = &(r->locals[iptr->op1][TYPE_INT]);
+ var = &(rd->locals[iptr->op1][TYPE_INT]);
if (var->flags & INMEMORY) {
s1 = REG_ITMP1;
M_LLD(s1, REG_SP, 8 * var->regoff);
case ICMD_FNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_DNEG: /* ..., value ==> ..., - value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DNEG(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DADD(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DSUB(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DMUL(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DDIV(s1, s2, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_FDIV(s1,s2, REG_FTMP3);
M_FLOORFL(REG_FTMP3, REG_FTMP3);
M_CVTLF(REG_FTMP3, REG_FTMP3);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_DDIV(s1,s2, REG_FTMP3);
M_FLOORDL(REG_FTMP3, REG_FTMP3);
M_CVTLD(REG_FTMP3, REG_FTMP3);
case ICMD_I2F: /* ..., value ==> ..., (float) value */
case ICMD_L2F:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_MOVLD(s1, d);
M_CVTLF(d, d);
store_reg_to_var_flt(iptr->dst, d);
case ICMD_I2D: /* ..., value ==> ..., (double) value */
case ICMD_L2D:
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_MOVLD(s1, d);
M_CVTLD(d, d);
store_reg_to_var_flt(iptr->dst, d);
case ICMD_F2I: /* ..., (float) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCFI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_D2I: /* ..., (double) value ==> ..., (int) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCDI(s1, REG_FTMP1);
M_MOVDI(REG_FTMP1, d);
M_NOP;
case ICMD_F2L: /* ..., (float) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCFL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
case ICMD_D2L: /* ..., (double) value ==> ..., (long) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_TRUNCDL(s1, REG_FTMP1);
M_MOVDL(REG_FTMP1, d);
M_NOP;
case ICMD_F2D: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_CVTFD(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
case ICMD_D2F: /* ..., value ==> ..., (double) value */
var_to_reg_flt(s1, src, REG_FTMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
M_CVTDF(s1, d);
store_reg_to_var_flt(iptr->dst, d);
break;
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_FCMPULEF(s1, s2);
M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_FCMPULED(s1, s2);
M_FBT(3);
M_LADD_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_FCMPOLTF(s1, s2);
M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
var_to_reg_flt(s1, src->prev, REG_FTMP1);
var_to_reg_flt(s2, src, REG_FTMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_FCMPOLTD(s1, s2);
M_FBF(3);
M_LSUB_IMM(REG_ZERO, 1, d);
case ICMD_ARRAYLENGTH: /* ..., arrayref ==> ..., length */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
gen_nullptr_check(s1);
M_ILD(d, s1, OFFSET(java_arrayheader, size));
store_reg_to_var_int(iptr->dst, d);
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_FTMP3);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
if (iptr->op1 == 0) {
gen_nullptr_check(s1);
gen_bound_check;
break;
- case ICMD_PUTSTATIC: /* ..., value ==> ... */
- /* op1 = type, val.a = field address */
+ case ICMD_IASTORECONST: /* ..., arrayref, index ==> ... */
- /* if class isn't yet initialized, do it */
- if (!((fieldinfo *) iptr->val.a)->class->initialized) {
- /* call helper function which patches this code */
- a = dseg_addaddress(m, ((fieldinfo *) iptr->val.a)->class);
- M_ALD(REG_ITMP1, REG_PV, a);
- a = dseg_addaddress(m, asm_check_clinit);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
- }
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_ASLL_IMM(s2, 2, REG_ITMP2);
+ M_AADD(REG_ITMP2, s1, REG_ITMP1);
+ M_IST(REG_ZERO, REG_ITMP1, OFFSET(java_intarray, data[0]));
+ break;
- a = dseg_addaddress(m, &(((fieldinfo *) iptr->val.a)->value));
- M_ALD(REG_ITMP1, REG_PV, a);
- switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_IST(s2, REG_ITMP1, 0);
- break;
- case TYPE_LNG:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_LST(s2, REG_ITMP1, 0);
- break;
- case TYPE_ADR:
- var_to_reg_int(s2, src, REG_ITMP2);
- M_AST(s2, REG_ITMP1, 0);
- break;
- case TYPE_FLT:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_FST(s2, REG_ITMP1, 0);
- break;
- case TYPE_DBL:
- var_to_reg_flt(s2, src, REG_FTMP2);
- M_DST(s2, REG_ITMP1, 0);
- break;
- default: panic ("internal error");
+ case ICMD_LASTORECONST: /* ..., arrayref, index ==> ... */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_ASLL_IMM(s2, 3, REG_ITMP2);
+ M_AADD(REG_ITMP2, s1, REG_ITMP1);
+ M_LST(REG_ZERO, REG_ITMP1, OFFSET(java_longarray, data[0]));
+ break;
+
+ case ICMD_AASTORECONST: /* ..., arrayref, index ==> ... */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_ASLL_IMM(s2, POINTERSHIFT, REG_ITMP2);
+ M_AADD(REG_ITMP2, s1, REG_ITMP1);
+ M_AST(REG_ZERO, REG_ITMP1, OFFSET(java_objectarray, data[0]));
+ break;
+
+ case ICMD_BASTORECONST: /* ..., arrayref, index ==> ... */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
+ }
+ M_AADD(s2, s1, REG_ITMP1);
+ M_BST(REG_ZERO, REG_ITMP1, OFFSET(java_bytearray, data[0]));
+ break;
+
+ case ICMD_CASTORECONST: /* ..., arrayref, index ==> ... */
+ case ICMD_SASTORECONST: /* ..., arrayref, index ==> ... */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ var_to_reg_int(s2, src, REG_ITMP2);
+ if (iptr->op1 == 0) {
+ gen_nullptr_check(s1);
+ gen_bound_check;
}
+ M_AADD(s2, s1, REG_ITMP1);
+ M_AADD(s2, REG_ITMP1, REG_ITMP1);
+ M_SST(REG_ZERO, REG_ITMP1, OFFSET(java_chararray, data[0]));
break;
+
case ICMD_GETSTATIC: /* ... ==> ..., value */
/* op1 = type, val.a = field address */
- /* if class isn't yet initialized, do it */
- if (!((fieldinfo *) iptr->val.a)->class->initialized) {
- /* call helper function which patches this code */
- a = dseg_addaddress(m, ((fieldinfo *) iptr->val.a)->class);
- M_ALD(REG_ITMP1, REG_PV, a);
- a = dseg_addaddress(m, asm_check_clinit);
- M_ALD(REG_ITMP3, REG_PV, a);
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
+ if (!iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putstatic,
+ (unresolved_field *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+
+ } else {
+ fieldinfo *fi = iptr->val.a;
+
+ if (!fi->class->initialized) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_clinit, fi->class);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ a = (ptrint) &(fi->value);
}
- a = dseg_addaddress(m, &(((fieldinfo *) iptr->val.a)->value));
+ a = dseg_addaddress(cd, a);
M_ALD(REG_ITMP1, REG_PV, a);
switch (iptr->op1) {
case TYPE_INT:
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ILD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_LNG:
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_LLD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_ADR:
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
M_ALD(d, REG_ITMP1, 0);
store_reg_to_var_int(iptr->dst, d);
break;
case TYPE_FLT:
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
M_FLD(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
case TYPE_DBL:
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
M_DLD(d, REG_ITMP1, 0);
store_reg_to_var_flt(iptr->dst, d);
break;
- default: panic ("internal error");
}
break;
+ case ICMD_PUTSTATIC: /* ..., value ==> ... */
+ /* op1 = type, val.a = field address */
- case ICMD_PUTFIELD: /* ..., value ==> ... */
- /* op1 = type, val.i = field offset */
+ if (!iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putstatic,
+ (unresolved_field *) iptr->target);
- a = ((fieldinfo *)(iptr->val.a))->offset;
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+
+ } else {
+ fieldinfo *fi = iptr->val.a;
+
+ if (!fi->class->initialized) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_clinit, fi->class);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ a = (ptrint) &(fi->value);
+ }
+
+ a = dseg_addaddress(cd, a);
+ M_ALD(REG_ITMP1, REG_PV, a);
switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_IST(s2, s1, a);
- break;
- case TYPE_LNG:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_LST(s2, s1, a);
- break;
- case TYPE_ADR:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_int(s2, src, REG_ITMP2);
- gen_nullptr_check(s1);
- M_AST(s2, s1, a);
- break;
- case TYPE_FLT:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- gen_nullptr_check(s1);
- M_FST(s2, s1, a);
- break;
- case TYPE_DBL:
- var_to_reg_int(s1, src->prev, REG_ITMP1);
- var_to_reg_flt(s2, src, REG_FTMP2);
- gen_nullptr_check(s1);
- M_DST(s2, s1, a);
- break;
- default: panic ("internal error");
+ case TYPE_INT:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_IST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_LNG:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_LST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_ADR:
+ var_to_reg_int(s2, src, REG_ITMP2);
+ M_AST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_FLT:
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ M_FST(s2, REG_ITMP1, 0);
+ break;
+ case TYPE_DBL:
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ M_DST(s2, REG_ITMP1, 0);
+ break;
+ }
+ break;
+
+ case ICMD_PUTSTATICCONST: /* ... ==> ... */
+ /* val = value (in current instruction) */
+ /* op1 = type, val.a = field address (in */
+ /* following NOP) */
+
+ if (!iptr[1].val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putstatic,
+ (unresolved_field *) iptr[1].target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
+
+ a = 0;
+
+ } else {
+ fieldinfo *fi = iptr[1].val.a;
+
+ if (!fi->class->initialized) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_clinit, fi->class);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ a = (ptrint) &(fi->value);
+ }
+
+ a = dseg_addaddress(cd, a);
+ M_ALD(REG_ITMP1, REG_PV, a);
+ switch (iptr->op1) {
+ case TYPE_INT:
+ M_IST(REG_ZERO, REG_ITMP1, 0);
+ break;
+ case TYPE_LNG:
+ M_LST(REG_ZERO, REG_ITMP1, 0);
+ break;
+ case TYPE_ADR:
+ M_AST(REG_ZERO, REG_ITMP1, 0);
+ break;
+ case TYPE_FLT:
+ M_FST(REG_ZERO, REG_ITMP1, 0);
+ break;
+ case TYPE_DBL:
+ M_DST(REG_ZERO, REG_ITMP1, 0);
+ break;
+ }
break;
+
case ICMD_GETFIELD: /* ... ==> ..., value */
/* op1 = type, val.i = field offset */
- a = ((fieldinfo *)(iptr->val.a))->offset;
+ var_to_reg_int(s1, src, REG_ITMP1);
+ gen_nullptr_check(s1);
+
+ if (!iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putfield,
+ (unresolved_field *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+
+ } else {
+ a = ((fieldinfo *) (iptr->val.a))->offset;
+ }
+
switch (iptr->op1) {
- case TYPE_INT:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_ILD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_LNG:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_LLD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_ADR:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
- gen_nullptr_check(s1);
- M_ALD(d, s1, a);
- store_reg_to_var_int(iptr->dst, d);
- break;
- case TYPE_FLT:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
- gen_nullptr_check(s1);
- M_FLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- case TYPE_DBL:
- var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_FTMP1);
- gen_nullptr_check(s1);
- M_DLD(d, s1, a);
- store_reg_to_var_flt(iptr->dst, d);
- break;
- default: panic ("internal error");
+ case TYPE_INT:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_ILD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_LNG:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_LLD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_ADR:
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_ALD(d, s1, a);
+ store_reg_to_var_int(iptr->dst, d);
+ break;
+ case TYPE_FLT:
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ M_FLD(d, s1, a);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ case TYPE_DBL:
+ d = reg_of_var(rd, iptr->dst, REG_FTMP1);
+ M_DLD(d, s1, a);
+ store_reg_to_var_flt(iptr->dst, d);
+ break;
+ }
+ /* XXX quick hack */
+ M_NOP;
+ break;
+
+ case ICMD_PUTFIELD: /* ..., objectref, value ==> ... */
+ /* op1 = type, val.a = field address */
+
+ var_to_reg_int(s1, src->prev, REG_ITMP1);
+ gen_nullptr_check(s1);
+
+ if (!IS_FLT_DBL_TYPE(iptr->op1)) {
+ var_to_reg_int(s2, src, REG_ITMP2);
+ } else {
+ var_to_reg_flt(s2, src, REG_FTMP2);
+ }
+
+ if (!iptr->val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putfield,
+ (unresolved_field *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+
+ } else {
+ a = ((fieldinfo *) (iptr->val.a))->offset;
+ }
+
+ switch (iptr->op1) {
+ case TYPE_INT:
+ M_IST(s2, s1, a);
+ break;
+ case TYPE_LNG:
+ M_LST(s2, s1, a);
+ break;
+ case TYPE_ADR:
+ M_AST(s2, s1, a);
+ break;
+ case TYPE_FLT:
+ M_FST(s2, s1, a);
+ break;
+ case TYPE_DBL:
+ M_DST(s2, s1, a);
+ break;
+ }
+ /* XXX quick hack */
+ M_NOP;
+ break;
+
+ case ICMD_PUTFIELDCONST: /* ..., objectref ==> ... */
+ /* val = value (in current instruction) */
+ /* op1 = type, val.a = field address (in */
+ /* following NOP) */
+
+ var_to_reg_int(s1, src, REG_ITMP1);
+ gen_nullptr_check(s1);
+
+ if (!iptr[1].val.a) {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_get_putfield,
+ (unresolved_field *) iptr[1].target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
+
+ a = 0;
+
+ } else {
+ a = ((fieldinfo *) (iptr[1].val.a))->offset;
+ }
+
+ switch (iptr[1].op1) {
+ case TYPE_INT:
+ M_IST(REG_ZERO, s1, a);
+ break;
+ case TYPE_LNG:
+ M_LST(REG_ZERO, s1, a);
+ break;
+ case TYPE_ADR:
+ M_AST(REG_ZERO, s1, a);
+ break;
+ case TYPE_FLT:
+ M_FST(REG_ZERO, s1, a);
+ break;
+ case TYPE_DBL:
+ M_DST(REG_ZERO, s1, a);
+ break;
+ }
+ /* XXX quick hack */
+ M_NOP;
break;
/* branch operations **************************************************/
-#define ALIGNCODENOP {if((int)((long)mcodeptr&7)){M_NOP;}}
-
case ICMD_ATHROW: /* ..., objectref ==> ... (, objectref) */
var_to_reg_int(s1, src, REG_ITMP1);
M_INTMOVE(s1, REG_ITMP1_XPTR);
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP2, REG_PV, a);
M_JSR(REG_ITMP2_XPC, REG_ITMP2);
M_NOP;
case ICMD_GOTO: /* ... ==> ... */
/* op1 = target JavaVM pc */
M_BR(0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
case ICMD_JSR: /* ... ==> ... */
/* op1 = target JavaVM pc */
- dseg_addtarget(m, BlockPtrOfPC(iptr->op1));
+ dseg_addtarget(cd, BlockPtrOfPC(iptr->op1));
M_ALD(REG_ITMP1, REG_PV, -(cd->dseglen));
M_JSR(REG_ITMP1, REG_ITMP1); /* REG_ITMP1 = return address */
M_NOP;
case ICMD_RET: /* ... ==> ... */
/* op1 = local variable */
- var = &(r->locals[iptr->op1][TYPE_ADR]);
+ var = &(rd->locals[iptr->op1][TYPE_ADR]);
if (var->flags & INMEMORY) {
M_ALD(REG_ITMP1, REG_SP, 8 * var->regoff);
M_RET(REG_ITMP1);
var_to_reg_int(s1, src, REG_ITMP1);
M_BEQZ(s1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src, REG_ITMP1);
M_BNEZ(s1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
ICONST(REG_ITMP2, iptr->val.i);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
ICONST(REG_ITMP2, iptr->val.i);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BEQ(s1, REG_ITMP2, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BNEZ(REG_ITMP1, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BEQZ(REG_ITMP1, 0);
}
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
LCONST(REG_ITMP2, iptr->val.l);
M_BNE(s1, REG_ITMP2, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
M_BNEZ(REG_ITMP1, 0);
}
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
}
M_BEQZ(REG_ITMP1, 0);
}
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BEQ(s1, s2, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s1, src->prev, REG_ITMP1);
var_to_reg_int(s2, src, REG_ITMP2);
M_BNE(s1, s2, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BNEZ(REG_ITMP1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPGT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
var_to_reg_int(s2, src, REG_ITMP2);
M_CMPLT(s1, s2, REG_ITMP1);
M_BEQZ(REG_ITMP1, 0);
- codegen_addreference(m, BlockPtrOfPC(iptr->op1), mcodeptr);
+ codegen_addreference(cd, BlockPtrOfPC(iptr->op1), mcodeptr);
M_NOP;
break;
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if (iptr[1].opc == ICMD_ELSE_ICONST) {
if ((s3 == 0) && (iptr[1].val.i == 1)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
/* val.i = constant */
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
s3 = iptr->val.i;
if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
if ((s3 == 1) && (iptr[1].val.i == 0)) {
case ICMD_IRETURN: /* ..., retvalue ==> ... */
case ICMD_LRETURN:
case ICMD_ARETURN:
+ var_to_reg_int(s1, src, REG_RESULT);
+ M_INTMOVE(s1, REG_RESULT);
#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
s4 disp;
- a = dseg_addaddress(m, (void *) builtin_monitorexit);
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(r->argintregs[0], REG_SP, r->maxmemuse * 8); /* delay slot */
+ M_LST(REG_RESULT, REG_SP, rd->maxmemuse * 8); /* delay slot */
+
disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
+ M_LLD(REG_RESULT, REG_SP, rd->maxmemuse * 8);
}
#endif
- var_to_reg_int(s1, src, REG_RESULT);
- M_INTMOVE(s1, REG_RESULT);
goto nowperformreturn;
- case ICMD_FRETURN: /* ..., retvalue ==> ... */
- case ICMD_DRETURN:
+ case ICMD_FRETURN: /* ..., retvalue ==> ... */
+ case ICMD_DRETURN:
+ var_to_reg_flt(s1, src, REG_FRESULT);
+ {
+ int t = ((iptr->opc == ICMD_FRETURN) ? TYPE_FLT : TYPE_DBL);
+ M_TFLTMOVE(t, s1, REG_FRESULT);
+ }
#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
s4 disp;
- a = dseg_addaddress(m, (void *) builtin_monitorexit);
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(r->argintregs[0], REG_SP, r->maxmemuse * 8); /* delay slot */
+ M_DST(REG_FRESULT, REG_SP, rd->maxmemuse * 8); /* delay slot */
+
disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
+ M_DLD(REG_FRESULT, REG_SP, rd->maxmemuse * 8);
}
#endif
- var_to_reg_flt(s1, src, REG_FRESULT);
- {
- int t = ((iptr->opc == ICMD_FRETURN) ? TYPE_FLT : TYPE_DBL);
- M_TFLTMOVE(t, s1, REG_FRESULT);
- }
goto nowperformreturn;
case ICMD_RETURN: /* ... ==> ... */
#if defined(USE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED)) {
s4 disp;
- a = dseg_addaddress(m, (void *) builtin_monitorexit);
+ a = dseg_addaddress(cd, (void *) builtin_monitorexit);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
- M_ALD(r->argintregs[0], REG_SP, r->maxmemuse * 8); /* delay slot */
+ M_ALD(rd->argintregs[0], REG_SP, rd->maxmemuse * 8); /* delay slot */
disp = -(s4) ((u1 *) mcodeptr - cd->mcodebase);
M_LDA(REG_PV, REG_RA, disp);
}
/* restore saved registers */
- for (i = r->savintregcnt - 1; i >= r->maxsavintreguse; i--) {
- p--; M_LLD(r->savintregs[i], REG_SP, 8 * p);
+ for (i = rd->savintregcnt - 1; i >= rd->maxsavintreguse; i--) {
+ p--; M_LLD(rd->savintregs[i], REG_SP, 8 * p);
}
- for (i = r->savfltregcnt - 1; i >= r->maxsavfltreguse; i--) {
- p--; M_DLD(r->savfltregs[i], REG_SP, 8 * p);
+ for (i = rd->savfltregcnt - 1; i >= rd->maxsavfltreguse; i--) {
+ p--; M_DLD(rd->savfltregs[i], REG_SP, 8 * p);
}
/* call trace function */
M_LST(REG_RA, REG_SP, 0);
M_LST(REG_RESULT, REG_SP, 8);
M_DST(REG_FRESULT, REG_SP,16);
- a = dseg_addaddress(m, m);
- M_ALD(r->argintregs[0], REG_PV, a);
- M_MOV(REG_RESULT, r->argintregs[1]);
- M_FLTMOVE(REG_FRESULT, r->argfltregs[2]);
- M_FMOV(REG_FRESULT, r->argfltregs[3]);
- a = dseg_addaddress(m, (void *) builtin_displaymethodstop);
+ a = dseg_addaddress(cd, m);
+ M_ALD(rd->argintregs[0], REG_PV, a);
+ M_MOV(REG_RESULT, rd->argintregs[1]);
+ M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
+ M_FMOV(REG_FRESULT, rd->argfltregs[3]);
+ a = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR (REG_RA, REG_ITMP3);
M_NOP;
M_CMPULT_IMM(REG_ITMP1, i, REG_ITMP2);
M_BEQZ(REG_ITMP2, 0);
- codegen_addreference(m, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_ASLL_IMM(REG_ITMP1, POINTERSHIFT, REG_ITMP1); /* delay slot*/
/* build jump table top down and use address of lowest entry */
tptr += i;
while (--i >= 0) {
- /* dseg_addtarget(m, BlockPtrOfPC(*--s4ptr)); */
- dseg_addtarget(m, (basicblock *) tptr[0]);
+ /* dseg_addtarget(cd, BlockPtrOfPC(*--s4ptr)); */
+ dseg_addtarget(cd, (basicblock *) tptr[0]);
--tptr;
}
}
val = s4ptr[0];
ICONST(REG_ITMP2, val);
M_BEQ(s1, REG_ITMP2, 0);
- codegen_addreference(m, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_NOP;
}
M_BR(0);
tptr = (void **) iptr->target;
- codegen_addreference(m, (basicblock *) tptr[0], mcodeptr);
+ codegen_addreference(cd, (basicblock *) tptr[0], mcodeptr);
M_NOP;
ALIGNCODENOP;
break;
continue;
if (IS_INT_LNG_TYPE(src->type)) {
if (s3 < INT_ARG_CNT) {
- s1 = r->argintregs[s3];
+ s1 = rd->argintregs[s3];
var_to_reg_int(d, src, s1);
M_INTMOVE(d, s1);
} else {
if (s3 < FLT_ARG_CNT) {
- s1 = r->argfltregs[s3];
+ s1 = rd->argfltregs[s3];
var_to_reg_flt(d, src, s1);
M_TFLTMOVE(src->type, d, s1);
case ICMD_BUILTIN3:
case ICMD_BUILTIN2:
case ICMD_BUILTIN1:
- a = dseg_addaddress(m, (void *) lm);
+ if (iptr->target) {
+ codegen_addpatchref(cd, mcodeptr,
+ (functionptr) lm, iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+
+ } else {
+ a = (ptrint) lm;
+ }
+
+ a = dseg_addaddress(cd, a);
d = iptr->op1; /* return type */
M_ALD(REG_ITMP3, REG_PV, a); /* built-in-function pointer */
M_NOP;
goto afteractualcall;
- case ICMD_INVOKESTATIC:
case ICMD_INVOKESPECIAL:
- a = dseg_addaddress(m, lm->stubroutine);
- d = lm->returntype;
+ gen_nullptr_check(rd->argintregs[0]);
+ M_ILD(REG_ITMP1, rd->argintregs[0], 0); /* hardware nullptr */
+ /* fall through */
+
+ case ICMD_INVOKESTATIC:
+ if (!lm) {
+ unresolved_method *um = iptr->target;
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_invokestatic_special, um);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = 0;
+ d = um->methodref->parseddesc.md->returntype.type;
+ } else {
+ a = (ptrint) lm->stubroutine;
+ d = lm->parseddesc->returntype.type;
+ }
+
+ a = dseg_addaddress(cd, a);
M_ALD(REG_PV, REG_PV, a); /* method pointer in pv */
break;
case ICMD_INVOKEVIRTUAL:
- d = lm->returntype;
+ gen_nullptr_check(rd->argintregs[0]);
+
+ if (!lm) {
+ unresolved_method *um = iptr->target;
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_invokevirtual, um);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
- gen_nullptr_check(r->argintregs[0]);
- M_ALD(REG_METHODPTR, r->argintregs[0], OFFSET(java_objectheader, vftbl));
- M_ALD(REG_PV, REG_METHODPTR, OFFSET(vftbl_t, table[0]) + sizeof(methodptr) * lm->vftblindex);
+ s1 = 0;
+ d = um->methodref->parseddesc.md->returntype.type;
+
+ } else {
+ s1 = OFFSET(vftbl_t, table[0]) +
+ sizeof(methodptr) * lm->vftblindex;
+ d = lm->parseddesc->returntype.type;
+ }
+
+ M_ALD(REG_METHODPTR, rd->argintregs[0],
+ OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_PV, REG_METHODPTR, s1);
break;
case ICMD_INVOKEINTERFACE:
- d = lm->returntype;
-
- gen_nullptr_check(r->argintregs[0]);
- M_ALD(REG_METHODPTR, r->argintregs[0], OFFSET(java_objectheader, vftbl));
- M_ALD(REG_METHODPTR, REG_METHODPTR, OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * lm->class->index);
- M_ALD(REG_PV, REG_METHODPTR, sizeof(methodptr) * (lm - lm->class->methods));
+ gen_nullptr_check(rd->argintregs[0]);
+
+ if (!lm) {
+ unresolved_method *um = iptr->target;
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_invokeinterface, um);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ s1 = 0;
+ s2 = 0;
+ d = um->methodref->parseddesc.md->returntype.type;
+
+ } else {
+ s1 = OFFSET(vftbl_t, interfacetable[0]) -
+ sizeof(methodptr*) * lm->class->index;
+
+ s2 = sizeof(methodptr) * (lm - lm->class->methods);
+
+ d = lm->parseddesc->returntype.type;
+ }
+
+ M_ALD(REG_METHODPTR, rd->argintregs[0],
+ OFFSET(java_objectheader, vftbl));
+ M_ALD(REG_METHODPTR, REG_METHODPTR, s1);
+ M_ALD(REG_PV, REG_METHODPTR, s2);
break;
}
if (d != TYPE_VOID) {
if (IS_INT_LNG_TYPE(iptr->dst->type)) {
- s1 = reg_of_var(m, iptr->dst, REG_RESULT);
+ s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
store_reg_to_var_int(iptr->dst, s1);
} else {
- s1 = reg_of_var(m, iptr->dst, REG_FRESULT);
+ s1 = reg_of_var(rd, iptr->dst, REG_FRESULT);
M_TFLTMOVE(iptr->dst->type, REG_FRESULT, s1);
store_reg_to_var_flt(iptr->dst, s1);
}
break;
- case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
-
+ case ICMD_CHECKCAST: /* ..., objectref ==> ..., objectref */
/* op1: 0 == array, 1 == class */
/* val.a: (classinfo*) superclass */
-/* superclass is an interface:
- *
- * return (sub != NULL) &&
- * (sub->vftbl->interfacetablelength > super->index) &&
- * (sub->vftbl->interfacetable[-super->index] != NULL);
- *
- * superclass is a class:
- *
- * return ((sub != NULL) && (0
- * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
- * super->vftbl->diffvall));
- */
+ /* superclass is an interface:
+ *
+ * OK if ((sub == NULL) ||
+ * (sub->vftbl->interfacetablelength > super->index) &&
+ * (sub->vftbl->interfacetable[-super->index] != NULL));
+ *
+ * superclass is a class:
+ *
+ * OK if ((sub == NULL) || (0
+ * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
+ * super->vftbl->diffvall));
+ */
{
- classinfo *super = (classinfo*) iptr->val.a;
+ classinfo *super;
+ vftbl_t *supervftbl;
+ s4 superindex;
+
+ super = (classinfo *) iptr->val.a;
+
+ if (!super) {
+ superindex = 0;
+ supervftbl = NULL;
+
+ } else {
+ superindex = super->index;
+ supervftbl = super->vftbl;
+ }
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
+
var_to_reg_int(s1, src, REG_ITMP1);
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
+
+ /* calculate interface checkcast code size */
+
+ s2 = 8;
+ if (!super)
+ s2 += (showdisassemble ? 2 : 0);
+
+ /* calculate class checkcast code size */
+
+ s3 = 10 /* 10 + (s1 == REG_ITMP1) */;
+ if (!super)
+ s3 += (showdisassemble ? 2 : 0);
+
+ /* if class is not resolved, check which code to call */
+
+ if (!super) {
+ M_BEQZ(s1, 5 + (showdisassemble ? 2 : 0) + s2 + 2 + s3);
+ M_NOP;
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_flags,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
- M_CLR(d);
- if (iptr->op1) { /* class/interface */
- if (super->flags & ACC_INTERFACE) { /* interface */
- M_BEQZ(s1, 8);
- M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
- M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
- M_BLEZ(REG_ITMP2, 3);
+
+ a = dseg_adds4(cd, 0); /* super->flags */
+ M_ILD(REG_ITMP2, REG_PV, a);
+ M_AND_IMM(REG_ITMP2, ACC_INTERFACE, REG_ITMP2);
+ M_BEQZ(REG_ITMP2, 1 + s2 + 2);
+ M_NOP;
+ }
+
+ /* interface checkcast code */
+
+ if (!super || super->flags & ACC_INTERFACE) {
+ if (super) {
+ M_BEQZ(s1, 1 + s2);
M_NOP;
- M_ALD(REG_ITMP1, REG_ITMP1,
- OFFSET(vftbl_t, interfacetable[0]) -
- super->index * sizeof(methodptr*));
- M_CMPULT(REG_ZERO, REG_ITMP1, d); /* REG_ITMP1 != 0 */
+
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_interface,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
- else { /* class */
- /*
- s2 = super->vftbl->diffval;
- M_BEQZ(s1, 5);
+ }
+
+ M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, interfacetablelength));
+ M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
+ M_BLEZ(REG_ITMP3, 0);
+ codegen_addxcastrefs(cd, mcodeptr);
+ M_NOP;
+ M_ALD(REG_ITMP3, REG_ITMP2,
+ OFFSET(vftbl_t, interfacetable[0]) -
+ superindex * sizeof(methodptr*));
+ M_BEQZ(REG_ITMP3, 0);
+ codegen_addxcastrefs(cd, mcodeptr);
+ M_NOP;
+
+ if (!super) {
+ M_BR(1 + s3);
M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
- M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
- M_CMPULT_IMM(REG_ITMP1, s2 + 1, d);
- */
+ }
+ }
+
+ /* class checkcast code */
- M_BEQZ(s1, 9);
+ if (!super || !(super->flags & ACC_INTERFACE)) {
+ if (super) {
+ M_BEQZ(s1, 1 + s3);
M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress(m, (void *) super->vftbl);
- M_ALD(REG_ITMP2, REG_PV, a);
+
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_class,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
+ a = dseg_addaddress(cd, (void *) supervftbl);
+ M_ALD(REG_ITMP3, REG_PV, a);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
- M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
+/* if (s1 != REG_ITMP1) { */
+/* M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
+/* M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
+/* #if defined(USE_THREADS) && defined(NATIVE_THREADS) */
+/* codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase); */
+/* #endif */
+/* M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
+/* } else { */
+ M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval));
+ M_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
- M_CMPULT(REG_ITMP2, REG_ITMP1, d);
- M_XOR_IMM(d, 1, d);
-
- }
- }
- else
- panic ("internal error: no inlined array instanceof");
+/* } */
+ M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
+ M_BNEZ(REG_ITMP3, 0);
+ codegen_addxcastrefs(cd, mcodeptr);
+ M_NOP;
}
+ d = reg_of_var(rd, iptr->dst, REG_ITMP3);
+ M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
+ }
break;
- case ICMD_CHECKCAST: /* ..., objectref ==> ..., objectref */
-
+ case ICMD_INSTANCEOF: /* ..., objectref ==> ..., intresult */
/* op1: 0 == array, 1 == class */
/* val.a: (classinfo*) superclass */
-/* superclass is an interface:
- *
- * OK if ((sub == NULL) ||
- * (sub->vftbl->interfacetablelength > super->index) &&
- * (sub->vftbl->interfacetable[-super->index] != NULL));
- *
- * superclass is a class:
- *
- * OK if ((sub == NULL) || (0
- * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
- * super->vftbl->diffvall));
- */
+ /* superclass is an interface:
+ *
+ * return (sub != NULL) &&
+ * (sub->vftbl->interfacetablelength > super->index) &&
+ * (sub->vftbl->interfacetable[-super->index] != NULL);
+ *
+ * superclass is a class:
+ *
+ * return ((sub != NULL) && (0
+ * <= (sub->vftbl->baseval - super->vftbl->baseval) <=
+ * super->vftbl->diffvall));
+ */
{
- classinfo *super = (classinfo*) iptr->val.a;
+ classinfo *super;
+ vftbl_t *supervftbl;
+ s4 superindex;
+
+ super = (classinfo *) iptr->val.a;
+
+ if (!super) {
+ superindex = 0;
+ supervftbl = NULL;
+
+ } else {
+ superindex = super->index;
+ supervftbl = super->vftbl;
+ }
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritrestart(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritrestart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- d = reg_of_var(m, iptr->dst, REG_ITMP3);
- var_to_reg_int(s1, src, d);
- if (iptr->op1) { /* class/interface */
- if (super->flags & ACC_INTERFACE) { /* interface */
- M_BEQZ(s1, 9);
- M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
- M_IADD_IMM(REG_ITMP2, - super->index, REG_ITMP2);
- M_BLEZ(REG_ITMP2, 0);
- codegen_addxcastrefs(m, mcodeptr);
- M_NOP;
- M_ALD(REG_ITMP2, REG_ITMP1,
- OFFSET(vftbl_t, interfacetable[0]) -
- super->index * sizeof(methodptr*));
- M_BEQZ(REG_ITMP2, 0);
- codegen_addxcastrefs(m, mcodeptr);
+ var_to_reg_int(s1, src, REG_ITMP1);
+ d = reg_of_var(rd, iptr->dst, REG_ITMP2);
+ if (s1 == d) {
+ M_MOV(s1, REG_ITMP1);
+ s1 = REG_ITMP1;
+ }
+
+ /* calculate interface instanceof code size */
+
+ s2 = 7;
+ if (!super)
+ s2 += (showdisassemble ? 2 : 0);
+
+ /* calculate class instanceof code size */
+
+ s3 = 8;
+ if (!super)
+ s3 += (showdisassemble ? 2 : 0);
+
+ M_CLR(d);
+
+ /* if class is not resolved, check which code to call */
+
+ if (!super) {
+ M_BEQZ(s1, 5 + (showdisassemble ? 2 : 0) + s2 + 2 + s3);
+ M_NOP;
+
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_flags,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+
+ a = dseg_adds4(cd, 0); /* super->flags */
+ M_ILD(REG_ITMP3, REG_PV, a);
+ M_AND_IMM(REG_ITMP3, ACC_INTERFACE, REG_ITMP3);
+ M_BEQZ(REG_ITMP3, 1 + s2 + 2);
+ M_NOP;
+ }
+
+ /* interface instanceof code */
+
+ if (!super || (super->flags & ACC_INTERFACE)) {
+ if (super) {
+ M_BEQZ(s1, 1 + s2);
M_NOP;
+
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_interface,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
- else { /* class */
+ }
- /*
- s2 = super->vftbl->diffval;
- M_BEQZ(s1, 6 + (s2 != 0));
+ M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
+ M_IADD_IMM(REG_ITMP3, -superindex, REG_ITMP3);
+ M_BLEZ(REG_ITMP3, 3);
+ M_NOP;
+ M_ALD(REG_ITMP1, REG_ITMP1,
+ OFFSET(vftbl_t, interfacetable[0]) -
+ superindex * sizeof(methodptr*));
+ M_CMPULT(REG_ZERO, REG_ITMP1, d); /* REG_ITMP1 != 0 */
+
+ if (!super) {
+ M_BR(1 + s3);
M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
- M_IADD_IMM(REG_ITMP1, - super->vftbl->baseval, REG_ITMP1);
- if (s2 == 0) {
- M_BNEZ(REG_ITMP1, 0);
- }
- else{
- M_CMPULT_IMM(REG_ITMP1, s2 + 1, REG_ITMP2);
- M_BEQZ(REG_ITMP2, 0);
- }
- */
+ }
+ }
+
+ /* class instanceof code */
- M_BEQZ(s1, 10 + (d == REG_ITMP3));
+ if (!super || !(super->flags & ACC_INTERFACE)) {
+ if (super) {
+ M_BEQZ(s1, 1 + s3);
M_NOP;
- M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
- a = dseg_addaddress(m, (void *) super->vftbl);
- M_ALD(REG_ITMP2, REG_PV, a);
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstart(m, (u1 *) mcodeptr - cd->mcodebase);
-#endif
- M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
- if (d != REG_ITMP3) {
- M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+
+ } else {
+ codegen_addpatchref(cd, mcodeptr,
+ PATCHER_checkcast_instanceof_class,
+ (constant_classref *) iptr->target);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
+ }
+ }
+
+ M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
+ a = dseg_addaddress(cd, supervftbl);
+ M_ALD(REG_ITMP2, REG_PV, a);
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstart(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
- } else {
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
- M_ISUB(REG_ITMP1, REG_ITMP2, REG_ITMP1);
- M_ALD(REG_ITMP2, REG_PV, a);
- M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+ M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
+ M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
+ M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- codegen_threadcritstop(m, (u1 *) mcodeptr - cd->mcodebase);
+ codegen_threadcritstop(cd, (u1 *) mcodeptr - cd->mcodebase);
#endif
- }
- M_CMPULT(REG_ITMP2, REG_ITMP1, REG_ITMP2);
- M_BNEZ(REG_ITMP2, 0);
-
- codegen_addxcastrefs(m, mcodeptr);
- M_NOP;
- }
- }
- else
- panic ("internal error: no inlined array checkcast");
+ M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+ M_CMPULT(REG_ITMP2, REG_ITMP1, d);
+ M_XOR_IMM(d, 1, d);
}
- M_INTMOVE(s1, d);
store_reg_to_var_int(iptr->dst, d);
+ }
break;
case ICMD_CHECKASIZE: /* ..., size ==> ..., size */
var_to_reg_int(s1, src, REG_ITMP1);
M_BLTZ(s1, 0);
- codegen_addxcheckarefs(m, mcodeptr);
+ codegen_addxcheckarefs(cd, mcodeptr);
M_NOP;
break;
case ICMD_CHECKEXCEPTION: /* ... ==> ... */
M_BEQZ(REG_RESULT, 0);
- codegen_addxexceptionrefs(m, mcodeptr);
+ codegen_addxexceptionrefs(cd, mcodeptr);
M_NOP;
break;
for (s1 = iptr->op1; --s1 >= 0; src = src->prev) {
var_to_reg_int(s2, src, REG_ITMP1);
M_BLTZ(s2, 0);
- codegen_addxcheckarefs(m, mcodeptr);
+ codegen_addxcheckarefs(cd, mcodeptr);
M_NOP;
- /* copy sizes to stack (argument numbers >= INT_ARG_CNT) */
+ /* copy SAVEDVAR sizes to stack */
if (src->varkind != ARGVAR) {
- M_LST(s2, REG_SP, 8 * (s1 + INT_ARG_CNT));
+ M_LST(s2, REG_SP, s1 * 8);
+ }
+ }
+
+ /* is patcher function set? */
+
+ if (iptr->target) {
+ codegen_addpatchref(cd, mcodeptr,
+ (functionptr) iptr->target, iptr->val.a);
+
+ if (showdisassemble) {
+ M_NOP; M_NOP;
}
+
+ a = 0;
+
+ } else {
+ a = (ptrint) iptr->val.a;
}
/* a0 = dimension count */
- ICONST(r->argintregs[0], iptr->op1);
+ ICONST(rd->argintregs[0], iptr->op1);
/* a1 = arraydescriptor */
- a = dseg_addaddress(m, iptr->val.a);
- M_ALD(r->argintregs[1], REG_PV, a);
+ a = dseg_addaddress(cd, a);
+ M_ALD(rd->argintregs[1], REG_PV, a);
/* a2 = pointer to dimensions = stack pointer */
- M_INTMOVE(REG_SP, r->argintregs[2]);
+ M_INTMOVE(REG_SP, rd->argintregs[2]);
- a = dseg_addaddress(m, (void*) builtin_nmultianewarray);
+ a = dseg_addaddress(cd, BUILTIN_multianewarray);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- s1 = (int)((u1*) mcodeptr - cd->mcodebase);
+ s1 = (s4)((u1 *) mcodeptr - cd->mcodebase);
if (s1 <= 32768)
M_LDA (REG_PV, REG_RA, -s1);
else {
panic("To big");
}
- s1 = reg_of_var(m, iptr->dst, REG_RESULT);
+ s1 = reg_of_var(rd, iptr->dst, REG_RESULT);
M_INTMOVE(REG_RESULT, s1);
store_reg_to_var_int(iptr->dst, s1);
break;
default:
- error ("Unknown pseudo command: %d", iptr->opc);
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Unknown ICMD %d", iptr->opc);
} /* switch */
} /* for instruction */
src = bptr->outstack;
len = bptr->outdepth;
MCODECHECK(64+len);
+#ifdef LSRA
+ if (!opt_lsra)
+#endif
while (src) {
len--;
if ((src->varkind != STACKVAR)) {
s2 = src->type;
if (IS_FLT_DBL_TYPE(s2)) {
var_to_reg_flt(s1, src, REG_FTMP1);
- if (!(r->interfaces[len][s2].flags & INMEMORY)) {
- M_TFLTMOVE(s2, s1, r->interfaces[len][s2].regoff);
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ M_TFLTMOVE(s2, s1, rd->interfaces[len][s2].regoff);
} else {
- M_DST(s1, REG_SP, 8 * r->interfaces[len][s2].regoff);
+ M_DST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
} else {
var_to_reg_int(s1, src, REG_ITMP1);
- if (!(r->interfaces[len][s2].flags & INMEMORY)) {
- M_INTMOVE(s1, r->interfaces[len][s2].regoff);
+ if (!(rd->interfaces[len][s2].flags & INMEMORY)) {
+ M_INTMOVE(s1, rd->interfaces[len][s2].regoff);
} else {
- M_LST(s1, REG_SP, 8 * r->interfaces[len][s2].regoff);
+ M_LST(s1, REG_SP, 8 * rd->interfaces[len][s2].regoff);
}
}
}
{
/* generate bound check stubs */
- s4 *xcodeptr = NULL;
+ s4 *xcodeptr = NULL;
branchref *bref;
for (bref = cd->xboundrefs; bref != NULL; bref = bref->next) {
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(14);
M_MOV(bref->reg, REG_ITMP1);
M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
- a = dseg_addaddress(m, string_java_lang_ArrayIndexOutOfBoundsException);
- M_ALD(r->argintregs[0], REG_PV, a);
- M_MOV(REG_ITMP1, r->argintregs[1]);
-
- a = dseg_addaddress(m, new_exception_int);
+ M_MOV(REG_ITMP1, rd->argintregs[0]);
+ a = dseg_addaddress(cd, new_arrayindexoutofboundsexception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
M_NOP;
xcodeptr = NULL;
for (bref = cd->xcheckarefs; bref != NULL; bref = bref->next) {
- if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) xcodeptr - cd->mcodebase - 4);
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
- a = dseg_addaddress(m, string_java_lang_NegativeArraySizeException);
- M_ALD(r->argintregs[0], REG_PV, a);
-
- a = dseg_addaddress(m, new_exception);
+ a = dseg_addaddress(cd, new_negativearraysizeexception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
M_NOP;
xcodeptr = NULL;
for (bref = cd->xcastrefs; bref != NULL; bref = bref->next) {
- if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) xcodeptr - cd->mcodebase - 4);
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
- a = dseg_addaddress(m, string_java_lang_ClassCastException);
- M_ALD(r->argintregs[0], REG_PV, a);
-
- a = dseg_addaddress(m, new_exception);
+ a = dseg_addaddress(cd, new_classcastexception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
M_NOP;
xcodeptr = NULL;
for (bref = cd->xexceptionrefs; bref != NULL; bref = bref->next) {
- if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) xcodeptr - cd->mcodebase - 4);
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(13);
M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
- a = dseg_addaddress(m, builtin_get_exceptionptrptr);
+ a = dseg_addaddress(cd, builtin_get_exceptionptrptr);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
- M_MOV(REG_RESULT, REG_ITMP1_XPTR);
+
+ /* get the exceptionptr from the ptrprt and clear it */
+ M_ALD(REG_ITMP1_XPTR, REG_RESULT, 0);
+ M_AST(REG_ZERO, REG_RESULT, 0);
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
#else
- a = dseg_addaddress(m, &_exceptionptr);
+ a = dseg_addaddress(cd, &_exceptionptr);
M_ALD(REG_ITMP3, REG_PV, a);
M_ALD(REG_ITMP1_XPTR, REG_ITMP3, 0);
M_AST(REG_ZERO, REG_ITMP3, 0);
#endif
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
M_NOP;
xcodeptr = NULL;
for (bref = cd->xnullrefs; bref != NULL; bref = bref->next) {
- if ((m->exceptiontablelength == 0) && (xcodeptr != NULL)) {
+ if ((cd->exceptiontablelength == 0) && (xcodeptr != NULL)) {
gen_resolvebranch((u1 *) cd->mcodebase + bref->branchpos,
bref->branchpos,
(u1 *) xcodeptr - cd->mcodebase - 4);
bref->branchpos,
(u1 *) mcodeptr - cd->mcodebase);
- MCODECHECK(8);
+ MCODECHECK(12);
M_LADD_IMM(REG_PV, bref->branchpos - 4, REG_ITMP2_XPC);
M_LSUB_IMM(REG_SP, 1 * 8, REG_SP);
M_LST(REG_ITMP2_XPC, REG_SP, 0 * 8);
- a = dseg_addaddress(m, string_java_lang_NullPointerException);
- M_ALD(r->argintregs[0], REG_PV, a);
-
- a = dseg_addaddress(m, new_exception);
+ a = dseg_addaddress(cd, new_nullpointerexception);
M_ALD(REG_ITMP3, REG_PV, a);
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_LLD(REG_ITMP2_XPC, REG_SP, 0 * 8);
M_LADD_IMM(REG_SP, 1 * 8, REG_SP);
- a = dseg_addaddress(m, asm_handle_exception);
+ a = dseg_addaddress(cd, asm_handle_exception);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
+
+
+ /* generate put/getstatic stub call code */
+
+ {
+ patchref *pref;
+ u8 mcode;
+ s4 *tmpmcodeptr;
+
+ for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
+ /* check code segment size */
+
+ MCODECHECK(22 + 4 + 1);
+
+ /* Get machine code which is patched back in later. The call is */
+ /* 2 instruction words long. */
+
+ xcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+
+ /* We need to split this, because an unaligned 8 byte read causes */
+ /* a SIGSEGV. */
+
+ mcode = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ /* create a virtual java_objectheader */
+
+ /* align data structure to 8-byte */
+
+ ALIGNCODENOP;
+
+ *((ptrint *) (mcodeptr + 0)) = 0; /* vftbl */
+ *((ptrint *) (mcodeptr + 2)) = (ptrint) get_dummyLR(); /* monitorPtr */
+
+ mcodeptr += 2 * 2; /* mcodeptr is a `u4*' pointer */
+#endif
+
+ /* patch in the call to call the following code (done at compile */
+ /* time) */
+
+ tmpmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = xcodeptr; /* set mcodeptr to patch position */
+
+ M_BRS(tmpmcodeptr - (xcodeptr + 1));
+ M_MOV(REG_RA, REG_ITMP3); /* branch delay slot */
+
+ mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+
+ /* create stack frame */
+
+ M_LSUB_IMM(REG_SP, 5 * 8, REG_SP);
+
+ /* move return address onto stack */
+
+ M_AST(REG_RA, REG_SP, 4 * 8);
+ M_MOV(REG_ITMP3, REG_RA); /* restore return address */
+
+ /* move pointer to java_objectheader onto stack */
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ M_MOV(REG_RA, REG_ITMP3); /* save return address */
+ M_BRS(0);
+ M_NOP;
+ M_LSUB_IMM(REG_RA, 6 * 4 + 2 * 8, REG_RA);
+ M_AST(REG_RA, REG_SP, 3 * 8);
+ M_MOV(REG_ITMP3, REG_RA); /* restore return address */
+#else
+ M_AST(REG_ZERO, REG_SP, 3 * 8);
+#endif
+
+ /* move machine code onto stack */
+
+ a = dseg_adds8(cd, mcode);
+ M_LLD(REG_ITMP3, REG_PV, a);
+ M_LST(REG_ITMP3, REG_SP, 2 * 8);
+
+ /* move class/method/field reference onto stack */
+
+ a = dseg_addaddress(cd, pref->ref);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_AST(REG_ITMP3, REG_SP, 1 * 8);
+
+ /* move patcher function pointer onto stack */
+
+ a = dseg_addaddress(cd, pref->patcher);
+ M_ALD(REG_ITMP3, REG_PV, a);
+ M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+ a = dseg_addaddress(cd, asm_wrapper_patcher);
M_ALD(REG_ITMP3, REG_PV, a);
M_JMP(REG_ITMP3);
M_NOP;
}
}
- codegen_finish(m, (s4) ((u1 *) mcodeptr - cd->mcodebase));
+ codegen_finish(m, cd, (s4) ((u1 *) mcodeptr - cd->mcodebase));
docacheflush((void*) m->entrypoint, ((u1*) mcodeptr - cd->mcodebase));
}
-/* function createcompilerstub *************************************************
+/* createcompilerstub **********************************************************
- creates a stub routine which calls the compiler
+ Creates a stub routine which calls the compiler.
*******************************************************************************/
-#define COMPSTUBSIZE 4
+#define COMPSTUB_SIZE 4
u1 *createcompilerstub(methodinfo *m)
{
- u8 *s = CNEW(u8, COMPSTUBSIZE); /* memory to hold the stub */
+ u8 *s = CNEW(u8, COMPSTUB_SIZE); /* memory to hold the stub */
s4 *mcodeptr = (s4 *) s; /* code generation pointer */
/* code for the stub */
(void) docacheflush((void*) s, (char*) mcodeptr - (char*) s);
-#ifdef STATISTICS
- count_cstub_len += COMPSTUBSIZE * 8;
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_cstub_len += COMPSTUB_SIZE * 8;
#endif
return (u1 *) s;
void removecompilerstub(u1 *stub)
{
- CFREE(stub, COMPSTUBSIZE * 8);
+ CFREE(stub, COMPSTUB_SIZE * 8);
}
*******************************************************************************/
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#define NATIVESTUBSTACK 2
-#define NATIVESTUBTHREADEXTRA 5
+#define NATIVESTUB_STACK 2
+#define NATIVESTUB_THREAD_EXTRA 5
#else
-#define NATIVESTUBSTACK 1
-#define NATIVESTUBTHREADEXTRA 1
+#define NATIVESTUB_STACK 1
+#define NATIVESTUB_THREAD_EXTRA 1
#endif
-#define NATIVESTUBSIZE (54 + 4 + NATIVESTUBTHREADEXTRA - 1)
-#define NATIVEVERBOSESIZE (50 + 17)
-#define NATIVESTUBOFFSET 9
+#define NATIVESTUB_SIZE (54 + 4 + NATIVESTUB_THREAD_EXTRA - 1)
+#define NATIVESTUB_STATIC_SIZE (18 + 4 + 1)
+#define NATIVESTUB_VERBOSE_SIZE (50 + 17)
+#define NATIVESTUB_OFFSET 11
+
u1 *createnativestub(functionptr f, methodinfo *m)
{
s4 stackframesize = 0; /* size of stackframe if needed */
s4 disp;
s4 stubsize;
- registerdata *r;
+ codegendata *cd;
+ registerdata *rd;
+ t_inlining_globals *id;
+ s4 dumpsize;
+
+ /* mark start of dump memory area */
+
+ dumpsize = dump_size();
+
+ /* setup registers before using it */
+
+ cd = DNEW(codegendata);
+ rd = DNEW(registerdata);
+ id = DNEW(t_inlining_globals);
+
+ inlining_setup(m, id);
+ reg_setup(m, rd, id);
+
+ method_descriptor2types(m); /* set paramcount and paramtypes */
- /* init registers before using it */
- reg_init(m);
+ stubsize = NATIVESTUB_SIZE; /* calculate nativestub size */
- /* keep code size smaller */
- r = m->registerdata;
+ if ((m->flags & ACC_STATIC) && !m->class->initialized)
+ stubsize += NATIVESTUB_STATIC_SIZE;
- descriptor2types(m); /* set paramcount and paramtypes */
+ if (runverbose)
+ stubsize += NATIVESTUB_VERBOSE_SIZE;
- stubsize = runverbose ? NATIVESTUBSIZE + NATIVEVERBOSESIZE : NATIVESTUBSIZE;
s = CNEW(u8, stubsize); /* memory to hold the stub */
- cs = s + NATIVESTUBOFFSET;
+ cs = s + NATIVESTUB_OFFSET;
mcodeptr = (s4 *) (cs); /* code generation pointer */
- *(cs-1) = (u8) f; /* address of native method */
+ /* set some required varibles which are normally set by codegen_setup */
+ cd->mcodebase = (u1 *) mcodeptr;
+ cd->patchrefs = NULL;
+
+ *(cs-1) = (u8) f; /* address of native method */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
- *(cs-2) = (u8) &builtin_get_exceptionptrptr;
+ *(cs-2) = (u8) &builtin_get_exceptionptrptr;
#else
- *(cs-2) = (u8) (&_exceptionptr); /* address of exceptionptr */
+ *(cs-2) = (u8) (&_exceptionptr); /* address of exceptionptr */
#endif
- *(cs-3) = (u8) asm_handle_nat_exception;/* addr of asm exception handler */
- *(cs-4) = (u8) (&env); /* addr of jni_environement */
- *(cs-5) = (u8) builtin_trace_args;
- *(cs-6) = (u8) m;
- *(cs-7) = (u8) builtin_displaymethodstop;
- *(cs-8) = (u8) m->class;
- *(cs-9) = (u8) asm_check_clinit;
-
- M_LDA(REG_SP, REG_SP, -NATIVESTUBSTACK * 8); /* build up stackframe */
+ *(cs-3) = (u8) asm_handle_nat_exception;/* addr of asm exception handler */
+ *(cs-4) = (u8) (&env); /* addr of jni_environement */
+ *(cs-5) = (u8) builtin_trace_args;
+ *(cs-6) = (u8) m;
+ *(cs-7) = (u8) builtin_displaymethodstop;
+ *(cs-8) = (u8) m->class;
+ *(cs-9) = (u8) asm_wrapper_patcher;
+ *(cs-10) = (u8) NULL; /* filled with machine code */
+ *(cs-11) = (u8) PATCHER_clinit;
+
+ M_LDA(REG_SP, REG_SP, -NATIVESTUB_STACK * 8); /* build up stackframe */
M_LST(REG_RA, REG_SP, 0); /* store return address */
/* if function is static, check for initialized */
- if (m->flags & ACC_STATIC) {
- /* if class isn't yet initialized, do it */
- if (!m->class->initialized) {
- /* call helper function which patches this code */
- M_ALD(REG_ITMP1, REG_PV, -8 * 8); /* class */
- M_ALD(REG_ITMP3, REG_PV, -9 * 8); /* asm_check_clinit */
- M_JSR(REG_RA, REG_ITMP3);
- M_NOP;
- }
+ if ((m->flags & ACC_STATIC) && !m->class->initialized) {
+ codegen_addpatchref(cd, mcodeptr, NULL, NULL);
}
/* max. 50 instructions */
+
if (runverbose) {
- int p;
- int t;
+ s4 p;
+ s4 t;
M_LDA(REG_SP, REG_SP, -(18 * 8));
M_AST(REG_RA, REG_SP, 1 * 8);
/* save integer argument registers */
for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
- M_LST(r->argintregs[p], REG_SP, (2 + p) * 8);
+ M_LST(rd->argintregs[p], REG_SP, (2 + p) * 8);
}
/* save and copy float arguments into integer registers */
if (IS_FLT_DBL_TYPE(t)) {
if (IS_2_WORD_TYPE(t)) {
- M_DST(r->argfltregs[p], REG_SP, (10 + p) * 8);
- M_LLD(r->argintregs[p], REG_SP, (10 + p) * 8);
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_LLD(rd->argintregs[p], REG_SP, (10 + p) * 8);
} else {
- M_FST(r->argfltregs[p], REG_SP, (10 + p) * 8);
- M_ILD(r->argintregs[p], REG_SP, (10 + p) * 8);
+ M_FST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_ILD(rd->argintregs[p], REG_SP, (10 + p) * 8);
}
} else {
- M_DST(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DST(rd->argfltregs[p], REG_SP, (10 + p) * 8);
}
}
M_LDA(REG_PV, REG_RA, disp);
for (p = 0; p < m->paramcount && p < INT_ARG_CNT; p++) {
- M_LLD(r->argintregs[p], REG_SP, (2 + p) * 8);
+ M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
}
for (p = 0; p < m->paramcount && p < FLT_ARG_CNT; p++) {
if (IS_FLT_DBL_TYPE(t)) {
if (IS_2_WORD_TYPE(t)) {
- M_DLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
} else {
- M_FLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_FLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
}
} else {
- M_DLD(r->argfltregs[p], REG_SP, (10 + p) * 8);
+ M_DLD(rd->argfltregs[p], REG_SP, (10 + p) * 8);
}
}
}
/* save argument registers on stack -- if we have to */
+
if ((m->flags & ACC_STATIC && m->paramcount > (INT_ARG_CNT - 2)) || m->paramcount > (INT_ARG_CNT - 1)) {
s4 i;
s4 paramshiftcnt = (m->flags & ACC_STATIC) ? 2 : 1;
if (m->flags & ACC_STATIC) {
if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
- M_DST(r->argfltregs[5], REG_SP, 1 * 8);
+ M_DST(rd->argfltregs[5], REG_SP, 1 * 8);
} else {
- M_LST(r->argintregs[5], REG_SP, 1 * 8);
+ M_LST(rd->argintregs[5], REG_SP, 1 * 8);
}
if (IS_FLT_DBL_TYPE(m->paramtypes[4])) {
- M_DST(r->argfltregs[4], REG_SP, 0 * 8);
+ M_DST(rd->argfltregs[4], REG_SP, 0 * 8);
} else {
- M_LST(r->argintregs[4], REG_SP, 0 * 8);
+ M_LST(rd->argintregs[4], REG_SP, 0 * 8);
}
} else {
if (IS_FLT_DBL_TYPE(m->paramtypes[5])) {
- M_DST(r->argfltregs[5], REG_SP, 0 * 8);
+ M_DST(rd->argfltregs[5], REG_SP, 0 * 8);
} else {
- M_LST(r->argintregs[5], REG_SP, 0 * 8);
+ M_LST(rd->argintregs[5], REG_SP, 0 * 8);
}
}
}
if (m->flags & ACC_STATIC) {
- M_MOV(r->argintregs[5], r->argintregs[7]);
+ M_MOV(rd->argintregs[5], rd->argintregs[7]);
- M_DMFC1(REG_ITMP1, r->argfltregs[5]);
- M_DMTC1(REG_ITMP1, r->argfltregs[7]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[5]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[7]);
- M_MOV(r->argintregs[4], r->argintregs[6]);
+ M_MOV(rd->argintregs[4], rd->argintregs[6]);
- M_DMFC1(REG_ITMP1, r->argfltregs[4]);
- M_DMTC1(REG_ITMP1, r->argfltregs[6]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[6]);
- M_MOV(r->argintregs[3], r->argintregs[5]);
- M_DMFC1(REG_ITMP1, r->argfltregs[3]);
+ M_MOV(rd->argintregs[3], rd->argintregs[5]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[3]);
- M_MOV(r->argintregs[2], r->argintregs[4]);
- M_DMTC1(REG_ITMP1, r->argfltregs[5]);
+ M_MOV(rd->argintregs[2], rd->argintregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[5]);
- M_MOV(r->argintregs[1], r->argintregs[3]);
- M_DMFC1(REG_ITMP1, r->argfltregs[2]);
+ M_MOV(rd->argintregs[1], rd->argintregs[3]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[2]);
- M_MOV(r->argintregs[0], r->argintregs[2]);
- M_DMTC1(REG_ITMP1, r->argfltregs[4]);
+ M_MOV(rd->argintregs[0], rd->argintregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[4]);
- M_DMFC1(REG_ITMP1, r->argfltregs[1]);
- M_DMTC1(REG_ITMP1, r->argfltregs[3]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[1]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
- M_DMFC1(REG_ITMP1, r->argfltregs[0]);
- M_DMTC1(REG_ITMP1, r->argfltregs[2]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[0]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
- M_ALD(r->argintregs[1], REG_PV, -8 * 8);
+ M_ALD(rd->argintregs[1], REG_PV, -8 * 8);
} else {
- M_MOV(r->argintregs[6], r->argintregs[7]);
+ M_MOV(rd->argintregs[6], rd->argintregs[7]);
- M_DMFC1(REG_ITMP1, r->argfltregs[6]);
- M_DMTC1(REG_ITMP1, r->argfltregs[7]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[6]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[7]);
- M_MOV(r->argintregs[5], r->argintregs[6]);
+ M_MOV(rd->argintregs[5], rd->argintregs[6]);
- M_DMFC1(REG_ITMP1, r->argfltregs[5]);
- M_DMTC1(REG_ITMP1, r->argfltregs[6]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[5]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[6]);
- M_MOV(r->argintregs[4], r->argintregs[5]);
- M_DMFC1(REG_ITMP1, r->argfltregs[4]);
+ M_MOV(rd->argintregs[4], rd->argintregs[5]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[4]);
- M_MOV(r->argintregs[3], r->argintregs[4]);
- M_DMTC1(REG_ITMP1, r->argfltregs[5]);
+ M_MOV(rd->argintregs[3], rd->argintregs[4]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[5]);
- M_MOV(r->argintregs[2], r->argintregs[3]);
- M_DMFC1(REG_ITMP1, r->argfltregs[3]);
+ M_MOV(rd->argintregs[2], rd->argintregs[3]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[3]);
- M_MOV(r->argintregs[1], r->argintregs[2]);
- M_DMTC1(REG_ITMP1, r->argfltregs[4]);
+ M_MOV(rd->argintregs[1], rd->argintregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[4]);
- M_MOV(r->argintregs[0], r->argintregs[1]);
- M_DMFC1(REG_ITMP1, r->argfltregs[2]);
+ M_MOV(rd->argintregs[0], rd->argintregs[1]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[2]);
- M_DMTC1(REG_ITMP1, r->argfltregs[3]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
- M_DMFC1(REG_ITMP1, r->argfltregs[1]);
- M_DMFC1(REG_ITMP2, r->argfltregs[0]);
+ M_DMFC1(REG_ITMP1, rd->argfltregs[1]);
+ M_DMFC1(REG_ITMP2, rd->argfltregs[0]);
- M_DMTC1(REG_ITMP1, r->argfltregs[2]);
- M_DMTC1(REG_ITMP2, r->argfltregs[1]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+ M_DMTC1(REG_ITMP2, rd->argfltregs[1]);
}
- M_ALD(r->argintregs[0], REG_PV, -4 * 8); /* jni environement */
+ M_ALD(rd->argintregs[0], REG_PV, -4 * 8); /* jni environement */
M_ALD(REG_ITMP3, REG_PV, -1 * 8); /* load adress of native method */
M_JSR(REG_RA, REG_ITMP3); /* call native method */
M_NOP; /* delay slot */
M_AST(REG_RA, REG_SP, 0 * 8);
M_LST(REG_RESULT, REG_SP, 1 * 8);
M_DST(REG_FRESULT, REG_SP, 2 * 8);
- M_ALD(r->argintregs[0], REG_PV, -6 * 8);
- M_MOV(REG_RESULT, r->argintregs[1]);
+ M_ALD(rd->argintregs[0], REG_PV, -6 * 8);
+ M_MOV(REG_RESULT, rd->argintregs[1]);
M_DMFC1(REG_ITMP1, REG_FRESULT);
- M_DMTC1(REG_ITMP1, r->argfltregs[2]);
- M_DMTC1(REG_ITMP1, r->argfltregs[3]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[2]);
+ M_DMTC1(REG_ITMP1, rd->argfltregs[3]);
M_ALD(REG_ITMP3, REG_PV, -7 * 8);/* builtin_displaymethodstop */
M_JSR(REG_RA, REG_ITMP3);
M_NOP;
M_JSR(REG_RA, REG_ITMP3);
/* delay slot */
- if (IS_FLT_DBL_TYPE(m->returntype))
+ if (IS_FLT_DBL_TYPE(m->returntype)) {
M_DST(REG_FRESULT, REG_SP, 1 * 8);
- else
+
+ } else {
M_AST(REG_RESULT, REG_SP, 1 * 8);
+ }
+
M_MOV(REG_RESULT, REG_ITMP3);
- if (IS_FLT_DBL_TYPE(m->returntype))
+
+ if (IS_FLT_DBL_TYPE(m->returntype)) {
M_DLD(REG_FRESULT, REG_SP, 1 * 8);
- else
+
+ } else {
M_ALD(REG_RESULT, REG_SP, 1 * 8);
+ }
#else
M_ALD(REG_ITMP3, REG_PV, -2 * 8); /* get address of exceptionptr */
#endif
M_ALD(REG_ITMP1, REG_ITMP3, 0); /* load exception into reg. itmp1 */
M_BNEZ(REG_ITMP1, 2); /* if no exception then return */
- M_LDA(REG_SP, REG_SP, NATIVESTUBSTACK * 8);/*remove stackframe, delay slot*/
+ M_LDA(REG_SP, REG_SP, NATIVESTUB_STACK * 8);/*remove stackframe, delay slot*/
M_RET(REG_RA); /* return to caller */
M_NOP; /* delay slot */
M_LDA(REG_ITMP2, REG_RA, -4); /* move fault address into reg. itmp2 */
/* delay slot */
- (void) docacheflush((void*) cs, (char*) mcodeptr - (char*) cs);
+ /* generate static stub call code */
-#if 0
- dolog_plain("stubsize: %d (for %d params)\n",
- (int) (mcodeptr - (s4*) s), m->paramcount);
+ {
+ patchref *pref;
+ s4 *xcodeptr;
+ s4 *tmpmcodeptr;
+
+ /* there can only be one clinit ref entry */
+ pref = cd->patchrefs;
+
+ if (pref) {
+ /* Get machine code which is patched back in later. The call is */
+ /* 2 instruction words long. */
+
+ xcodeptr = (s4 *) (cd->mcodebase + pref->branchpos);
+
+ /* We need to split this, because an unaligned 8 byte read causes */
+ /* a SIGSEGV. */
+
+ *(cs-10) = ((u8) xcodeptr[1] << 32) + (u4) xcodeptr[0];
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ /* create a virtual java_objectheader */
+
+ /* align data structure to 8-byte */
+
+ ALIGNCODENOP;
+
+ *((ptrint *) (mcodeptr + 0)) = 0; /* vftbl */
+ *((ptrint *) (mcodeptr + 2)) = (ptrint) get_dummyLR(); /* monitorPtr */
+
+ mcodeptr += 2 * 2; /* mcodeptr is a `u4*' pointer */
#endif
-#ifdef STATISTICS
- count_nstub_len += NATIVESTUBSIZE * 8;
+ /* patch in the call to call the following code (done at compile */
+ /* time) */
+
+ tmpmcodeptr = mcodeptr; /* save current mcodeptr */
+ mcodeptr = xcodeptr; /* set mcodeptr to patch position */
+
+ M_BRS(tmpmcodeptr - (xcodeptr + 1));
+ M_MOV(REG_RA, REG_ITMP3); /* branch delay slot */
+
+ mcodeptr = tmpmcodeptr; /* restore the current mcodeptr */
+
+ /* create stack frame */
+
+ M_LSUB_IMM(REG_SP, 5 * 8, REG_SP);
+
+ /* move return address onto stack */
+
+ M_AST(REG_RA, REG_SP, 4 * 8);
+ M_MOV(REG_ITMP3, REG_RA); /* restore return address */
+
+ /* move pointer to java_objectheader onto stack */
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ M_MOV(REG_RA, REG_ITMP3); /* save return address */
+ M_BRS(0);
+ M_NOP;
+ M_LSUB_IMM(REG_RA, 6 * 4 + 2 * 8, REG_RA);
+ M_AST(REG_RA, REG_SP, 3 * 8);
+ M_MOV(REG_ITMP3, REG_RA); /* restore return address */
+#else
+ M_AST(REG_ZERO, REG_SP, 3 * 8);
+#endif
+
+ /* move machine code onto stack */
+
+ M_LLD(REG_ITMP3, REG_PV, -10 * 8); /* machine code */
+ M_LST(REG_ITMP3, REG_SP, 2 * 8);
+
+ /* move class reference onto stack */
+
+ M_ALD(REG_ITMP3, REG_PV, -8 * 8); /* class */
+ M_AST(REG_ITMP3, REG_SP, 1 * 8);
+
+ /* move patcher function pointer onto stack */
+
+ M_ALD(REG_ITMP3, REG_PV, -11 * 8); /* patcher function */
+ M_AST(REG_ITMP3, REG_SP, 0 * 8);
+
+ M_ALD(REG_ITMP3, REG_PV, -9 * 8); /* asm_wrapper_patcher */
+ M_JMP(REG_ITMP3);
+ M_NOP;
+ }
+ }
+
+ (void) docacheflush((void*) cs, (char*) mcodeptr - (char*) cs);
+
+ /* Check if the stub size is big enough to hold the whole stub generated. */
+ /* If not, this can lead into unpredictable crashes, because of heap */
+ /* corruption. */
+
+ if ((s4) ((ptrint) mcodeptr - (ptrint) s) > stubsize * sizeof(u8)) {
+ throw_cacao_exception_exit(string_java_lang_InternalError,
+ "Native stub size %d is to small for current stub size %d",
+ stubsize, (s4) ((ptrint) mcodeptr - (ptrint) s));
+ }
+
+#if defined(STATISTICS)
+ if (opt_stat)
+ count_nstub_len += NATIVESTUB_SIZE * 8;
#endif
- return (u1 *) (s + NATIVESTUBOFFSET);
+ /* release dump area */
+
+ dump_release(dumpsize);
+
+ return (u1 *) (s + NATIVESTUB_OFFSET);
}
void removenativestub(u1 *stub)
{
- CFREE((u8*) stub - NATIVESTUBOFFSET, NATIVESTUBSIZE * 8);
+ CFREE((u8 *) stub - NATIVESTUB_OFFSET, NATIVESTUB_SIZE * 8);
}
{
u1 *e = p + bytelen;
long psize = sysconf(_SC_PAGESIZE);
- p -= (long) p & (psize-1);
- e += psize - ((((long) e - 1) & (psize-1)) + 1);
+ p -= (long) p & (psize - 1);
+ e += psize - ((((long) e - 1) & (psize - 1)) + 1);
bytelen = e-p;
- mprotect(p, bytelen, PROT_READ|PROT_WRITE|PROT_EXEC);
+ mprotect(p, bytelen, PROT_READ | PROT_WRITE | PROT_EXEC);
}
projects / cacao.git / blobdiff