Christian Ullrich
Edwin Steiner
- $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $
+ $Id: codegen.c 5323 2006-09-05 16:45:24Z edwin $
*/
codegendata *cd;
registerdata *rd;
s4 len, s1, s2, s3, d, disp;
- s4 stackframesize;
stackptr src;
varinfo *var;
basicblock *bptr;
savedregs_num += (INT_SAV_CNT - rd->savintreguse);
savedregs_num += (FLT_SAV_CNT - rd->savfltreguse);
- stackframesize = rd->memuse + savedregs_num;
+ cd->stackframesize = rd->memuse + savedregs_num;
#if defined(ENABLE_THREADS) /* space to save argument of monitor_enter */
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- stackframesize++;
+ cd->stackframesize++;
#endif
/* create method header */
#if 0
- stackframesize = (stackframesize + 1) & ~1; /* align stack to 16-bytes */
+ cd->stackframesize = (cd->stackframesize + 1) & ~1; /* align stack to 16-bytes */
#endif
- (void) dseg_addaddress(cd, code); /* CodeinfoPointer */
- (void) dseg_adds4(cd, stackframesize * 8); /* FrameSize */
+ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
#if defined(ENABLE_THREADS)
/* IsSync contains the offset relative to the stack pointer for the
*/
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_adds4(cd, (rd->memuse + 1) * 8); /* IsSync */
+ (void) dseg_add_unique_s4(cd, (rd->memuse + 1) * 8); /* IsSync */
else
#endif
- (void) dseg_adds4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, jd->isleafmethod); /* IsLeaf */
- (void) dseg_adds4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
- (void) dseg_adds4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
+ (void) dseg_add_unique_s4(cd, jd->isleafmethod); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, INT_SAV_CNT - rd->savintreguse); /* IntSave */
+ (void) dseg_add_unique_s4(cd, FLT_SAV_CNT - rd->savfltreguse); /* FltSave */
dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, cd->exceptiontablelength); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, cd->exceptiontablelength); /* ExTableSize */
/* create exception table */
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);
+ dseg_add_target(cd, ex->start);
+ dseg_add_target(cd, ex->end);
+ dseg_add_target(cd, ex->handler);
+ (void) dseg_add_unique_address(cd, ex->catchtype.cls);
}
/* create stack frame (if necessary) */
- if (stackframesize)
- M_LDA(REG_SP, REG_SP, -stackframesize * 8);
+ if (cd->stackframesize)
+ M_LDA(REG_SP, REG_SP, -(cd->stackframesize * 8));
/* save return address and used callee saved registers */
- p = stackframesize;
+ p = cd->stackframesize;
if (!jd->isleafmethod) {
p--; M_AST(REG_RA, REG_SP, p * 8);
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack arg -> register */
- M_LLD(var->regoff, REG_SP, (stackframesize + s1) * 8);
+ M_LLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 8);
} else { /* stack arg -> spilled */
- var->regoff = stackframesize + s1;
+ var->regoff = cd->stackframesize + s1;
}
}
} else { /* stack arguments */
if (!(var->flags & INMEMORY)) { /* stack-arg -> register */
- M_DLD(var->regoff, REG_SP, (stackframesize + s1) * 8);
+ M_DLD(var->regoff, REG_SP, (cd->stackframesize + s1) * 8);
} else { /* stack-arg -> spilled */
- var->regoff = stackframesize + s1;
+ var->regoff = cd->stackframesize + s1;
}
}
}
/* decide which monitor enter function to call */
if (m->flags & ACC_STATIC) {
- disp = dseg_addaddress(cd, &m->class->object.header);
+ disp = dseg_add_address(cd, &m->class->object.header);
M_ALD(rd->argintregs[0], REG_PV, disp);
}
else {
}
M_AST(rd->argintregs[0], REG_SP, s1 * 8);
- disp = dseg_addaddress(cd, LOCK_monitor_enter);
+ disp = dseg_add_functionptr(cd, LOCK_monitor_enter);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
/* call trace function */
#if !defined(NDEBUG)
- if (opt_verbosecall) {
- M_LDA(REG_SP, REG_SP, -((INT_ARG_CNT + FLT_ARG_CNT + 2) * 8));
- M_AST(REG_RA, REG_SP, 1 * 8);
-
- /* save integer argument registers */
-
- for (p = 0; p < md->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 < md->paramcount && p < FLT_ARG_CNT; p++) {
- t = md->paramtypes[p].type;
-
- if (IS_FLT_DBL_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- M_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
-
- } else {
- M_FST(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_DST(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
- }
- }
-
- disp = dseg_addaddress(cd, m);
- M_ALD(REG_ITMP1, REG_PV, disp);
- M_AST(REG_ITMP1, REG_SP, 0 * 8);
- disp = dseg_addaddress(cd, (void *) builtin_trace_args);
- M_ALD(REG_PV, REG_PV, disp);
- M_JSR(REG_RA, REG_PV);
- disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, -disp);
- M_ALD(REG_RA, REG_SP, 1 * 8);
-
- /* restore integer argument registers */
-
- for (p = 0; p < md->paramcount && p < INT_ARG_CNT; p++)
- M_LLD(rd->argintregs[p], REG_SP, (2 + p) * 8);
-
- /* restore float argument registers */
-
- for (p = 0; p < md->paramcount && p < FLT_ARG_CNT; p++) {
- t = md->paramtypes[p].type;
-
- if (IS_FLT_DBL_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
-
- } else {
- M_FLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
- }
-
- } else {
- M_DLD(rd->argfltregs[p], REG_SP, (2 + INT_ARG_CNT + p) * 8);
- }
- }
-
- M_LDA(REG_SP, REG_SP, (INT_ARG_CNT + FLT_ARG_CNT + 2) * 8);
- }
-#endif /* !defined(NDEBUG) */
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_enter(jd);
+#endif
}
/* op1 = 0, val.f = constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
- disp = dseg_addfloat(cd, iptr->val.f);
+ disp = dseg_add_float(cd, iptr->val.f);
M_FLD(d, REG_PV, disp);
emit_store(jd, iptr, iptr->dst, d);
break;
/* op1 = 0, val.d = constant */
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP1);
- disp = dseg_adddouble(cd, iptr->val.d);
+ disp = dseg_add_double(cd, iptr->val.d);
M_DLD(d, REG_PV, disp);
emit_store(jd, iptr, iptr->dst, d);
break;
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- disp = dseg_addaddress(cd, NULL);
+ constant_classref *cr = ICMD_ACONST_UNRESOLVED_CLASSREF(iptr);
- codegen_addpatchref(cd, PATCHER_aconst,
- ICMD_ACONST_UNRESOLVED_CLASSREF(iptr),
- disp);
+ disp = dseg_add_unique_address(cd, cr);
+
+ /* XXX Only add the patcher, if this position needs to
+ be patched. If there was a previous position which
+ resolved the same class, the returned displacement
+ of dseg_addaddress is ok to use. */
+
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
+ cr, disp);
if (opt_showdisassemble)
M_NOP;
M_ALD(d, REG_PV, disp);
-
- } else {
- if (iptr->val.a == NULL) {
+ }
+ else {
+ if (iptr->val.a == NULL)
M_INTMOVE(REG_ZERO, d);
- } else {
- disp = dseg_addaddress(cd, iptr->val.a);
+ else {
+ disp = dseg_add_address(cd, iptr->val.a);
M_ALD(d, REG_PV, disp);
}
}
M_MOV(s1, rd->argintregs[0]);
M_MOV(s2, rd->argintregs[1]);
bte = iptr->val.a;
- disp = dseg_addaddress(cd, bte->fp);
+ disp = dseg_add_functionptr(cd, bte->fp);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_MOV(s1, rd->argintregs[0]);
M_MOV(s2, rd->argintregs[1]);
bte = iptr->val.a;
- disp = dseg_addaddress(cd, bte->fp);
+ disp = dseg_add_functionptr(cd, bte->fp);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
case ICMD_L2F:
s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
- disp = dseg_adddouble(cd, 0.0);
+ disp = dseg_add_unique_double(cd, 0.0);
M_LST(s1, REG_PV, disp);
M_DLD(d, REG_PV, disp);
M_CVTLF(d, d);
case ICMD_L2D:
s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_FTMP3);
- disp = dseg_adddouble(cd, 0.0);
+ disp = dseg_add_unique_double(cd, 0.0);
M_LST(s1, REG_PV, disp);
M_DLD(d, REG_PV, disp);
M_CVTLD(d, d);
case ICMD_D2I:
s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
- disp = dseg_adddouble(cd, 0.0);
+ disp = dseg_add_unique_double(cd, 0.0);
M_CVTDL_C(s1, REG_FTMP2);
M_CVTLI(REG_FTMP2, REG_FTMP3);
M_DST(REG_FTMP3, REG_PV, disp);
case ICMD_D2L:
s1 = emit_load_s1(jd, iptr, src, REG_FTMP1);
d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP3);
- disp = dseg_adddouble(cd, 0.0);
+ disp = dseg_add_unique_double(cd, 0.0);
M_CVTDL_C(s1, REG_FTMP2);
M_DST(REG_FTMP2, REG_PV, disp);
M_LLD(d, REG_PV, disp);
M_MOV(s1, rd->argintregs[0]);
M_MOV(s3, rd->argintregs[1]);
- disp = dseg_addaddress(cd, BUILTIN_canstore);
+ disp = dseg_add_functionptr(cd, BUILTIN_canstore);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
/* op1 = type, val.a = field address */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- disp = dseg_addaddress(cd, 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(cd, PATCHER_get_putstatic,
- INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
+ codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
-
-
- } else {
+ }
+ else {
fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
- disp = dseg_addaddress(cd, &(fi->value));
+ disp = dseg_add_address(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+ codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
+ 0);
if (opt_showdisassemble)
M_NOP;
/* op1 = type, val.a = field address */
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- disp = dseg_addaddress(cd, 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(cd, PATCHER_get_putstatic,
- INSTRUCTION_UNRESOLVED_FIELD(iptr), disp);
+ codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
-
- } else {
+ }
+ else {
fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
- disp = dseg_addaddress(cd, &(fi->value));
+ disp = dseg_add_address(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+ codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
+ 0);
if (opt_showdisassemble)
M_NOP;
M_ALD(REG_ITMP1, REG_PV, disp);
switch (iptr->op1) {
case TYPE_INT:
- s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
- M_IST(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ M_IST(s1, REG_ITMP1, 0);
break;
case TYPE_LNG:
- s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
- M_LST(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ M_LST(s1, REG_ITMP1, 0);
break;
case TYPE_ADR:
- s2 = emit_load_s2(jd, iptr, src, REG_ITMP2);
- M_AST(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_ITMP2);
+ M_AST(s1, REG_ITMP1, 0);
break;
case TYPE_FLT:
- s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
- M_FST(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+ M_FST(s1, REG_ITMP1, 0);
break;
case TYPE_DBL:
- s2 = emit_load_s2(jd, iptr, src, REG_FTMP2);
- M_DST(s2, REG_ITMP1, 0);
+ s1 = emit_load_s1(jd, iptr, src, REG_FTMP2);
+ M_DST(s1, REG_ITMP1, 0);
break;
}
break;
/* following NOP) */
if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
- disp = dseg_addaddress(cd, 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr + 1);
+
+ disp = dseg_add_unique_address(cd, uf);
- codegen_addpatchref(cd, PATCHER_get_putstatic,
- INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), disp);
+ codegen_addpatchref(cd, PATCHER_get_putstatic, uf, disp);
if (opt_showdisassemble)
M_NOP;
-
- } else {
+ }
+ else {
fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1);
- disp = dseg_addaddress(cd, &(fi->value));
+ disp = dseg_add_address(cd, &(fi->value));
if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
- codegen_addpatchref(cd, PATCHER_clinit, fi->class, 0);
+ codegen_addpatchref(cd, PATCHER_initialize_class, fi->class,
+ 0);
if (opt_showdisassemble)
M_NOP;
gen_nullptr_check(s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, PATCHER_get_putfield,
- INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
disp = 0;
-
- } else {
- disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr)->offset;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+ disp = fi->offset;
}
switch (iptr->op1) {
}
if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
- codegen_addpatchref(cd, PATCHER_get_putfield,
- INSTRUCTION_UNRESOLVED_FIELD(iptr), 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
+
+ codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
disp = 0;
-
- } else {
- disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr)->offset;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
+ disp = fi->offset;
}
switch (iptr->op1) {
gen_nullptr_check(s1);
if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
- codegen_addpatchref(cd, PATCHER_get_putfield,
- INSTRUCTION_UNRESOLVED_FIELD(iptr + 1), 0);
+ unresolved_field *uf = INSTRUCTION_UNRESOLVED_FIELD(iptr + 1);
+
+ codegen_addpatchref(cd, PATCHER_get_putfield, uf, 0);
if (opt_showdisassemble)
M_NOP;
disp = 0;
-
- } else {
- disp = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1)->offset;
+ }
+ else {
+ fieldinfo *fi = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1);
+ disp = fi->offset;
}
switch (iptr[1].op1) {
#ifdef ENABLE_VERIFIER
if (iptr->val.a) {
- codegen_addpatchref(cd, PATCHER_athrow_areturn,
- (unresolved_class *) iptr->val.a, 0);
+ unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+ codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
if (opt_showdisassemble)
M_NOP;
}
#endif /* ENABLE_VERIFIER */
- disp = dseg_addaddress(cd, asm_handle_exception);
+ disp = dseg_add_functionptr(cd, asm_handle_exception);
M_ALD(REG_ITMP2, REG_PV, disp);
M_JMP(REG_ITMP2_XPC, REG_ITMP2);
M_NOP; /* nop ensures that XPC is less than the end */
codegen_addreference(cd, (basicblock *) iptr->target);
break;
- /* (value xx 0) ? IFxx_ICONST : ELSE_ICONST */
-
- case ICMD_ELSE_ICONST: /* handled by IFxx_ICONST */
- break;
-
- case ICMD_IFEQ_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPEQ(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPEQ(s1, REG_ZERO, d);
- M_XOR_IMM(d, 1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVEQ_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVEQ(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
- case ICMD_IFNE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if (iptr[1].opc == ICMD_ELSE_ICONST) {
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPEQ(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPEQ(s1, REG_ZERO, d);
- M_XOR_IMM(d, 1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVNE_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVNE(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
- case ICMD_IFLT_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPLT(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPLE(REG_ZERO, s1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVLT_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVLT(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
- case ICMD_IFGE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPLE(REG_ZERO, s1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPLT(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVGE_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVGE(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
- case ICMD_IFGT_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPLT(REG_ZERO, s1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPLE(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVGT_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVGT(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
- case ICMD_IFLE_ICONST: /* ..., value ==> ..., constant */
- /* val.i = constant */
-
- s1 = emit_load_s1(jd, iptr, src, REG_ITMP1);
- d = codegen_reg_of_var(rd, iptr->opc, iptr->dst, REG_ITMP2);
- s3 = iptr->val.i;
- if ((iptr[1].opc == ICMD_ELSE_ICONST)) {
- if ((s3 == 1) && (iptr[1].val.i == 0)) {
- M_CMPLE(s1, REG_ZERO, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if ((s3 == 0) && (iptr[1].val.i == 1)) {
- M_CMPLT(REG_ZERO, s1, d);
- emit_store(jd, iptr, iptr->dst, d);
- break;
- }
- if (s1 == d) {
- M_MOV(s1, REG_ITMP1);
- s1 = REG_ITMP1;
- }
- ICONST(d, iptr[1].val.i);
- }
- if ((s3 >= 0) && (s3 <= 255)) {
- M_CMOVLE_IMM(s1, s3, d);
- } else {
- ICONST(REG_ITMP3, s3);
- M_CMOVLE(s1, REG_ITMP3, d);
- }
- emit_store(jd, iptr, iptr->dst, d);
- break;
-
case ICMD_IRETURN: /* ..., retvalue ==> ... */
case ICMD_LRETURN:
#ifdef ENABLE_VERIFIER
if (iptr->val.a) {
- codegen_addpatchref(cd, PATCHER_athrow_areturn,
- (unresolved_class *) iptr->val.a, 0);
+ unresolved_class *uc = INSTRUCTION_UNRESOLVED_CLASS(iptr);
+
+ codegen_addpatchref(cd, PATCHER_resolve_class, uc, 0);
if (opt_showdisassemble)
M_NOP;
{
s4 i, p;
- p = stackframesize;
+ p = cd->stackframesize;
/* call trace function */
#if !defined(NDEBUG)
- if (opt_verbosecall) {
- M_LDA(REG_SP, REG_SP, -3 * 8);
- M_AST(REG_RA, REG_SP, 0 * 8);
- M_LST(REG_RESULT, REG_SP, 1 * 8);
- M_DST(REG_FRESULT, REG_SP, 2 * 8);
-
- disp = dseg_addaddress(cd, m);
- M_ALD(rd->argintregs[0], REG_PV, disp);
- M_MOV(REG_RESULT, rd->argintregs[1]);
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[2]);
- M_FLTMOVE(REG_FRESULT, rd->argfltregs[3]);
-
- disp = dseg_addaddress(cd, (void *) builtin_displaymethodstop);
- M_ALD(REG_PV, REG_PV, disp);
- M_JSR(REG_RA, REG_PV);
- disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, -disp);
-
- M_DLD(REG_FRESULT, REG_SP, 2 * 8);
- M_LLD(REG_RESULT, REG_SP, 1 * 8);
- M_ALD(REG_RA, REG_SP, 0 * 8);
- M_LDA(REG_SP, REG_SP, 3 * 8);
- }
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_exit(jd);
#endif
#if defined(ENABLE_THREADS)
break;
}
- disp = dseg_addaddress(cd, LOCK_monitor_exit);
+ disp = dseg_add_functionptr(cd, LOCK_monitor_exit);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = -(s4) (cd->mcodeptr - cd->mcodebase);
/* deallocate stack */
- if (stackframesize)
- M_LDA(REG_SP, REG_SP, stackframesize * 8);
+ if (cd->stackframesize)
+ M_LDA(REG_SP, REG_SP, cd->stackframesize * 8);
M_RET(REG_ZERO, REG_RA);
ALIGNCODENOP;
tptr += i;
while (--i >= 0) {
- dseg_addtarget(cd, (basicblock *) tptr[0]);
+ dseg_add_target(cd, (basicblock *) tptr[0]);
--tptr;
}
}
- /* length of dataseg after last dseg_addtarget is used by load */
+ /* length of dataseg after last dseg_add_target is used by load */
M_SAADDQ(REG_ITMP1, REG_PV, REG_ITMP2);
M_ALD(REG_ITMP2, REG_ITMP2, -(cd->dseglen));
if ((val >= -32768) && (val <= 32767)) {
M_LDA(REG_ITMP2, REG_ZERO, val);
} else {
- disp = dseg_adds4(cd, val);
+ disp = dseg_add_s4(cd, val);
M_ILD(REG_ITMP2, REG_PV, disp);
}
M_CMPEQ(s1, REG_ITMP2, REG_ITMP2);
switch (iptr->opc) {
case ICMD_BUILTIN:
- disp = dseg_addaddress(cd, bte->fp);
+ disp = dseg_add_functionptr(cd, bte->fp);
d = md->returntype.type;
M_ALD(REG_PV, REG_PV, disp); /* Pointer to built-in-function */
/* fall through */
case ICMD_INVOKESTATIC:
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
- disp = dseg_addaddress(cd, NULL);
+ disp = dseg_add_unique_address(cd, um);
codegen_addpatchref(cd, PATCHER_invokestatic_special,
um, disp);
M_NOP;
d = um->methodref->parseddesc.md->returntype.type;
-
- } else {
- disp = dseg_addaddress(cd, lm->stubroutine);
+ }
+ else {
+ disp = dseg_add_address(cd, lm->stubroutine);
d = lm->parseddesc->returntype.type;
}
case ICMD_INVOKEVIRTUAL:
gen_nullptr_check(rd->argintregs[0]);
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
codegen_addpatchref(cd, PATCHER_invokevirtual, um, 0);
s1 = 0;
d = um->methodref->parseddesc.md->returntype.type;
-
- } else {
+ }
+ else {
s1 = OFFSET(vftbl_t, table[0]) +
sizeof(methodptr) * lm->vftblindex;
d = lm->parseddesc->returntype.type;
case ICMD_INVOKEINTERFACE:
gen_nullptr_check(rd->argintregs[0]);
- if (!lm) {
+ if (lm == NULL) {
unresolved_method *um = INSTRUCTION_UNRESOLVED_METHOD(iptr);
codegen_addpatchref(cd, PATCHER_invokeinterface, um, 0);
s1 = 0;
s2 = 0;
d = um->methodref->parseddesc.md->returntype.type;
-
- } else {
+ }
+ else {
s1 = OFFSET(vftbl_t, interfacetable[0]) -
sizeof(methodptr*) * lm->class->index;
if (super == NULL) {
M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
- disp = dseg_adds4(cd, 0); /* super->flags */
+ disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
(constant_classref *) iptr->target,
disp);
M_NOP;
M_ILD(REG_ITMP2, REG_PV, disp);
- disp = dseg_adds4(cd, ACC_INTERFACE);
+ disp = dseg_add_s4(cd, ACC_INTERFACE);
M_ILD(REG_ITMP3, REG_PV, disp);
M_AND(REG_ITMP2, REG_ITMP3, REG_ITMP2);
M_BEQZ(REG_ITMP2, s2 + 1);
/* interface checkcast code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
- if (super != NULL) {
- M_BEQZ(s1, s2);
- }
- else {
+ if (super == NULL) {
codegen_addpatchref(cd,
PATCHER_checkcast_instanceof_interface,
(constant_classref *) iptr->target,
if (opt_showdisassemble)
M_NOP;
}
+ else
+ M_BEQZ(s1, s2);
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
M_ILD(REG_ITMP3, REG_ITMP2,
/* class checkcast code */
if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
- disp = dseg_addaddress(cd, supervftbl);
+ if (super == NULL) {
+ disp = dseg_add_unique_address(cd, NULL);
- if (super != NULL) {
- M_BEQZ(s1, s3);
- }
- else {
codegen_addpatchref(cd,
- PATCHER_checkcast_instanceof_class,
+ PATCHER_resolve_classref_to_vftbl,
(constant_classref *) iptr->target,
disp);
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ disp = dseg_add_address(cd, supervftbl);
+
+ M_BEQZ(s1, s3);
+ }
M_ALD(REG_ITMP2, s1, OFFSET(java_objectheader, vftbl));
M_ALD(REG_ITMP3, REG_PV, disp);
disp = dseg_addaddress(cd, iptr->val.a);
if (iptr->val.a == NULL) {
- codegen_addpatchref(cd, PATCHER_builtin_arraycheckcast,
+ codegen_addpatchref(cd,
+ PATCHER_resolve_classref_to_classinfo,
(constant_classref *) iptr->target,
disp);
M_CLR(d);
M_BEQZ(s1, 4 + (opt_showdisassemble ? 1 : 0) + s2 + 1 + s3);
- disp = dseg_adds4(cd, 0); /* super->flags */
+ disp = dseg_add_unique_s4(cd, 0); /* super->flags */
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_flags,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_flags,
(constant_classref *) iptr->target, disp);
if (opt_showdisassemble)
M_ILD(REG_ITMP3, REG_PV, disp);
- disp = dseg_adds4(cd, ACC_INTERFACE);
+ disp = dseg_add_s4(cd, ACC_INTERFACE);
M_ILD(REG_ITMP2, REG_PV, disp);
M_AND(REG_ITMP3, REG_ITMP2, REG_ITMP3);
M_BEQZ(REG_ITMP3, s2 + 1);
/* interface instanceof code */
if ((super == NULL) || (super->flags & ACC_INTERFACE)) {
- if (super != NULL) {
- M_CLR(d);
- M_BEQZ(s1, s2);
- }
- else {
+ if (super == NULL) {
/* If d == REG_ITMP2, then it's destroyed in check
code above. */
if (d == REG_ITMP2)
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ M_CLR(d);
+ M_BEQZ(s1, s2);
+ }
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_ILD(REG_ITMP3, REG_ITMP1, OFFSET(vftbl_t, interfacetablelength));
/* class instanceof code */
if ((super == NULL) || !(super->flags & ACC_INTERFACE)) {
- disp = dseg_addaddress(cd, supervftbl);
+ if (super == NULL) {
+ disp = dseg_add_unique_address(cd, NULL);
- if (super != NULL) {
- M_CLR(d);
- M_BEQZ(s1, s3);
- }
- else {
- codegen_addpatchref(cd, PATCHER_checkcast_instanceof_class,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_vftbl,
(constant_classref *) iptr->target,
disp);
if (opt_showdisassemble)
M_NOP;
}
+ else {
+ disp = dseg_add_address(cd, supervftbl);
+
+ M_CLR(d);
+ M_BEQZ(s1, s3);
+ }
M_ALD(REG_ITMP1, s1, OFFSET(java_objectheader, vftbl));
M_ALD(REG_ITMP2, REG_PV, disp);
/* is patcher function set? */
if (iptr->val.a == NULL) {
- disp = dseg_addaddress(cd, 0);
+ disp = dseg_add_unique_address(cd, 0);
- codegen_addpatchref(cd, PATCHER_builtin_multianewarray,
+ codegen_addpatchref(cd, PATCHER_resolve_classref_to_classinfo,
(constant_classref *) iptr->target,
disp);
if (opt_showdisassemble)
M_NOP;
-
- } else {
- disp = dseg_addaddress(cd, iptr->val.a);
}
+ else
+ disp = dseg_add_address(cd, iptr->val.a);
/* a1 = arraydescriptor */
M_INTMOVE(REG_SP, rd->argintregs[2]);
- disp = dseg_addaddress(cd, BUILTIN_multianewarray);
+ disp = dseg_add_functionptr(cd, BUILTIN_multianewarray);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
dseg_createlinenumbertable(cd);
+ /* generate stubs */
- /* generate exception and patcher stubs */
-
- {
- exceptionref *eref;
- patchref *pref;
- u4 mcode;
- u1 *savedmcodeptr;
- u1 *tmpmcodeptr;
-
- savedmcodeptr = NULL;
-
- /* generate exception stubs */
-
- for (eref = cd->exceptionrefs; eref != NULL; eref = eref->next) {
- gen_resolvebranch(cd->mcodebase + eref->branchpos,
- eref->branchpos, cd->mcodeptr - cd->mcodebase);
-
- MCODECHECK(100);
-
- /* move index register into REG_ITMP1 */
-
- /* Check if the exception is an
- ArrayIndexOutOfBoundsException. If so, move index register
- into a4. */
-
- if (eref->reg != -1)
- M_MOV(eref->reg, rd->argintregs[4]);
-
- /* calcuate exception address */
-
- M_LDA(rd->argintregs[3], REG_PV, eref->branchpos - 4);
-
- /* move function to call into REG_ITMP3 */
-
- disp = dseg_addaddress(cd, eref->function);
- M_ALD(REG_ITMP3, REG_PV, disp);
-
- if (savedmcodeptr != NULL) {
- disp = ((u4 *) savedmcodeptr) - (((u4 *) cd->mcodeptr) + 1);
- M_BR(disp);
-
- } else {
- savedmcodeptr = cd->mcodeptr;
-
- M_MOV(REG_PV, rd->argintregs[0]);
- M_MOV(REG_SP, rd->argintregs[1]);
-
- if (jd->isleafmethod)
- M_MOV(REG_RA, rd->argintregs[2]);
- else
- M_ALD(rd->argintregs[2],
- REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
-
- M_LDA(REG_SP, REG_SP, -2 * 8);
- M_AST(rd->argintregs[3], REG_SP, 0 * 8); /* store XPC */
-
- if (jd->isleafmethod)
- M_AST(REG_RA, REG_SP, 1 * 8);
-
- M_MOV(REG_ITMP3, REG_PV);
- M_JSR(REG_RA, REG_PV);
- disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, -disp);
-
- M_MOV(REG_RESULT, REG_ITMP1_XPTR);
-
- if (jd->isleafmethod)
- M_ALD(REG_RA, REG_SP, 1 * 8);
-
- M_ALD(REG_ITMP2_XPC, REG_SP, 0 * 8);
- M_LDA(REG_SP, REG_SP, 2 * 8);
-
- disp = dseg_addaddress(cd, asm_handle_exception);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_JMP(REG_ZERO, REG_ITMP3);
- }
- }
-
-
- /* generate code patching stub call code */
-
- for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* check code segment size */
-
- MCODECHECK(100);
-
- /* Get machine code which is patched back in later. The
- call is 1 instruction word long. */
-
- tmpmcodeptr = (u1 *) (cd->mcodebase + pref->branchpos);
-
- mcode = *((u4 *) tmpmcodeptr);
-
- /* Patch in the call to call the following code (done at
- compile time). */
-
- savedmcodeptr = cd->mcodeptr; /* save current mcodeptr */
- cd->mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
-
- disp = ((u4 *) savedmcodeptr) - (((u4 *) tmpmcodeptr) + 1);
- M_BSR(REG_ITMP3, disp);
-
- cd->mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
-
- /* create stack frame */
-
- M_LSUB_IMM(REG_SP, 6 * 8, REG_SP);
-
- /* move return address onto stack */
-
- M_AST(REG_ITMP3, REG_SP, 5 * 8);
-
- /* move pointer to java_objectheader onto stack */
-
-#if defined(ENABLE_THREADS)
- /* create a virtual java_objectheader */
-
- (void) dseg_addaddress(cd, NULL); /* flcword */
- (void) dseg_addaddress(cd, lock_get_initial_lock_word()); /* monitorPtr */
- disp = dseg_addaddress(cd, NULL); /* vftbl */
-
- M_LDA(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 4 * 8);
-#else
- /* do nothing */
-#endif
-
- /* move machine code onto stack */
-
- disp = dseg_adds4(cd, mcode);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 3 * 8);
-
- /* move class/method/field reference onto stack */
-
- disp = dseg_addaddress(cd, pref->ref);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 2 * 8);
-
- /* move data segment displacement onto stack */
-
- disp = dseg_adds4(cd, pref->disp);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 1 * 8);
-
- /* move patcher function pointer onto stack */
-
- disp = dseg_addaddress(cd, pref->patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 0 * 8);
-
- disp = dseg_addaddress(cd, asm_patcher_wrapper);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_JMP(REG_ZERO, REG_ITMP3);
- }
-
- /* generate replacement-out stubs */
-
- {
- int i;
-
- replacementpoint = jd->code->rplpoints;
-
- for (i = 0; i < jd->code->rplpointcount; ++i, ++replacementpoint) {
- /* check code segment size */
-
- MCODECHECK(100);
-
- /* note start of stub code */
-
- replacementpoint->outcode = (u1 *) (ptrint) (cd->mcodeptr - cd->mcodebase);
-
- /* make machine code for patching */
-
- savedmcodeptr = cd->mcodeptr;
- cd->mcodeptr = (u1 *) &(replacementpoint->mcode);
-
- disp = (ptrint)((s4*)replacementpoint->outcode - (s4*)replacementpoint->pc) - 1;
- M_BR(disp);
-
- cd->mcodeptr = savedmcodeptr;
-
- /* create stack frame - 16-byte aligned */
-
- M_LSUB_IMM(REG_SP, 2 * 8, REG_SP);
-
- /* push address of `rplpoint` struct */
-
- disp = dseg_addaddress(cd, replacementpoint);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 0 * 8);
-
- /* jump to replacement function */
-
- disp = dseg_addaddress(cd, asm_replacement_out);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_JMP(REG_ZERO, REG_ITMP3);
- }
- }
- }
+ emit_exception_stubs(jd);
+ emit_patcher_stubs(jd);
+ emit_replacement_stubs(jd);
codegen_finish(jd);
codeinfo *code;
codegendata *cd;
registerdata *rd;
- s4 stackframesize; /* size of stackframe if needed */
methoddesc *md;
s4 nativeparams;
s4 i, j; /* count variables */
/* calculate stack frame size */
- stackframesize =
+ cd->stackframesize =
1 + /* return address */
sizeof(stackframeinfo) / SIZEOF_VOID_P +
sizeof(localref_table) / SIZEOF_VOID_P +
/* create method header */
- (void) dseg_addaddress(cd, code); /* CodeinfoPointer */
- (void) dseg_adds4(cd, stackframesize * 8); /* FrameSize */
- (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, 0); /* IsLeaf */
- (void) dseg_adds4(cd, 0); /* IntSave */
- (void) dseg_adds4(cd, 0); /* FltSave */
+ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * 8); /* FrameSize */
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, 0); /* IntSave */
+ (void) dseg_add_unique_s4(cd, 0); /* FltSave */
(void) dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, 0); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
/* generate stub code */
- M_LDA(REG_SP, REG_SP, -stackframesize * 8);
- M_AST(REG_RA, REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
+ M_LDA(REG_SP, REG_SP, -(cd->stackframesize * 8));
+ M_AST(REG_RA, REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
/* call trace function */
#if !defined(NDEBUG)
- if (opt_verbosecall) {
- /* save integer argument registers */
-
- for (i = 0, j = 1; i < md->paramcount && i < INT_ARG_CNT; i++) {
- if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
- M_LST(rd->argintregs[i], REG_SP, j * 8);
- j++;
- }
- }
-
- /* save and copy float arguments into integer registers */
-
- for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
- t = md->paramtypes[i].type;
-
- if (IS_FLT_DBL_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- M_DST(rd->argfltregs[i], REG_SP, j * 8);
- M_LLD(rd->argintregs[i], REG_SP, j * 8);
- } else {
- M_FST(rd->argfltregs[i], REG_SP, j * 8);
- M_ILD(rd->argintregs[i], REG_SP, j * 8);
- }
- j++;
- }
- }
-
- disp = dseg_addaddress(cd, m);
- M_ALD(REG_ITMP1, REG_PV, disp);
- M_AST(REG_ITMP1, REG_SP, 0 * 8);
- disp = dseg_addaddress(cd, builtin_trace_args);
- M_ALD(REG_PV, REG_PV, disp);
- M_JSR(REG_RA, REG_PV);
- disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, -disp);
-
- for (i = 0, j = 1; i < md->paramcount && i < INT_ARG_CNT; i++) {
- if (IS_INT_LNG_TYPE(md->paramtypes[i].type)) {
- M_LLD(rd->argintregs[i], REG_SP, j * 8);
- j++;
- }
- }
-
- for (i = 0; i < md->paramcount && i < FLT_ARG_CNT; i++) {
- t = md->paramtypes[i].type;
-
- if (IS_FLT_DBL_TYPE(t)) {
- if (IS_2_WORD_TYPE(t)) {
- M_DLD(rd->argfltregs[i], REG_SP, j * 8);
- } else {
- M_FLD(rd->argfltregs[i], REG_SP, j * 8);
- }
- j++;
- }
- }
- }
-#endif /* !defined(NDEBUG) */
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_enter(jd);
+#endif
/* get function address (this must happen before the stackframeinfo) */
- funcdisp = dseg_addaddress(cd, f);
+ funcdisp = dseg_add_functionptr(cd, f);
#if !defined(WITH_STATIC_CLASSPATH)
if (f == NULL) {
- codegen_addpatchref(cd, PATCHER_resolve_native, m, funcdisp);
+ codegen_addpatchref(cd, PATCHER_resolve_native_function, m, funcdisp);
if (opt_showdisassemble)
M_NOP;
/* prepare data structures for native function call */
- M_LDA(rd->argintregs[0], REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
+ M_LDA(rd->argintregs[0], REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
M_MOV(REG_PV, rd->argintregs[1]);
- M_LDA(rd->argintregs[2], REG_SP, stackframesize * 8);
- M_ALD(rd->argintregs[3], REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
- disp = dseg_addaddress(cd, codegen_start_native_call);
+ M_LDA(rd->argintregs[2], REG_SP, cd->stackframesize * 8);
+ M_ALD(rd->argintregs[3], REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
+ disp = dseg_add_functionptr(cd, codegen_start_native_call);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
}
} else {
- s1 = md->params[i].regoff + stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize;
s2 = nmd->params[j].regoff;
M_LLD(REG_ITMP1, REG_SP, s1 * 8);
M_LST(REG_ITMP1, REG_SP, s2 * 8);
}
} else {
- s1 = md->params[i].regoff + stackframesize;
+ s1 = md->params[i].regoff + cd->stackframesize;
s2 = nmd->params[j].regoff;
M_DLD(REG_FTMP1, REG_SP, s1 * 8);
if (IS_2_WORD_TYPE(t))
/* put class into second argument register */
if (m->flags & ACC_STATIC) {
- disp = dseg_addaddress(cd, m->class);
+ disp = dseg_add_address(cd, m->class);
M_ALD(rd->argintregs[1], REG_PV, disp);
}
/* put env into first argument register */
- disp = dseg_addaddress(cd, _Jv_env);
+ disp = dseg_add_address(cd, _Jv_env);
M_ALD(rd->argintregs[0], REG_PV, disp);
/* do the native function call */
/* call finished trace */
#if !defined(NDEBUG)
- if (opt_verbosecall) {
- /* just restore the value we need, don't care about the other */
-
- if (md->returntype.type != TYPE_VOID) {
- if (IS_INT_LNG_TYPE(md->returntype.type))
- M_LLD(REG_RESULT, REG_SP, 0 * 8);
- else
- M_DLD(REG_FRESULT, REG_SP, 0 * 8);
- }
-
- disp = dseg_addaddress(cd, m);
- M_ALD(rd->argintregs[0], REG_PV, disp);
-
- M_MOV(REG_RESULT, rd->argintregs[1]);
- M_FMOV(REG_FRESULT, rd->argfltregs[2]);
- M_FMOV(REG_FRESULT, rd->argfltregs[3]);
-
- disp = dseg_addaddress(cd, builtin_displaymethodstop);
- M_ALD(REG_PV, REG_PV, disp);
- M_JSR(REG_RA, REG_PV);
- disp = (s4) (cd->mcodeptr - cd->mcodebase);
- M_LDA(REG_PV, REG_RA, -disp);
- }
-#endif /* !defined(NDEBUG) */
+ if (JITDATA_HAS_FLAG_VERBOSECALL(jd))
+ emit_verbosecall_exit(jd);
+#endif
/* remove native stackframe info */
- M_LDA(rd->argintregs[0], REG_SP, stackframesize * 8 - SIZEOF_VOID_P);
- disp = dseg_addaddress(cd, codegen_finish_native_call);
+ M_LDA(rd->argintregs[0], REG_SP, cd->stackframesize * 8 - SIZEOF_VOID_P);
+ disp = dseg_add_functionptr(cd, codegen_finish_native_call);
M_ALD(REG_PV, REG_PV, disp);
M_JSR(REG_RA, REG_PV);
disp = (s4) (cd->mcodeptr - cd->mcodebase);
M_DLD(REG_FRESULT, REG_SP, 0 * 8);
}
- M_ALD(REG_RA, REG_SP, (stackframesize - 1) * 8); /* load return address */
- M_LDA(REG_SP, REG_SP, stackframesize * 8);
+ M_ALD(REG_RA, REG_SP, (cd->stackframesize - 1) * 8); /* get RA */
+ M_LDA(REG_SP, REG_SP, cd->stackframesize * 8);
/* check for exception */
M_ASUB_IMM(REG_RA, 4, REG_ITMP2_XPC); /* get exception address */
- disp = dseg_addaddress(cd, asm_handle_nat_exception);
+ disp = dseg_add_functionptr(cd, asm_handle_nat_exception);
M_ALD(REG_ITMP3, REG_PV, disp); /* load asm exception handler address */
M_JMP(REG_ZERO, REG_ITMP3); /* jump to asm exception handler */
- /* process patcher calls **************************************************/
-
- {
- patchref *pref;
- u4 mcode;
- u1 *savedmcodeptr;
- u1 *tmpmcodeptr;
-
- /* there can only be one <clinit> ref entry */
-
- pref = cd->patchrefs;
-
- for (pref = cd->patchrefs; pref != NULL; pref = pref->next) {
- /* Get machine code which is patched back in later. The
- call is 1 instruction word long. */
-
- tmpmcodeptr = (u1 *) (cd->mcodebase + pref->branchpos);
-
- mcode = *((u4 *) tmpmcodeptr);
-
- /* Patch in the call to call the following code (done at
- compile time). */
+ /* generate patcher stubs */
- savedmcodeptr = cd->mcodeptr; /* save current mcodeptr */
- cd->mcodeptr = tmpmcodeptr; /* set mcodeptr to patch position */
-
- disp = ((u4 *) savedmcodeptr) - (((u4 *) tmpmcodeptr) + 1);
- M_BSR(REG_ITMP3, disp);
-
- cd->mcodeptr = savedmcodeptr; /* restore the current mcodeptr */
-
- /* create stack frame */
-
- M_LSUB_IMM(REG_SP, 6 * 8, REG_SP);
-
- /* move return address onto stack */
-
- M_AST(REG_ITMP3, REG_SP, 5 * 8);
-
- /* move pointer to java_objectheader onto stack */
-
-#if defined(ENABLE_THREADS)
- /* create a virtual java_objectheader */
-
- (void) dseg_addaddress(cd, NULL); /* flcword */
- (void) dseg_addaddress(cd, lock_get_initial_lock_word()); /* monitorPtr */
- disp = dseg_addaddress(cd, NULL); /* vftbl */
-
- M_LDA(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 4 * 8);
-#else
- M_AST(REG_ZERO, REG_SP, 4 * 8);
-#endif
-
- /* move machine code onto stack */
-
- disp = dseg_adds4(cd, mcode);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 3 * 8);
-
- /* move class/method/field reference onto stack */
-
- disp = dseg_addaddress(cd, pref->ref);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 2 * 8);
-
- /* move data segment displacement onto stack */
-
- disp = dseg_adds4(cd, pref->disp);
- M_ILD(REG_ITMP3, REG_PV, disp);
- M_IST(REG_ITMP3, REG_SP, 1 * 8);
-
- /* move patcher function pointer onto stack */
-
- disp = dseg_addaddress(cd, pref->patcher);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_AST(REG_ITMP3, REG_SP, 0 * 8);
-
- disp = dseg_addaddress(cd, asm_patcher_wrapper);
- M_ALD(REG_ITMP3, REG_PV, disp);
- M_JMP(REG_ZERO, REG_ITMP3);
- }
- }
+ emit_patcher_stubs(jd);
codegen_finish(jd);
projects / cacao.git / blobdiff