s390_ldr (code, ins->dreg, ins->sreg1); \
}
-#define MONO_EMIT_NEW_MOVE2(cfg,dest,offset,src,imm,size) do { \
+#define MONO_EMIT_NEW_MOVE(cfg,dest,offset,src,imm,size) do { \
MonoInst *inst; \
int tmpr = 0; \
int sReg, dReg; \
MONO_ADD_INS (cfg->cbb, inst); \
} while (0)
-#define MONO_OUTPUT_VTR2(cfg, size, dr, sr, so) do { \
+#define MONO_OUTPUT_VTR(cfg, size, dr, sr, so) do { \
int reg = mono_alloc_preg (cfg); \
switch (size) { \
case 0: \
} \
} while (0)
-#define MONO_OUTPUT_VTS2(cfg, size, dr, dx, sr, so) do { \
+#define MONO_OUTPUT_VTS(cfg, size, dr, dx, sr, so) do { \
int tmpr; \
switch (size) { \
case 0: \
break; \
case 4: \
case 8: \
- MONO_EMIT_NEW_MOVE2 (cfg, dr, dx, sr, so, size); \
+ MONO_EMIT_NEW_MOVE (cfg, dr, dx, sr, so, size); \
break; \
} \
} while (0)
#include <mono/utils/mono-math.h>
#include "mini-s390.h"
-#include "inssel.h"
#include "cpu-s390.h"
#include "jit-icalls.h"
+#include "ir-emit.h"
/*========================= End of Includes ========================*/
static guchar * emit_float_to_int (MonoCompile *, guchar *, int, int, int, gboolean);
gpointer mono_arch_get_lmf_addr (void);
static guint8 * emit_load_volatile_registers(guint8 *, MonoCompile *);
-static void emit_sig_cookie (MonoCompile *, MonoCallInst *, CallInfo *, int);
+static void emit_sig_cookie (MonoCompile *, MonoCallInst *, CallInfo *);
/*========================= End of Prototypes ======================*/
MonoMarshalType *info;
if (type->data.klass->enumtype) {
- simpleType = type->data.klass->enum_basetype->type;
+ simpleType = mono_class_enum_basetype (type->data.klass)->type;
printf("{VALUETYPE} - ");
goto enum_parmtype;
}
case MONO_TYPE_VALUETYPE: {
MonoMarshalType *info;
if (type->data.klass->enumtype) {
- type = type->data.klass->enum_basetype;
+ type = mono_class_enum_basetype (type->data.klass);
goto handle_enum;
} else {
guint8 *p = va_arg (ap, gpointer);
return FALSE;
case MONO_TYPE_VALUETYPE:
if (t->data.klass->enumtype)
- return is_regsize_var (t->data.klass->enum_basetype);
+ return is_regsize_var (mono_class_enum_basetype (t->data.klass));
return FALSE;
}
return FALSE;
case MONO_TYPE_VALUETYPE: {
MonoClass *klass = mono_class_from_mono_type (sig->ret);
if (klass->enumtype) {
- simpletype = klass->enum_basetype->type;
+ simpletype = mono_class_enum_basetype (klass)->type;
goto enum_retvalue;
}
if (sig->pinvoke)
cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
- if (cinfo->struct_ret) {
- if (!cfg->new_ir) {
- cfg->vret_addr->opcode = OP_REGVAR;
- cfg->vret_addr->inst_c0 = s390_r2;
- }
- } else {
+ if (!cinfo->struct_ret) {
switch (mono_type_get_underlying_type (sig->ret)->type) {
case MONO_TYPE_VOID:
break;
inst->opcode = OP_REGOFFSET;
inst->inst_basereg = frame_reg;
offset += sizeof(gpointer);
- if (!cfg->new_ir && (sig->call_convention == MONO_CALL_VARARG) &&
- (!retFitsInReg (cinfo->ret.size)))
- cfg->sig_cookie += cinfo->ret.size;
if (G_UNLIKELY (cfg->verbose_level > 1)) {
printf ("vret_addr =");
mono_print_ins (cfg->vret_addr);
inst = cfg->args [curinst];
if (inst->opcode != OP_REGVAR) {
switch (cinfo->args[iParm].regtype) {
- case RegTypeStructByAddr :
- if (cfg->new_ir) {
- MonoInst *indir;
-
- size = sizeof (gpointer);
-
- if (cinfo->args [iParm].reg == STK_BASE) {
- cfg->arch.bkchain_reg = s390_r12;
- cfg->used_int_regs |= 1 << cfg->arch.bkchain_reg;
-
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = cfg->arch.bkchain_reg;
- inst->inst_offset = cinfo->args [iParm].offset;
- } else {
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = frame_reg;
- inst->inst_offset = S390_ALIGN(offset, sizeof (gpointer));
- }
-
- /* Add a level of indirection */
- MONO_INST_NEW (cfg, indir, 0);
- *indir = *inst;
- inst->opcode = OP_VTARG_ADDR;
- inst->inst_left = indir;
+ case RegTypeStructByAddr : {
+ MonoInst *indir;
+
+ size = sizeof (gpointer);
+
+ if (cinfo->args [iParm].reg == STK_BASE) {
+ cfg->arch.bkchain_reg = s390_r12;
+ cfg->used_int_regs |= 1 << cfg->arch.bkchain_reg;
+
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = cfg->arch.bkchain_reg;
+ inst->inst_offset = cinfo->args [iParm].offset;
} else {
- if (cinfo->args[iParm].reg == STK_BASE) {
- inst->opcode = OP_S390_LOADARG;
- inst->inst_basereg = frame_reg;
- size = abs(cinfo->args[iParm].vtsize);
- offset = S390_ALIGN(offset, sizeof(long));
- inst->inst_offset = offset;
- inst->backend.arg_info = cinfo->args[iParm].offset;
- } else {
- inst->opcode = OP_S390_ARGREG;
- inst->inst_basereg = frame_reg;
- size = sizeof(gpointer);
- offset = S390_ALIGN(offset, size);
- inst->inst_offset = offset;
- inst->backend.arg_info = cinfo->args[iParm].offset;
- }
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = frame_reg;
+ inst->inst_offset = S390_ALIGN(offset, sizeof (gpointer));
}
+
+ /* Add a level of indirection */
+ MONO_INST_NEW (cfg, indir, 0);
+ *indir = *inst;
+ inst->opcode = OP_VTARG_ADDR;
+ inst->inst_left = indir;
+ }
break;
case RegTypeStructByVal :
- if (cfg->new_ir) {
- size = cinfo->args[iParm].size;
- offset = S390_ALIGN(offset, size);
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = frame_reg;
- inst->inst_offset = S390_ALIGN (offset, size);
+ size = cinfo->args[iParm].size;
+ offset = S390_ALIGN(offset, size);
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = frame_reg;
+ inst->inst_offset = S390_ALIGN (offset, size);
+ break;
+ default :
+ if (cinfo->args [iParm].reg == STK_BASE) {
+ /*
+ * These arguments are in the previous frame, so we can't
+ * compute their offset from the current frame pointer right
+ * now, since cfg->stack_offset is not yet known, so dedicate a
+ * register holding the previous frame pointer.
+ */
+ cfg->arch.bkchain_reg = s390_r12;
+ cfg->used_int_regs |= 1 << cfg->arch.bkchain_reg;
+
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = cfg->arch.bkchain_reg;
+ size = (cinfo->args[iParm].size < 4
+ ? 4 - cinfo->args[iParm].size
+ : 0);
+ inst->inst_offset = cinfo->args [iParm].offset + size;
+ size = sizeof (long);
} else {
- inst->opcode = OP_S390_ARGPTR;
+ inst->opcode = OP_REGOFFSET;
inst->inst_basereg = frame_reg;
- size = cinfo->args[iParm].size;
+ size = (cinfo->args[iParm].size < 8
+ ? sizeof(long)
+ : sizeof(long long));
offset = S390_ALIGN(offset, size);
inst->inst_offset = offset;
- inst->backend.arg_info = cinfo->args[iParm].offset;
}
- break;
- default :
- if (cfg->new_ir) {
- if (cinfo->args [iParm].reg == STK_BASE) {
- /*
- * These arguments are in the previous frame, so we can't
- * compute their offset from the current frame pointer right
- * now, since cfg->stack_offset is not yet known, so dedicate a
- * register holding the previous frame pointer.
- */
- cfg->arch.bkchain_reg = s390_r12;
- cfg->used_int_regs |= 1 << cfg->arch.bkchain_reg;
-
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = cfg->arch.bkchain_reg;
- size = (cinfo->args[iParm].size < 4
- ? 4 - cinfo->args[iParm].size
- : 0);
- inst->inst_offset = cinfo->args [iParm].offset + size;
- size = sizeof (long);
- } else {
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = frame_reg;
- size = (cinfo->args[iParm].size < 8
- ? sizeof(long)
- : sizeof(long long));
- offset = S390_ALIGN(offset, size);
- inst->inst_offset = offset;
- }
- } else {
- if (cinfo->args[iParm].reg != STK_BASE) {
- inst->opcode = OP_REGOFFSET;
- inst->inst_basereg = frame_reg;
- size = (cinfo->args[iParm].size < 8
- ? sizeof(long)
- : sizeof(long long));
- offset = S390_ALIGN(offset, size);
- inst->inst_offset = offset;
- } else {
- inst->opcode = OP_S390_STKARG;
- inst->inst_basereg = frame_reg;
- size = (cinfo->args[iParm].size < 4
- ? 4 - cinfo->args[iParm].size
- : 0);
- inst->inst_offset = cinfo->args[iParm].offset +
- size;
- inst->backend.arg_info = 0;
- size = sizeof(long);
- }
- }
}
if ((sig->call_convention == MONO_CALL_VARARG) &&
(cinfo->args[iParm].regtype != RegTypeGeneral) &&
cfg->stack_offset = S390_ALIGN(offset, S390_STACK_ALIGNMENT);
/* Fix up offsets for arguments whose value is in the parent frame */
- if (cfg->new_ir) {
- for (iParm = sArg; iParm < eArg; ++iParm) {
- inst = cfg->args [iParm];
+ for (iParm = sArg; iParm < eArg; ++iParm) {
+ inst = cfg->args [iParm];
- if (inst->opcode == OP_S390_STKARG) {
- inst->opcode = OP_REGOFFSET;
- inst->inst_offset += cfg->stack_offset;
- }
+ if (inst->opcode == OP_S390_STKARG) {
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_offset += cfg->stack_offset;
}
}
}
}
static void
-emit_sig_cookie2 (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
+emit_sig_cookie (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
{
MonoMethodSignature *tmpSig;
MonoInst *sig_arg;
if ((sig->call_convention == MONO_CALL_VARARG) &&
(i == sig->sentinelpos)) {
- emit_sig_cookie2 (cfg, call, cinfo);
+ emit_sig_cookie (cfg, call, cinfo);
}
switch (ainfo->regtype) {
*/
if ((sig->call_convention == MONO_CALL_VARARG) &&
(i == sig->sentinelpos)) {
- emit_sig_cookie2 (cfg, call, cinfo);
+ emit_sig_cookie (cfg, call, cinfo);
}
}
arg->offPrm = ainfo->offparm + cinfo->sz.offStruct;
*/
if (ainfo->reg != STK_BASE) {
- MONO_OUTPUT_VTR2 (cfg, size, ainfo->reg, src->dreg, 0);
+ MONO_OUTPUT_VTR (cfg, size, ainfo->reg, src->dreg, 0);
} else {
- MONO_OUTPUT_VTS2 (cfg, size, ainfo->reg, ainfo->offset,
+ MONO_OUTPUT_VTS (cfg, size, ainfo->reg, ainfo->offset,
src->dreg, 0);
}
} else if (ainfo->regtype == RegTypeStructByValInFP) {
mono_call_inst_add_outarg_reg (cfg, call, dreg, ainfo->reg, TRUE);
} else {
- MONO_EMIT_NEW_MOVE2 (cfg, STK_BASE, ainfo->offparm,
+ MONO_EMIT_NEW_MOVE (cfg, STK_BASE, ainfo->offparm,
src->dreg, 0, size);
}
}
MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->ret->dreg, val->dreg);
}
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - emit_sig_cookie. */
-/* */
-/* Function - For variable length parameter lists construct a */
-/* signature cookie and emit it. */
-/* */
-/*------------------------------------------------------------------*/
-
-static void
-emit_sig_cookie (MonoCompile *cfg, MonoCallInst *call,
- CallInfo *cinfo, int argSize)
-{
- MonoCallArgParm *arg;
- MonoMethodSignature *tmpSig;
- MonoInst *sigArg;
-
- cfg->disable_aot = TRUE;
-
- /*----------------------------------------------------------*/
- /* mono_ArgIterator_Setup assumes the signature cookie is */
- /* passed first and all the arguments which were before it */
- /* passed on the stack after the signature. So compensate */
- /* by passing a different signature. */
- /*----------------------------------------------------------*/
- tmpSig = mono_metadata_signature_dup (call->signature);
- tmpSig->param_count -= call->signature->sentinelpos;
- tmpSig->sentinelpos = 0;
- if (tmpSig->param_count > 0)
- memcpy (tmpSig->params,
- call->signature->params + call->signature->sentinelpos,
- tmpSig->param_count * sizeof(MonoType *));
-
- MONO_INST_NEW (cfg, sigArg, OP_ICONST);
- sigArg->inst_p0 = tmpSig;
-
- MONO_INST_NEW_CALL_ARG (cfg, arg, OP_OUTARG_MEMBASE);
- arg->ins.inst_left = sigArg;
- arg->ins.inst_right = (MonoInst *) call;
- arg->size = argSize;
- arg->offset = cinfo->sigCookie.offset;
- arg->ins.next = call->out_args;
- call->out_args = (MonoInst *) arg;
-}
-
/*========================= End of Function ========================*/
/*------------------------------------------------------------------*/
break;
case MONO_TYPE_VALUETYPE:
if (mono_method_signature (method)->ret->data.klass->enumtype) {
- rtype = mono_method_signature (method)->ret->data.klass->enum_basetype->type;
+ rtype = mono_class_enum_basetype (mono_method_signature (method)->ret->data.klass)->type;
goto handle_enum;
}
save_mode = SAVE_STRUCT;
{
MonoInst *ins, *next;
- if (bb->max_vreg > cfg->rs->next_vreg)
- cfg->rs->next_vreg = bb->max_vreg;
-
MONO_BB_FOR_EACH_INS_SAFE (bb, next, ins) {
switch (ins->opcode) {
case OP_DIV_IMM:
break;
}
}
+
+ bb->max_vreg = cfg->next_vreg;
}
/*========================= End of Function ========================*/
s390_ldebr (code, s390_f0, s390_f0);
}
break;
- case OP_OUTARG:
- g_assert_not_reached ();
- break;
case OP_LOCALLOC: {
/*------------------------------------------*/
/* To allocate space on the stack we have */
projects / mono.git / blobdiff