/* D e f i n e s */
/*------------------------------------------------------------------*/
-#define NOT_IMPLEMENTED(x) \
- g_error ("FIXME: %s is not yet implemented. (trampoline)", x);
-
#define EMIT_COND_BRANCH(ins,cond) \
{ \
if (ins->flags & MONO_INST_BRLABEL) { \
if (ins->inst_i0->inst_c0) { \
int displace; \
displace = ((cfg->native_code + ins->inst_i0->inst_c0) - code) / 2; \
- if (s390_is_uimm16(displace)) { \
+ if (s390_is_imm16(displace)) { \
s390_brc (code, cond, displace); \
} else { \
s390_jcl (code, cond, displace); \
int displace; \
displace = ((cfg->native_code + \
ins->inst_true_bb->native_offset) - code) / 2; \
- if (s390_is_uimm16(displace)) { \
+ if (s390_is_imm16(displace)) { \
s390_brc (code, cond, displace); \
} else { \
s390_jcl (code, cond, displace); \
if (ins->inst_i0->inst_c0) { \
int displace; \
displace = ((cfg->native_code + ins->inst_i0->inst_c0) - code) / 2; \
- if (s390_is_uimm16(displace)) { \
+ if (s390_is_imm16(displace)) { \
s390_brc (code, S390_CC_UN, displace); \
} else { \
s390_jcl (code, S390_CC_UN, displace); \
int displace; \
displace = ((cfg->native_code + \
ins->inst_target_bb->native_offset) - code) / 2; \
- if (s390_is_uimm16(displace)) { \
+ if (s390_is_imm16(displace)) { \
s390_brc (code, S390_CC_UN, displace); \
} else { \
s390_jcl (code, S390_CC_UN, displace); \
s390_jcl (code, cond, 0); \
} while (0);
+#define CHECK_SRCDST_COM \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = ins->sreg1; \
+ } else { \
+ src2 = ins->sreg2; \
+ if (ins->dreg != ins->sreg1) { \
+ s390_lgr (code, ins->dreg, ins->sreg1); \
+ } \
+ }
+
+#define CHECK_SRCDST_NCOM \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = s390_r13; \
+ s390_lgr (code, s390_r13, ins->sreg2); \
+ } else { \
+ src2 = ins->sreg2; \
+ } \
+ if (ins->dreg != ins->sreg1) { \
+ s390_lgr (code, ins->dreg, ins->sreg1); \
+ }
+
+#define CHECK_SRCDST_COM_I \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = ins->sreg1; \
+ } else { \
+ src2 = ins->sreg2; \
+ if (ins->dreg != ins->sreg1) { \
+ s390_lgfr (code, ins->dreg, ins->sreg1); \
+ } \
+ }
+
+#define CHECK_SRCDST_NCOM_I \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = s390_r13; \
+ s390_lgfr (code, s390_r13, ins->sreg2); \
+ } else { \
+ src2 = ins->sreg2; \
+ } \
+ if (ins->dreg != ins->sreg1) { \
+ s390_lgfr (code, ins->dreg, ins->sreg1); \
+ }
+
+#define CHECK_SRCDST_COM_F \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = ins->sreg1; \
+ } else { \
+ src2 = ins->sreg2; \
+ if (ins->dreg != ins->sreg1) { \
+ s390_ldr (code, ins->dreg, ins->sreg1); \
+ } \
+ }
+
+#define CHECK_SRCDST_NCOM_F \
+ if (ins->dreg == ins->sreg2) { \
+ src2 = s390_f15; \
+ s390_ldr (code, s390_r13, ins->sreg2); \
+ } else { \
+ src2 = ins->sreg2; \
+ } \
+ if (ins->dreg != ins->sreg1) { \
+ s390_ldr (code, ins->dreg, ins->sreg1); \
+ }
+
+#define MONO_EMIT_NEW_MOVE2(cfg,dest,offset,src,imm,size) do { \
+ MonoInst *inst; \
+ int tmpr = 0; \
+ int sReg, dReg; \
+ MONO_INST_NEW (cfg, inst, OP_NOP); \
+ if (size > 256) { \
+ tmpr = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_ICONST(cfg,tmpr,size); \
+ inst->dreg = dest; \
+ inst->inst_offset = offset; \
+ inst->sreg1 = src; \
+ inst->inst_imm = imm; \
+ inst->sreg2 = tmpr; \
+ } else { \
+ if (s390_is_uimm12(offset)) { \
+ inst->dreg = dest; \
+ inst->inst_offset = offset; \
+ } else { \
+ dReg = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_BIALU_IMM(cfg, OP_ADD_IMM, \
+ dReg, dest, offset); \
+ inst->dreg = dReg; \
+ inst->inst_offset = 0; \
+ } \
+ if (s390_is_uimm12(imm)) { \
+ inst->sreg1 = src; \
+ inst->inst_imm = imm; \
+ } else { \
+ sReg = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_BIALU_IMM(cfg, OP_ADD_IMM, \
+ sReg, src, imm); \
+ inst->sreg1 = sReg; \
+ inst->inst_imm = 0; \
+ } \
+ } \
+ inst->opcode = OP_S390_MOVE; \
+ inst->backend.size = size; \
+ MONO_ADD_INS (cfg->cbb, inst); \
+ } while (0)
+
+#define MONO_OUTPUT_VTR2(cfg, size, dr, sr, so) do { \
+ int reg = mono_alloc_preg (cfg); \
+ switch (size) { \
+ case 0: \
+ MONO_EMIT_NEW_ICONST(cfg, reg, 0); \
+ break; \
+ case 1: \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU1_MEMBASE, \
+ reg, sr, so); \
+ break; \
+ case 2: \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU2_MEMBASE, \
+ reg, sr, so); \
+ break; \
+ case 4: \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADI4_MEMBASE, \
+ reg, sr, so); \
+ break; \
+ case 8: \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADI8_MEMBASE, \
+ reg, sr, so); \
+ break; \
+ } \
+ mono_call_inst_add_outarg_reg(cfg, call, reg, dr, FALSE); \
+} while (0)
+
+#define MONO_OUTPUT_VTS2(cfg, size, dr, dx, sr, so) do { \
+ int tmpr; \
+ switch (size) { \
+ case 0: \
+ tmpr = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_ICONST(cfg, tmpr, 0); \
+ MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG, \
+ dr, dx, tmpr); \
+ break; \
+ case 1: \
+ tmpr = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU1_MEMBASE, \
+ tmpr, sr, so); \
+ MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG, \
+ dr, dx, tmpr); \
+ break; \
+ case 2: \
+ tmpr = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU2_MEMBASE, \
+ tmpr, sr, so); \
+ MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG, \
+ dr, dx, tmpr); \
+ break; \
+ case 4: \
+ tmpr = mono_alloc_preg (cfg); \
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADI4_MEMBASE, \
+ tmpr, sr, so); \
+ MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG, \
+ dr, dx, tmpr); \
+ break; \
+ case 8: \
+ MONO_EMIT_NEW_MOVE2 (cfg, dr, dx, sr, so, size); \
+ break; \
+ } \
+} while (0)
+
#undef DEBUG
#define DEBUG(a) if (cfg->verbose_level > 1) a
-#define reg_is_freeable(r) ((r) >= 3 && (r) <= 10)
-#define freg_is_freeable(r) ((r) >= 1 && (r) <= 14)
-/*----------------------------------------*/
-/* use s390_r3-s390_r10 as temp registers */
-/*----------------------------------------*/
-#define S390_CALLER_REGS (0x03f8)
+#define MAX_EXC 16
-/*----------------------------------------*/
-/* use s390_f2-s390_f14 as temp registers */
-/*----------------------------------------*/
-#define S390_CALLER_FREGS (0x73f8)
+#define S390_TRACE_STACK_SIZE (5*sizeof(gpointer)+4*sizeof(gdouble))
-#define S390_TRACE_STACK_SIZE (5*sizeof(gint64)+3*sizeof(gdouble))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
/*========================= End of Defines =========================*/
#include "mini-s390x.h"
#include "inssel.h"
#include "cpu-s390x.h"
+#include "jit-icalls.h"
/*========================= End of Includes ========================*/
guint stack_size,
local_size,
code_size,
+ parm_size,
+ offset,
+ offStruct,
retStruct;
} size_data;
SAVE_STRUCT,
SAVE_ONE,
SAVE_TWO,
- SAVE_FP
+ SAVE_R4,
+ SAVE_R8
};
-typedef struct {
- int born_in;
- int killed_in;
- int last_use;
- int prev_use;
-} RegTrack;
-
typedef struct InstList InstList;
struct InstList {
MonoInst *data;
};
-enum {
+typedef enum {
RegTypeGeneral,
RegTypeBase,
RegTypeFP,
+ RegTypeFPR4,
RegTypeStructByVal,
+ RegTypeStructByValInFP,
RegTypeStructByAddr
-};
+} ArgStorage;
typedef struct {
gint32 offset; /* offset from caller's stack */
- gint32 offparm; /* offset on callee's stack */
+ gint32 offparm; /* offset from callee's stack */
guint16 vtsize; /* in param area */
guint8 reg;
- guint8 regtype; /* See RegType* */
+ ArgStorage regtype;
guint32 size; /* Size of structure used by RegTypeStructByVal */
+ gint32 type; /* Data type of argument */
} ArgInfo;
typedef struct {
int nargs;
+ int lastgr;
guint32 stack_usage;
guint32 struct_ret;
ArgInfo ret;
+ ArgInfo sigCookie;
+ size_data sz;
ArgInfo args [1];
} CallInfo;
/* P r o t o t y p e s */
/*------------------------------------------------------------------*/
-static guint8 * emit_memcpy (guint8 *, int, int, int, int, int);
static void indent (int);
-static guint8 * restoreLMF(MonoCompile *, guint8 *);
static guint8 * backUpStackPtr(MonoCompile *, guint8 *);
static void decodeParm (MonoType *, void *, int);
static void enter_method (MonoMethod *, RegParm *, char *);
static void leave_method (MonoMethod *, ...);
static gboolean is_regsize_var (MonoType *);
-static void add_general (guint *, size_data *, ArgInfo *);
-static CallInfo * calculate_sizes (MonoMethodSignature *, size_data *, gboolean);
-static void peephole_pass (MonoCompile *, MonoBasicBlock *);
-static int mono_spillvar_offset (MonoCompile *, int);
-static int mono_spillvar_offset_float (MonoCompile *, int);
-static void print_ins (int, MonoInst *);
-static void print_regtrack (RegTrack *, int);
-static InstList * inst_list_prepend (MonoMemPool *, InstList *, MonoInst *);
-static int get_register_force_spilling (MonoCompile *, InstList *, MonoInst *, int);
-static int get_register_spilling (MonoCompile *, InstList *, MonoInst *, guint32, int);
-static int get_float_register_spilling (MonoCompile *, InstList *, MonoInst *, guint32, int);
-static MonoInst * create_copy_ins (MonoCompile *, int, int, MonoInst *);
-static MonoInst * create_copy_ins_float (MonoCompile *, int, int, MonoInst *);
-static MonoInst * create_spilled_store (MonoCompile *, int, int, int, MonoInst *);
-static MonoInst * create_spilled_store_float (MonoCompile *, int, int, int, MonoInst *);
-static void insert_before_ins (MonoInst *, InstList *, MonoInst *);
-static int alloc_int_reg (MonoCompile *, InstList *, MonoInst *, int, guint32);
+static inline void add_general (guint *, size_data *, ArgInfo *);
+static inline void add_stackParm (guint *, size_data *, ArgInfo *, gint);
+static inline void add_float (guint *, size_data *, ArgInfo *);
+static CallInfo * get_call_info (MonoCompile *, MonoMemPool *, MonoMethodSignature *, gboolean);
static guchar * emit_float_to_int (MonoCompile *, guchar *, int, int, int, gboolean);
-static unsigned char * mono_emit_stack_alloc (guchar *, MonoInst *);
+gpointer mono_arch_get_lmf_addr (void);
+static guint8 * emit_load_volatile_arguments (guint8 *, MonoCompile *);
+static void catch_SIGILL(int, siginfo_t *, void *);
+static void emit_sig_cookie (MonoCompile *, MonoCallInst *, CallInfo *, int);
/*========================= End of Prototypes ======================*/
static int indent_level = 0;
-static const char*const * ins_spec = s390x;
+int has_ld = 0;
+
+static gboolean tls_offset_inited = FALSE;
+
+static int appdomain_tls_offset = -1,
+ thread_tls_offset = -1;
+
+pthread_key_t lmf_addr_key;
+
+gboolean lmf_addr_key_inited = FALSE;
+
+#if 0
+
+extern __thread MonoDomain *tls_appdomain;
+extern __thread MonoThread *tls_current_object;
+extern __thread gpointer mono_lmf_addr;
+
+#endif
/*====================== End of Global Variables ===================*/
"s390_r10", "s390_r11", "s390_r12", "s390_r13", "s390_r14",
"s390_r15"
};
+
if (reg >= 0 && reg < 16)
return rnames [reg];
- return "unknown";
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - mono_arch_is_inst_imm */
-/* */
-/* Function - Determine whether an instruction qualifies as an */
-/* immediate. */
-/* */
-/*------------------------------------------------------------------*/
-
-gboolean
-mono_arch_is_inst_imm (gint64 imm)
-{
- return s390_is_imm16 (imm);
+ else
+ return "unknown";
}
/*========================= End of Function ========================*/
/*------------------------------------------------------------------*/
/* */
-/* Name - emit_memcpy */
-/* */
-/* Function - Emit code to move from memory-to-memory based on */
-/* the size of the variable. r0 is overwritten. */
+/* Name - mono_arch_fregname */
/* */
+/* Function - Returns the name of the register specified by */
+/* the input parameter. */
+/* */
/*------------------------------------------------------------------*/
-static guint8 *
-emit_memcpy (guint8 *code, int size, int dreg, int doffset, int sreg, int soffset)
-{
- switch (size) {
- case 4 :
- s390_l (code, s390_r0, 0, sreg, soffset);
- s390_st (code, s390_r0, 0, dreg, doffset);
- break;
-
- case 3 :
- s390_icm (code, s390_r0, 14, sreg, soffset);
- s390_stcm (code, s390_r0, 14, dreg, doffset);
- break;
-
- case 2 :
- s390_lh (code, s390_r0, 0, sreg, soffset);
- s390_sth (code, s390_r0, 0, dreg, doffset);
- break;
-
- case 1 :
- s390_ic (code, s390_r0, 0, sreg, soffset);
- s390_stc (code, s390_r0, 0, dreg, doffset);
- break;
-
- default :
- while (size > 0) {
- int len;
+const char*
+mono_arch_fregname (int reg) {
+ static const char * rnames[] = {
+ "s390_f0", "s390_f1", "s390_f2", "s390_f3", "s390_f4",
+ "s390_f5", "s390_f6", "s390_f7", "s390_f8", "s390_f9",
+ "s390_f10", "s390_f11", "s390_f12", "s390_f13", "s390_f14",
+ "s390_f15"
+ };
- if (size > 256)
- len = 256;
- else
- len = size;
- s390_mvc (code, len, dreg, doffset, sreg, soffset);
- size -= len;
- }
- }
- return code;
+ if (reg >= 0 && reg < 16)
+ return rnames [reg];
+ else
+ return "unknown";
}
/*========================= End of Function ========================*/
if (MONO_TYPE_ISSTRUCT (csig->ret)) {
frame_size += sizeof (gpointer);
- offset += 4;
+ offset += 8;
}
arg_info [0].offset = offset;
if (csig->hasthis) {
frame_size += sizeof (gpointer);
- offset += 4;
+ offset += 8;
}
arg_info [0].size = frame_size;
if (csig->pinvoke)
size = mono_type_native_stack_size (csig->params [k], &align);
else
- size = mono_type_stack_size (csig->params [k], &align);
+ size = mini_type_stack_size (NULL, csig->params [k], &align);
frame_size += pad = (align - (frame_size & (align - 1))) & (align - 1);
arg_info [k].pad = pad;
/*------------------------------------------------------------------*/
/* */
-/* Name - restoreLMF */
+/* Name - retFitsInReg. */
/* */
-/* Function - Restore the LMF state prior to exiting a method. */
+/* Function - Determines if a value can be returned in one or */
+/* two registers. */
/* */
/*------------------------------------------------------------------*/
-static inline guint8 *
-restoreLMF(MonoCompile *cfg, guint8 *code)
+static inline gboolean
+retFitsInReg(guint32 size)
{
- int lmfOffset = 0;
-
- s390_lgr (code, s390_r13, cfg->frame_reg);
-
- lmfOffset = cfg->stack_usage - sizeof(MonoLMF);
-
- /*-------------------------------------------------*/
- /* r13 = my lmf */
- /*-------------------------------------------------*/
- s390_aghi (code, s390_r13, lmfOffset);
-
- /*-------------------------------------------------*/
- /* r6 = &jit_tls->lmf */
- /*-------------------------------------------------*/
- s390_lg (code, s390_r6, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, lmf_addr));
-
- /*-------------------------------------------------*/
- /* r0 = lmf.previous_lmf */
- /*-------------------------------------------------*/
- s390_lg (code, s390_r0, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, previous_lmf));
-
- /*-------------------------------------------------*/
- /* jit_tls->lmf = previous_lmf */
- /*-------------------------------------------------*/
- s390_lg (code, s390_r13, 0, s390_r6, 0);
- s390_stg (code, s390_r0, 0, s390_r6, 0);
- return (code);
+ switch (size) {
+ case 0:
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ return (TRUE);
+ break;
+ default:
+ return (FALSE);
+ }
}
/*========================= End of Function ========================*/
{
int stackSize = cfg->stack_usage;
- if (s390_is_imm16 (cfg->stack_usage)) {
- s390_aghi (code, STK_BASE, cfg->stack_usage);
+ if (s390_is_imm16 (stackSize)) {
+ s390_aghi (code, STK_BASE, stackSize);
} else {
while (stackSize > 32767) {
- s390_aghi (code, STK_BASE, 32767);
+ s390_aghi (code, STK_BASE, 32767);
stackSize -= 32767;
}
- s390_aghi (code, STK_BASE, stackSize);
+ s390_aghi (code, STK_BASE, stackSize);
}
return (code);
}
if (type->byref) {
printf("[BYREF:%p], ", *((char **) curParm));
} else {
- simpleType = type->type;
+ simpleType = mono_type_get_underlying_type(type)->type;
enum_parmtype:
switch (simpleType) {
case MONO_TYPE_I :
printf ("[UINTPTR:%p], ", *((int **) curParm));
break;
case MONO_TYPE_BOOLEAN :
- printf ("[BOOL:%p], ", *((int *) curParm));
+ printf ("[BOOL:%ld], ", *((gint64 *) curParm));
break;
case MONO_TYPE_CHAR :
- printf ("[CHAR:%p], ", *((int *) curParm));
+ printf ("[CHAR:%c], ", *((int *) curParm));
break;
case MONO_TYPE_I1 :
- printf ("[INT1:%d], ", *((int *) curParm));
+ printf ("[INT1:%ld], ", *((gint64 *) curParm));
break;
case MONO_TYPE_I2 :
- printf ("[INT2:%d], ", *((int *) curParm));
+ printf ("[INT2:%ld], ", *((gint64 *) curParm));
break;
case MONO_TYPE_I4 :
- printf ("[INT4:%d], ", *((int *) curParm));
+ printf ("[INT4:%ld], ", *((gint64 *) curParm));
break;
case MONO_TYPE_U1 :
- printf ("[UINT1:%ud], ", *((unsigned int *) curParm));
+ printf ("[UINT1:%lu], ", *((guint64 *) curParm));
break;
case MONO_TYPE_U2 :
- printf ("[UINT2:%ud], ", *((guint16 *) curParm));
+ printf ("[UINT2:%lu], ", *((guint64 *) curParm));
break;
case MONO_TYPE_U4 :
- printf ("[UINT4:%ud], ", *((guint32 *) curParm));
+ printf ("[UINT4:%lu], ", *((guint64 *) curParm));
break;
case MONO_TYPE_U8 :
- printf ("[UINT8:%ul], ", *((guint64 *) curParm));
+ printf ("[UINT8:%lu], ", *((guint64 *) curParm));
break;
case MONO_TYPE_STRING : {
MonoString *s = *((MonoString **) curParm);
case MONO_TYPE_OBJECT : {
MonoObject *obj = *((MonoObject **) curParm);
MonoClass *class;
- if (obj) {
+ if ((obj) && (obj->vtable)) {
printf("[CLASS/OBJ:");
class = obj->vtable->klass;
+ printf("%p [%p] ",obj,curParm);
if (class == mono_defaults.string_class) {
printf("[STRING:%p:%s]",
- *obj, mono_string_to_utf8 (obj));
+ obj, mono_string_to_utf8 ((MonoString *) obj));
} else if (class == mono_defaults.int32_class) {
printf("[INT32:%p:%d]",
obj, *(gint32 *)((char *)obj + sizeof (MonoObject)));
printf("[SZARRAY:%p], ", *((gpointer **) (curParm)));
break;
case MONO_TYPE_I8 :
- printf("[INT8:%lld], ", *((gint64 *) (curParm)));
+ printf("[INT8:%ld], ", *((gint64 *) (curParm)));
break;
case MONO_TYPE_R4 :
- printf("[FLOAT4:%f], ", *((float *) (curParm)));
+ printf("[FLOAT4:%g], ", *((float *) (curParm)));
break;
case MONO_TYPE_R8 :
printf("[FLOAT8:%g], ", *((double *) (curParm)));
break;
case MONO_TYPE_VALUETYPE : {
int i;
+ MonoMarshalType *info;
+
if (type->data.klass->enumtype) {
simpleType = type->data.klass->enum_basetype->type;
printf("{VALUETYPE} - ");
goto enum_parmtype;
}
+
+ info = mono_marshal_load_type_info (type->data.klass);
+
+ if ((info->native_size == sizeof(float)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R4)) {
+ printf("[FLOAT4:%f], ", *((float *) (curParm)));
+ break;
+ }
+
+ if ((info->native_size == sizeof(double)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R8)) {
+ printf("[FLOAT8:%g], ", *((double *) (curParm)));
+ break;
+ }
+
printf("[VALUETYPE:");
for (i = 0; i < size; i++)
printf("%02x,", *((guint8 *)curParm+i));
printf("]");
break;
}
+ case MONO_TYPE_TYPEDBYREF: {
+ int i;
+ printf("[TYPEDBYREF:");
+ for (i = 0; i < size; i++)
+ printf("%02x,", *((guint8 *)curParm+i));
+ printf("]");
+ break;
+ }
default :
printf("[?? - %d], ",simpleType);
}
int i, oParm = 0, iParm = 0;
MonoClass *class;
MonoObject *obj;
- MonoJitArgumentInfo *arg_info;
MonoMethodSignature *sig;
char *fname;
guint64 ip;
CallInfo *cinfo;
ArgInfo *ainfo;
- size_data sz;
void *curParm;
fname = mono_method_full_name (method, TRUE);
indent (1);
- printf ("ENTER: %s(", fname);
+ printf ("ENTER: %s ", fname);
g_free (fname);
ip = (*(guint64 *) (sp+S390_RET_ADDR_OFFSET));
- printf (") ip: %p sp: %p - ", ip, sp);
+ printf ("ip: %p sp: %p - ", (gpointer) ip, sp);
if (rParm == NULL)
return;
sig = mono_method_signature (method);
- cinfo = calculate_sizes (sig, &sz, sig->pinvoke);
+ cinfo = get_call_info (NULL, NULL, sig, sig->pinvoke);
if (cinfo->struct_ret) {
- printf ("[VALUERET:%p], ", rParm->gr[0]);
+ printf ("[STRUCTRET:%p], ", (gpointer) rParm->gr[0]);
iParm = 1;
}
obj = (MonoObject *) this;
if (method->klass->valuetype) {
if (obj) {
- printf("this:[value:%p:%08x], ",
+ printf("this:[value:%p:%016lx], ",
this, *((guint64 *)(this+sizeof(MonoObject))));
} else
printf ("this:[NULL], ");
}
for (i = 0; i < sig->param_count; ++i) {
- ainfo = cinfo->args + (i + oParm);
+ ainfo = &cinfo->args[i + oParm];
switch (ainfo->regtype) {
case RegTypeGeneral :
decodeParm(sig->params[i], &(rParm->gr[ainfo->reg-2]), ainfo->size);
decodeParm(sig->params[i], sp+ainfo->offset, ainfo->size);
break;
case RegTypeStructByVal :
- if (ainfo->reg != STK_BASE)
- curParm = &(rParm->gr[ainfo->reg-2]);
+ if (ainfo->reg != STK_BASE) {
+ int offset = sizeof(glong) - ainfo->size;
+ curParm = &(rParm->gr[ainfo->reg-2])+offset;
+ }
else
curParm = sp+ainfo->offset;
- switch (ainfo->vtsize) {
- case 0:
- case 1:
- case 2:
- case 4:
- case 8:
- decodeParm(sig->params[i],
+ if (retFitsInReg (ainfo->vtsize))
+ decodeParm(sig->params[i],
curParm,
ainfo->size);
- break;
- default:
- decodeParm(sig->params[i],
+ else
+ decodeParm(sig->params[i],
*((char **) curParm),
ainfo->vtsize);
- }
break;
case RegTypeStructByAddr :
if (ainfo->reg != STK_BASE)
}
}
printf("\n");
- g_free (cinfo);
+ g_free(cinfo);
}
/*========================= End of Function ========================*/
break;
}
case MONO_TYPE_I: {
- int *val = va_arg (ap, int*);
- printf ("[INT:%d]", val);
+ gint64 val = va_arg (ap, gint64);
+ printf ("[INT:%ld]", val);
printf("]");
break;
}
case MONO_TYPE_U: {
- int *val = va_arg (ap, int*);
- printf ("[UINT:%d]", val);
+ gint64 val = va_arg (ap, gint64);
+ printf ("[UINT:%lu]", val);
printf("]");
break;
}
case MONO_TYPE_OBJECT: {
MonoObject *o = va_arg (ap, MonoObject *);
- if (o) {
+ if ((o) && (o->vtable)) {
if (o->vtable->klass == mono_defaults.boolean_class) {
printf ("[BOOLEAN:%p:%d]", o, *((guint8 *)o + sizeof (MonoObject)));
} else if (o->vtable->klass == mono_defaults.int32_class) {
printf ("[INT32:%p:%d]", o, *((gint32 *)((char *)o + sizeof (MonoObject))));
} else if (o->vtable->klass == mono_defaults.int64_class) {
- printf ("[INT64:%p:%lld]", o, *((gint64 *)((char *)o + sizeof (MonoObject))));
+ printf ("[INT64:%p:%ld]", o, *((gint64 *)((char *)o + sizeof (MonoObject))));
} else
printf ("[%s.%s:%p]", o->vtable->klass->name_space, o->vtable->klass->name, o);
} else
}
case MONO_TYPE_I8: {
gint64 l = va_arg (ap, gint64);
- printf ("[LONG:%lld]", l);
+ printf ("[LONG:%ld]", l);
+ break;
+ }
+ case MONO_TYPE_U8: {
+ guint64 l = va_arg (ap, guint64);
+ printf ("[ULONG:%lu]", l);
break;
}
case MONO_TYPE_R4: {
double f = va_arg (ap, double);
- printf ("[FLOAT4:%f]\n", (float) f);
+ printf ("[FLOAT4:%g]\n", f);
break;
}
case MONO_TYPE_R8: {
printf ("[FLOAT8:%g]\n", f);
break;
}
- case MONO_TYPE_VALUETYPE:
+ case MONO_TYPE_VALUETYPE: {
+ MonoMarshalType *info;
if (type->data.klass->enumtype) {
type = type->data.klass->enum_basetype;
goto handle_enum;
} else {
guint8 *p = va_arg (ap, gpointer);
int j, size, align;
+
+ info = mono_marshal_load_type_info (type->data.klass);
+
+ if ((info->native_size == sizeof(float)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R4)) {
+ double f = va_arg (ap, double);
+ printf("[FLOAT4:%g]\n", (double) f);
+ break;
+ }
+
+ if ((info->native_size == sizeof(double)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R8)) {
+ double f = va_arg (ap, double);
+ printf("[FLOAT8:%g]\n", f);
+ break;
+ }
+
size = mono_type_size (type, &align);
+ switch (size) {
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ printf ("[");
+ for (j = 0; p && j < size; j++)
+ printf ("%02x,", p [j]);
+ printf ("]\n");
+ break;
+ default:
+ printf ("[VALUETYPE]\n");
+ }
+ }
+ break;
+ }
+ case MONO_TYPE_TYPEDBYREF: {
+ guint8 *p = va_arg (ap, gpointer);
+ int j, size, align;
+ size = mono_type_size (type, &align);
+ switch (size) {
+ case 1:
+ case 2:
+ case 4:
+ case 8:
printf ("[");
for (j = 0; p && j < size; j++)
printf ("%02x,", p [j]);
- printf ("]");
+ printf ("]\n");
+ break;
+ default:
+ printf ("[TYPEDBYREF]\n");
}
+ }
break;
default:
printf ("(unknown return type %x)",
}
ip = ((gint64) __builtin_return_address (0));
- printf (" ip: %p\n", ip);
+ printf (" ip: %p\n", (gpointer) ip);
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - catch_SIGILL */
+/* */
+/* Function - Catch SIGILL as a result of testing for long */
+/* displacement facility. */
+/* */
+/*------------------------------------------------------------------*/
+
+void
+catch_SIGILL(int sigNo, siginfo_t *info, void *act) {
+
+ has_ld = 0;
+
}
/*========================= End of Function ========================*/
void
mono_arch_cpu_init (void)
{
+ struct sigaction sa,
+ *oldSa = NULL;
guint mode = 1;
/*--------------------------------------*/
/*--------------------------------------*/
__asm__ ("SRNM\t%0\n\t"
: : "m" (mode));
+
+ /*--------------------------------------*/
+ /* Determine if we have long displace- */
+ /* ment facility on this processor */
+ /*--------------------------------------*/
+ sa.sa_sigaction = catch_SIGILL;
+ sigemptyset (&sa.sa_mask);
+ sa.sa_flags = SA_SIGINFO;
+
+ sigaction (SIGILL, &sa, oldSa);
+
+ /*--------------------------------------*/
+ /* We test by executing the STY inst */
+ /*--------------------------------------*/
+ __asm__ ("LGHI\t0,1\n\t"
+ "LA\t1,%0\n\t"
+ ".byte\t0xe3,0x00,0x10,0x00,0x00,0x50\n\t"
+ : "=m" (has_ld) : : "0", "1");
+
+ sigaction (SIGILL, oldSa, NULL);
}
/*========================= End of Function ========================*/
+
+/*
+ * Initialize architecture specific code.
+ */
+void
+mono_arch_init (void)
+{
+}
+
+/*
+ * Cleanup architecture specific code.
+ */
+void
+mono_arch_cleanup (void)
+{
+}
+
/*------------------------------------------------------------------*/
/* */
/* Name - mono_arch_cpu_optimizazions */
{
guint32 opts = 0;
- /* no s390-specific optimizations yet */
+ /*----------------------------------------------------------*/
+ /* No s390-specific optimizations yet */
+ /*----------------------------------------------------------*/
*exclude_mask = MONO_OPT_INLINE|MONO_OPT_LINEARS;
+// *exclude_mask = MONO_OPT_INLINE;
return opts;
}
is_regsize_var (MonoType *t) {
if (t->byref)
return TRUE;
- switch (t->type) {
+ switch (mono_type_get_underlying_type (t)->type) {
case MONO_TYPE_I4:
case MONO_TYPE_U4:
case MONO_TYPE_I:
case MONO_TYPE_I8:
- case MONO_TYPE_U:
case MONO_TYPE_U8:
+ case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ case MONO_TYPE_FNPTR:
return TRUE;
case MONO_TYPE_OBJECT:
case MONO_TYPE_STRING:
MonoMethodVar *vmv = MONO_VARINFO (cfg, i);
/* unused vars */
- if (vmv->range.first_use.abs_pos > vmv->range.last_use.abs_pos)
+ if (vmv->range.first_use.abs_pos >= vmv->range.last_use.abs_pos)
continue;
if (ins->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT) ||
- (ins->opcode != OP_LOCAL && ins->opcode != OP_ARG))
+ (ins->opcode != OP_LOCAL && ins->opcode != OP_ARG))
continue;
/* we can only allocate 32 bit values */
mono_arch_get_global_int_regs (MonoCompile *cfg)
{
GList *regs = NULL;
- int i, top = 12;
+ MonoMethodHeader *header;
+ int i, top = 13;
+
+ header = mono_method_get_header (cfg->method);
+ if ((cfg->flags & MONO_CFG_HAS_ALLOCA) || header->num_clauses)
+ cfg->frame_reg = s390_r11;
+
- for (i = 3; i < top; ++i)
- regs = g_list_prepend (regs, GUINT_TO_POINTER (i));
+ /* FIXME: s390_r12 is reserved for bkchain_reg. Only reserve it if needed */
+ top = 12;
+ for (i = 8; i < top; ++i) {
+ if (cfg->frame_reg != i)
+ regs = g_list_prepend (regs, GUINT_TO_POINTER (i));
+ }
return regs;
}
ainfo->offset = sz->stack_size;
ainfo->reg = STK_BASE;
ainfo->regtype = RegTypeBase;
- sz->stack_size += sizeof(int);
+ sz->stack_size += sizeof(long);
+ sz->local_size += sizeof(long);
+ sz->offStruct += sizeof(long);
sz->code_size += 12;
} else {
ainfo->reg = *gr;
/*------------------------------------------------------------------*/
/* */
-/* Name - calculate_sizes */
+/* Name - add_stackParm */
+/* */
+/* Function - Determine code and stack size incremements for a */
+/* parameter. */
+/* */
+/*------------------------------------------------------------------*/
+
+static void inline
+add_stackParm (guint *gr, size_data *sz, ArgInfo *ainfo, gint size)
+{
+ if (*gr > S390_LAST_ARG_REG) {
+ sz->stack_size = S390_ALIGN(sz->stack_size, sizeof(long));
+ ainfo->reg = STK_BASE;
+ ainfo->offset = sz->stack_size;
+ sz->stack_size += sizeof (gpointer);
+ sz->parm_size += sizeof(gpointer);
+ sz->offStruct += sizeof(gpointer);
+ } else {
+ ainfo->reg = *gr;
+ ainfo->offset = sz->stack_size;
+ }
+ (*gr) ++;
+ ainfo->offparm = sz->offset;
+ sz->offset = S390_ALIGN(sz->offset+size, sizeof(long));
+ ainfo->size = size;
+ ainfo->regtype = RegTypeStructByAddr;
+ ainfo->vtsize = size;
+ sz->parm_size += size;
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - add_float */
+/* */
+/* Function - Determine code and stack size incremements for a */
+/* float parameter. */
+/* */
+/*------------------------------------------------------------------*/
+
+static void inline
+add_float (guint *fr, size_data *sz, ArgInfo *ainfo)
+{
+ if ((*fr) <= S390_LAST_FPARG_REG) {
+ ainfo->regtype = RegTypeFP;
+ ainfo->reg = *fr;
+ sz->code_size += 4;
+ (*fr) += 2;
+ }
+ else {
+ ainfo->offset = sz->stack_size;
+ ainfo->reg = STK_BASE;
+ ainfo->regtype = RegTypeBase;
+ sz->code_size += 4;
+ sz->stack_size += sizeof(double);
+ sz->local_size += sizeof(double);
+ sz->offStruct += sizeof(double);
+ }
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - get_call_info */
/* */
/* Function - Determine the amount of space required for code */
/* and stack. In addition determine starting points */
/*------------------------------------------------------------------*/
static CallInfo *
-calculate_sizes (MonoMethodSignature *sig, size_data *sz,
- gboolean string_ctor)
+get_call_info (MonoCompile *cfg, MonoMemPool *mp, MonoMethodSignature *sig, gboolean is_pinvoke)
{
- guint i, fr, gr, size, nWords;
+ guint i, fr, gr, size;
int nParm = sig->hasthis + sig->param_count;
+ MonoType *ret_type;
guint32 simpletype, align;
- CallInfo *cinfo = g_malloc0 (sizeof (CallInfo) + sizeof (ArgInfo) * nParm);
+ CallInfo *cinfo;
+ size_data *sz;
+ MonoGenericSharingContext *gsctx = cfg ? cfg->generic_sharing_context : NULL;
+
+ if (mp)
+ cinfo = mono_mempool_alloc0 (mp, sizeof (CallInfo) + sizeof (ArgInfo) * nParm);
+ else
+ cinfo = g_malloc0 (sizeof (CallInfo) + sizeof (ArgInfo) * nParm);
fr = 0;
gr = s390_r2;
nParm = 0;
cinfo->struct_ret = 0;
+ sz = &cinfo->sz;
sz->retStruct = 0;
+ sz->offset = 0;
+ sz->offStruct = S390_MINIMAL_STACK_SIZE;
sz->stack_size = S390_MINIMAL_STACK_SIZE;
sz->code_size = 0;
+ sz->parm_size = 0;
sz->local_size = 0;
/*----------------------------------------------------------*/
/* area that the callee will use. */
/*----------------------------------------------------------*/
- simpletype = sig->ret->type;
+ ret_type = mono_type_get_underlying_type (sig->ret);
+ ret_type = mini_get_basic_type_from_generic (gsctx, ret_type);
+ simpletype = ret_type->type;
enum_retvalue:
switch (simpletype) {
case MONO_TYPE_BOOLEAN:
cinfo->ret.reg = s390_r2;
sz->code_size += 4;
break;
- case MONO_TYPE_VALUETYPE:
- if (sig->ret->data.klass->enumtype) {
- simpletype = sig->ret->data.klass->enum_basetype->type;
+ case MONO_TYPE_GENERICINST:
+ if (!mono_type_generic_inst_is_valuetype (sig->ret)) {
+ cinfo->ret.reg = s390_r2;
+ sz->code_size += 4;
+ break;
+ }
+ /* Fall through */
+ case MONO_TYPE_VALUETYPE: {
+ MonoClass *klass = mono_class_from_mono_type (sig->ret);
+ if (klass->enumtype) {
+ simpletype = klass->enum_basetype->type;
goto enum_retvalue;
}
if (sig->pinvoke)
- size = mono_class_native_size (sig->ret->data.klass, &align);
+ size = mono_class_native_size (klass, &align);
else
- size = mono_class_value_size (sig->ret->data.klass, &align);
+ size = mono_class_value_size (klass, &align);
+
cinfo->ret.reg = s390_r2;
cinfo->struct_ret = 1;
cinfo->ret.size = size;
cinfo->ret.vtsize = size;
- cinfo->ret.offset = sz->stack_size;
- sz->stack_size += S390_ALIGN(size, align);
gr++;
break;
+ }
case MONO_TYPE_TYPEDBYREF:
+ size = sizeof (MonoTypedRef);
+ cinfo->ret.reg = s390_r2;
+ cinfo->struct_ret = 1;
+ cinfo->ret.size = size;
+ cinfo->ret.vtsize = size;
+ gr++;
+ break;
case MONO_TYPE_VOID:
break;
default:
}
if (sig->hasthis) {
- add_general (&gr, sz, cinfo->args+nParm);
cinfo->args[nParm].size = sizeof(gpointer);
+ add_general (&gr, sz, cinfo->args+nParm);
nParm++;
}
/*----------------------------------------------------------*/
for (i = 0; i < sig->param_count; ++i) {
+ MonoType *ptype;
+
+ /*--------------------------------------------------*/
+ /* Handle vararg type calls. All args are put on */
+ /* the stack. */
+ /*--------------------------------------------------*/
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (i == sig->sentinelpos)) {
+ gr = S390_LAST_ARG_REG + 1;
+ add_general (&gr, sz, &cinfo->sigCookie);
+ }
+
if (sig->params [i]->byref) {
add_general (&gr, sz, cinfo->args+nParm);
cinfo->args[nParm].size = sizeof(gpointer);
nParm++;
continue;
}
- simpletype = sig->params [i]->type;
- enum_calc_size:
+
+ ptype = mono_type_get_underlying_type (sig->params [i]);
+ ptype = mini_get_basic_type_from_generic (gsctx, ptype);
+ simpletype = ptype->type;
+ cinfo->args[nParm].type = simpletype;
switch (simpletype) {
case MONO_TYPE_BOOLEAN:
case MONO_TYPE_I1:
add_general (&gr, sz, cinfo->args+nParm);
nParm++;
break;
- case MONO_TYPE_VALUETYPE:
- if (sig->params [i]->data.klass->enumtype) {
- simpletype = sig->params [i]->data.klass->enum_basetype->type;
- goto enum_calc_size;
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ cinfo->args[nParm].size = sizeof(long long);
+ add_general (&gr, sz, cinfo->args+nParm);
+ nParm++;
+ break;
+ case MONO_TYPE_R4:
+ cinfo->args[nParm].size = sizeof(float);
+ add_float (&fr, sz, cinfo->args+nParm);
+ nParm++;
+ break;
+ case MONO_TYPE_R8:
+ cinfo->args[nParm].size = sizeof(double);
+ add_float (&fr, sz, cinfo->args+nParm);
+ nParm++;
+ break;
+ case MONO_TYPE_GENERICINST:
+ if (!mono_type_generic_inst_is_valuetype (sig->params [i])) {
+ cinfo->args[nParm].size = sizeof(gpointer);
+ add_general (&gr, sz, cinfo->args+nParm);
+ nParm++;
+ break;
}
+ /* Fall through */
+ case MONO_TYPE_VALUETYPE: {
+ MonoMarshalType *info;
+ MonoClass *klass = mono_class_from_mono_type (sig->params [i]);
if (sig->pinvoke)
- size = mono_class_native_size (sig->params [i]->data.klass, &align);
+ size = mono_class_native_size (klass, &align);
else
- size = mono_class_value_size (sig->params [i]->data.klass, &align);
- nWords = (size + sizeof(gpointer) - 1) /
- sizeof(gpointer);
+ size = mono_class_value_size (klass, &align);
+
+ info = mono_marshal_load_type_info (klass);
+
+ if ((info->native_size == sizeof(float)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R4)) {
+ cinfo->args[nParm].size = sizeof(float);
+ add_float(&fr, sz, cinfo->args+nParm);
+ nParm ++;
+ break;
+ }
+
+ if ((info->native_size == sizeof(double)) &&
+ (info->num_fields == 1) &&
+ (info->fields[0].field->type->type == MONO_TYPE_R8)) {
+ cinfo->args[nParm].size = sizeof(double);
+ add_float(&fr, sz, cinfo->args+nParm);
+ nParm ++;
+ break;
+ }
cinfo->args[nParm].vtsize = 0;
cinfo->args[nParm].size = 0;
- cinfo->args[nParm].offparm = sz->local_size;
switch (size) {
/*----------------------------------*/
case 1:
case 2:
case 4:
+ case 8:
add_general(&gr, sz, cinfo->args+nParm);
cinfo->args[nParm].size = size;
cinfo->args[nParm].regtype = RegTypeStructByVal;
nParm++;
sz->local_size += sizeof(long);
break;
- case 8:
- add_general(&gr, sz, cinfo->args+nParm);
- cinfo->args[nParm].size = sizeof(long long);
- cinfo->args[nParm].regtype = RegTypeStructByVal;
+ default:
+ add_stackParm(&gr, sz, cinfo->args+nParm, size);
+ nParm++;
+ }
+ }
+ break;
+ case MONO_TYPE_TYPEDBYREF: {
+ int size = sizeof (MonoTypedRef);
+
+ cinfo->args[nParm].vtsize = 0;
+ cinfo->args[nParm].size = 0;
+
+ switch (size) {
+ /*----------------------------------*/
+ /* On S/390, structures of size 1, */
+ /* 2, 4, and 8 bytes are passed in */
+ /* (a) register(s). */
+ /*----------------------------------*/
+ case 0:
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ add_general(&gr, sz, cinfo->args+nParm);
+ cinfo->args[nParm].size = size;
+ cinfo->args[nParm].regtype = RegTypeStructByVal;
nParm++;
sz->local_size += sizeof(long);
break;
default:
- add_general(&gr, sz, cinfo->args+nParm);
- cinfo->args[nParm].size = sizeof(gpointer);
- cinfo->args[nParm].regtype = RegTypeStructByAddr;
- cinfo->args[nParm].vtsize = size;
- sz->code_size += 40;
- sz->local_size += size;
- if (cinfo->args[nParm].reg == STK_BASE)
- sz->local_size += sizeof(gpointer);
+ add_stackParm(&gr, sz, cinfo->args+nParm, size);
nParm++;
}
- break;
- case MONO_TYPE_I8:
- case MONO_TYPE_U8:
- cinfo->args[nParm].size = sizeof(long long);
- add_general (&gr, sz, cinfo->args+nParm);
- nParm++;
- break;
- case MONO_TYPE_R4:
- cinfo->args[nParm].size = sizeof(float);
- if (fr <= S390_LAST_FPARG_REG) {
- cinfo->args[nParm].regtype = RegTypeFP;
- cinfo->args[nParm].reg = fr;
- sz->code_size += 4;
- fr += 2;
- }
- else {
- cinfo->args[nParm].offset = sz->stack_size;
- cinfo->args[nParm].reg = STK_BASE;
- cinfo->args[nParm].regtype = RegTypeBase;
- sz->code_size += 4;
- sz->stack_size += sizeof(float);
- }
- nParm++;
- break;
- case MONO_TYPE_R8:
- cinfo->args[nParm].size = sizeof(double);
- if (fr <= S390_LAST_FPARG_REG) {
- cinfo->args[nParm].regtype = RegTypeFP;
- cinfo->args[nParm].reg = fr;
- sz->code_size += 4;
- fr += 2;
- } else {
- cinfo->args[nParm].offset = sz->stack_size;
- cinfo->args[nParm].reg = STK_BASE;
- cinfo->args[nParm].regtype = RegTypeBase;
- sz->code_size += 4;
- sz->stack_size += sizeof(double);
- }
- nParm++;
+ }
break;
default:
g_error ("Can't trampoline 0x%x", sig->params [i]->type);
}
}
- cinfo->stack_usage = S390_ALIGN(sz->stack_size+sz->local_size,
- S390_STACK_ALIGNMENT);
+ /*----------------------------------------------------------*/
+ /* Handle the case where there are no implicit arguments */
+ /*----------------------------------------------------------*/
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (sig->param_count == sig->sentinelpos)) {
+ gr = S390_LAST_ARG_REG + 1;
+ add_general (&gr, sz, &cinfo->sigCookie);
+ }
+
+ /*----------------------------------------------------------*/
+ /* If we are passing a structure back then if it won't be */
+ /* in a register(s) then we make room at the end of the */
+ /* parameters that may have been placed on the stack */
+ /*----------------------------------------------------------*/
+ if (cinfo->struct_ret) {
+ cinfo->ret.offset = sz->stack_size;
+ switch (cinfo->ret.size) {
+ case 0:
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ break;
+ default:
+ sz->stack_size += S390_ALIGN(cinfo->ret.size, align);
+ }
+ }
+
+ cinfo->lastgr = gr;
+ sz->stack_size = sz->stack_size + sz->local_size + sz->parm_size +
+ sz->offset;
+ sz->stack_size = S390_ALIGN(sz->stack_size, sizeof(long));
+
return (cinfo);
}
/*------------------------------------------------------------------*/
void
-mono_arch_allocate_vars (MonoCompile *m)
+mono_arch_allocate_vars (MonoCompile *cfg)
{
MonoMethodSignature *sig;
MonoMethodHeader *header;
MonoInst *inst;
CallInfo *cinfo;
- size_data sz;
int iParm, iVar, offset, size, align, curinst;
int frame_reg = STK_BASE;
int sArg, eArg;
- header = mono_method_get_header (m->method);
+ header = mono_method_get_header (cfg->method);
+
+ cfg->flags |= MONO_CFG_HAS_SPILLUP;
/*---------------------------------------------------------*/
/* We use the frame register also for any method that has */
/* before stack unwinding happens) when the filter code */
/* would call any method. */
/*---------------------------------------------------------*/
- if ((m->flags & MONO_CFG_HAS_ALLOCA) || header->num_clauses)
+ if ((cfg->flags & MONO_CFG_HAS_ALLOCA) || header->num_clauses)
frame_reg = s390_r11;
- m->frame_reg = frame_reg;
+ cfg->frame_reg = frame_reg;
+
+ cfg->arch.bkchain_reg = -1;
if (frame_reg != STK_BASE)
- m->used_int_regs |= 1 << frame_reg;
+ cfg->used_int_regs |= 1 << frame_reg;
- sig = mono_method_signature (m->method);
+ sig = mono_method_signature (cfg->method);
- cinfo = calculate_sizes (sig, &sz, sig->pinvoke);
+ cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
if (cinfo->struct_ret) {
- m->ret->opcode = OP_REGVAR;
- m->ret->inst_c0 = s390_r2;
+ if (!cfg->new_ir) {
+ cfg->vret_addr->opcode = OP_REGVAR;
+ cfg->vret_addr->inst_c0 = s390_r2;
+ }
} else {
- /* FIXME: handle long and FP values */
- switch (sig->ret->type) {
+ switch (mono_type_get_underlying_type (sig->ret)->type) {
case MONO_TYPE_VOID:
break;
default:
- m->ret->opcode = OP_REGVAR;
- m->ret->dreg = s390_r2;
+ cfg->ret->opcode = OP_REGVAR;
+ cfg->ret->dreg = s390_r2;
break;
}
}
/*--------------------------------------------------------------*/
/* local vars are at a positive offset from the stack pointer */
- /* */
/* also note that if the function uses alloca, we use s390_r11 */
/* to point at the local variables. */
/* add parameter area size for called functions */
/*--------------------------------------------------------------*/
- offset = (m->param_area + S390_MINIMAL_STACK_SIZE);
+ offset = (cfg->param_area + S390_MINIMAL_STACK_SIZE);
+ cfg->sig_cookie = 0;
if (cinfo->struct_ret) {
- inst = m->ret;
+ inst = cfg->vret_addr;
offset = S390_ALIGN(offset, sizeof(gpointer));
inst->inst_offset = offset;
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);
+ }
}
if (sig->hasthis) {
- inst = m->varinfo [0];
+ inst = cfg->args [0];
if (inst->opcode != OP_REGVAR) {
inst->opcode = OP_REGOFFSET;
inst->inst_basereg = frame_reg;
eArg = sig->param_count + sArg;
+ if (sig->call_convention == MONO_CALL_VARARG)
+ cfg->sig_cookie += S390_MINIMAL_STACK_SIZE;
+
for (iParm = sArg; iParm < eArg; ++iParm) {
- inst = m->varinfo [curinst];
+ inst = cfg->args [curinst];
if (inst->opcode != OP_REGVAR) {
switch (cinfo->args[iParm].regtype) {
- case RegTypeStructByAddr :
- inst->opcode = OP_S390_LOADARG;
- inst->inst_basereg = frame_reg;
- size = abs(cinfo->args[iParm].vtsize);
- offset = S390_ALIGN(offset, size);
- inst->inst_offset = offset;
- break;
- case RegTypeStructByVal :
- inst->opcode = OP_S390_ARGPTR;
+ case RegTypeStructByAddr :
+ if (cfg->new_ir) {
+ MonoInst *indir;
+
+ size = sizeof (gpointer);
+
+ inst->opcode = OP_REGOFFSET;
inst->inst_basereg = frame_reg;
+ offset = S390_ALIGN (offset, sizeof (gpointer));
+ inst->inst_offset = offset;
+
+ /* Add a level of indirection */
+ MONO_INST_NEW (cfg, indir, 0);
+ *indir = *inst;
+ inst->opcode = OP_VTARG_ADDR;
+ inst->inst_left = indir;
+ } else {
+ if (cinfo->args[iParm].reg == STK_BASE) {
+ inst->opcode = OP_S390_LOADARG;
+ inst->inst_basereg = frame_reg;
+ offset = S390_ALIGN(offset, sizeof(long));
+ inst->inst_offset = offset;
+ size = abs(cinfo->args[iParm].vtsize);
+ 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;
+ }
+ }
+ break;
+ case RegTypeStructByVal :
+ if (cfg->new_ir) {
size = cinfo->args[iParm].size;
offset = S390_ALIGN(offset, size);
- inst->inst_offset = offset;
- break;
- default :
- if (cinfo->args[iParm].reg != STK_BASE) {
- inst->opcode = OP_REGOFFSET;
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = frame_reg;
+ inst->inst_offset = offset;
+ } else {
+ inst->opcode = OP_S390_ARGPTR;
inst->inst_basereg = frame_reg;
- size = (cinfo->args[iParm].size < 8
- ? sizeof(long)
- : sizeof(long long));
+ size = cinfo->args[iParm].size;
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 < 8
+ ? 8 - 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(int)
+ : sizeof(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->unused = 0;
- size = sizeof(long);
- }
+ if (cinfo->args[iParm].reg != STK_BASE) {
+ inst->opcode = OP_REGOFFSET;
+ inst->inst_basereg = frame_reg;
+ size = (cinfo->args[iParm].size < 8
+ ? sizeof(int)
+ : sizeof(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 < 8)
+ ? 8 - cinfo->args[iParm].size
+ : 0);
+ inst->inst_offset = cinfo->args[iParm].offset +
+ size;
+ inst->backend.arg_info = 0;
+ size = sizeof(long);
+ }
+ }
+ break;
}
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (cinfo->args[iParm].regtype != RegTypeGeneral) &&
+ (iParm < sig->sentinelpos))
+ cfg->sig_cookie += size;
+
offset += size;
}
curinst++;
}
- curinst = m->locals_start;
- for (iVar = curinst; iVar < m->num_varinfo; ++iVar) {
- inst = m->varinfo [iVar];
- if (inst->opcode == OP_REGVAR)
+ curinst = cfg->locals_start;
+ for (iVar = curinst; iVar < cfg->num_varinfo; ++iVar) {
+ inst = cfg->varinfo [iVar];
+ if ((inst->flags & MONO_INST_IS_DEAD) ||
+ (inst->opcode == OP_REGVAR))
continue;
/*--------------------------------------------------*/
- /* inst->unused indicates native sized value types, */
+ /* inst->backend.is_pinvoke indicates native sized value types, */
/* this is used by the pinvoke wrappers when they */
/* call functions returning structure */
/*--------------------------------------------------*/
- if (inst->unused && MONO_TYPE_ISSTRUCT (inst->inst_vtype))
- size = mono_class_native_size (inst->inst_vtype->data.klass, &align);
+ if (inst->backend.is_pinvoke && MONO_TYPE_ISSTRUCT (inst->inst_vtype))
+ size = mono_class_native_size (mono_class_from_mono_type(inst->inst_vtype), &align);
else
size = mono_type_size (inst->inst_vtype, &align);
inst->opcode = OP_REGOFFSET;
inst->inst_basereg = frame_reg;
offset += size;
- //DEBUG (g_print("allocating local %d to %d\n", iVar, inst->inst_offset));
+ DEBUG (g_print("allocating local %d to %ld, size: %d\n",
+ iVar, inst->inst_offset, size));
}
/*------------------------------------------------------*/
/* Allow space for the trace method stack area if needed*/
/*------------------------------------------------------*/
- if (mono_jit_trace_calls != NULL && mono_trace_eval (m))
+ if (mono_jit_trace_calls != NULL && mono_trace_eval (cfg->method))
offset += S390_TRACE_STACK_SIZE;
/*------------------------------------------------------*/
/* Reserve space to save LMF and caller saved registers */
/*------------------------------------------------------*/
- if (m->method->save_lmf)
+ if (cfg->method->save_lmf)
offset += sizeof (MonoLMF);
/*------------------------------------------------------*/
/* align the offset */
/*------------------------------------------------------*/
- m->stack_offset = S390_ALIGN(offset, S390_STACK_ALIGNMENT);
- g_free(cinfo);
+ cfg->stack_offset = S390_ALIGN(offset, S390_STACK_ALIGNMENT);
+
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_create_vars */
+/*------------------------------------------------------------------*/
+
+void
+mono_arch_create_vars (MonoCompile *cfg)
+{
+ MonoMethodSignature *sig;
+ CallInfo *cinfo;
+ sig = mono_method_signature (cfg->method);
+
+ cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
+
+ if (cinfo->struct_ret) {
+ cfg->vret_addr = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_ARG);
+ if (G_UNLIKELY (cfg->verbose_level > 1)) {
+ printf ("vret_addr = ");
+ mono_print_ins (cfg->vret_addr);
+ }
+ }
}
/*========================= End of Function ========================*/
/* includes pushing, moving argments to the correct */
/* etc. */
/* */
-/* Note - FIXME: We need an alignment solution for */
-/* enter_method and mono_arch_call_opcode, currently */
-/* alignment in mono_arch_call_opcode is computed */
-/* without arch_get_argument_info. */
-/* */
/*------------------------------------------------------------------*/
MonoCallInst*
mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb,
- MonoCallInst *call, int is_virtual) {
- MonoInst *arg, *in;
+ MonoCallInst *call, int is_virtual)
+{
+ MonoInst *in;
+ MonoCallArgParm *arg;
MonoMethodSignature *sig;
int i, n, lParamArea;
CallInfo *cinfo;
ArgInfo *ainfo;
- size_data sz;
sig = call->signature;
n = sig->param_count + sig->hasthis;
DEBUG (g_print ("Call requires: %d parameters\n",n));
- cinfo = calculate_sizes (sig, &sz, sig->pinvoke);
+ cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
- call->stack_usage = cinfo->stack_usage;
- lParamArea = cinfo->stack_usage - S390_MINIMAL_STACK_SIZE;
- cfg->param_area = MAX (cfg->param_area, lParamArea);
+ call->stack_usage = MAX(cinfo->sz.stack_size, call->stack_usage);
+ lParamArea = MAX((call->stack_usage - S390_MINIMAL_STACK_SIZE - cinfo->sz.parm_size), 0);
+ cfg->param_area = MAX (((signed) cfg->param_area), lParamArea);
cfg->flags |= MONO_CFG_HAS_CALLS;
if (cinfo->struct_ret)
- call->used_iregs |= 1 << cinfo->struct_ret;
+ call->used_iregs |= 1 << cinfo->ret.reg;
for (i = 0; i < n; ++i) {
ainfo = cinfo->args + i;
- DEBUG (g_print ("Parameter %d - Register: %d Type: %d\n",
- i+1,ainfo->reg,ainfo->regtype));
+
+ if (!(sig->pinvoke) &&
+ (sig->call_convention == MONO_CALL_VARARG) &&
+ (i == sig->sentinelpos)) {
+ emit_sig_cookie (cfg, call, cinfo, ainfo->size);
+ }
+
if (is_virtual && i == 0) {
/* the argument will be attached to the call instrucion */
in = call->args [i];
call->used_iregs |= 1 << ainfo->reg;
} else {
- MONO_INST_NEW (cfg, arg, OP_OUTARG);
- in = call->args [i];
- arg->cil_code = in->cil_code;
- arg->inst_left = in;
- arg->type = in->type;
+ MONO_INST_NEW_CALL_ARG (cfg, arg, OP_OUTARG);
+ in = call->args [i];
+ arg->ins.cil_code = in->cil_code;
+ arg->ins.inst_left = in;
+ arg->ins.type = in->type;
/* prepend, we'll need to reverse them later */
- arg->next = call->out_args;
- call->out_args = arg;
+ arg->ins.next = call->out_args;
+ call->out_args = (MonoInst *) arg;
+ arg->ins.inst_right = (MonoInst *) call;
if (ainfo->regtype == RegTypeGeneral) {
- arg->unused = ainfo->reg;
+ arg->ins.backend.reg3 = ainfo->reg;
call->used_iregs |= 1 << ainfo->reg;
} else if (ainfo->regtype == RegTypeStructByAddr) {
call->used_iregs |= 1 << ainfo->reg;
- arg->sreg1 = ainfo->reg;
- arg->opcode = OP_OUTARG_VT;
- arg->unused = -ainfo->vtsize;
- arg->inst_imm = ainfo->offset;
- arg->sreg2 = ainfo->offparm + S390_MINIMAL_STACK_SIZE;
+ arg->ins.sreg1 = ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_VT;
+ arg->size = -ainfo->vtsize;
+ arg->offset = ainfo->offset;
+ arg->offPrm = ainfo->offparm + cinfo->sz.offStruct;
} else if (ainfo->regtype == RegTypeStructByVal) {
- if (ainfo->reg != STK_BASE) {
+ if (ainfo->reg != STK_BASE)
call->used_iregs |= 1 << ainfo->reg;
- }
- arg->sreg1 = ainfo->reg;
- arg->opcode = OP_OUTARG_VT;
- arg->unused = ainfo->size;
- arg->inst_imm = ainfo->offset;
- arg->sreg2 = ainfo->offparm + S390_MINIMAL_STACK_SIZE;
+ arg->ins.sreg1 = ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_VT;
+ arg->size = ainfo->size;
+ arg->offset = ainfo->offset;
+ arg->offPrm = ainfo->offparm + cinfo->sz.offStruct;
} else if (ainfo->regtype == RegTypeBase) {
- arg->opcode = OP_OUTARG;
- arg->unused = ainfo->reg | (ainfo->size << 8);
- arg->inst_imm = ainfo->offset;
- call->used_fregs |= 1 << ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_MEMBASE;
+ arg->ins.sreg1 = ainfo->reg;
+ arg->size = ainfo->size;
+ arg->offset = ainfo->offset;
+ call->used_iregs |= 1 << ainfo->reg;
} else if (ainfo->regtype == RegTypeFP) {
- arg->unused = ainfo->reg;
+ arg->ins.backend.reg3 = ainfo->reg;
call->used_fregs |= 1 << ainfo->reg;
- if (ainfo->size == 4) {
- MonoInst *conv;
- arg->opcode = OP_OUTARG_R4;
- MONO_INST_NEW (cfg, conv, OP_FCONV_TO_R4);
- conv->inst_left = arg->inst_left;
- arg->inst_left = conv;
- }
+ if (ainfo->size == 4)
+ arg->ins.opcode = OP_OUTARG_R4;
else
- arg->opcode = OP_OUTARG_R8;
+ arg->ins.opcode = OP_OUTARG_R8;
} else {
g_assert_not_reached ();
}
}
}
+
+ /*
+ * Handle the case where there are no implicit arguments
+ */
+ if (!(sig->pinvoke) &&
+ (sig->call_convention == MONO_CALL_VARARG) &&
+ (n == sig->sentinelpos)) {
+ emit_sig_cookie (cfg, call, cinfo, sizeof(MonoType *));
+ }
+
/*
* Reverse the call->out_args list.
*/
call->out_args = prev;
}
- g_free (cinfo);
return call;
}
/*========================= End of Function ========================*/
+static void
+add_outarg_reg2 (MonoCompile *cfg, MonoCallInst *call, ArgStorage storage, int reg, MonoInst *tree)
+{
+ MonoInst *ins;
+
+ switch (storage) {
+ case RegTypeGeneral:
+ MONO_INST_NEW (cfg, ins, OP_MOVE);
+ ins->dreg = mono_alloc_ireg (cfg);
+ ins->sreg1 = tree->dreg;
+ MONO_ADD_INS (cfg->cbb, ins);
+ mono_call_inst_add_outarg_reg (cfg, call, ins->dreg, reg, FALSE);
+ break;
+ case RegTypeFP:
+ MONO_INST_NEW (cfg, ins, OP_FMOVE);
+ ins->dreg = mono_alloc_freg (cfg);
+ ins->sreg1 = tree->dreg;
+ MONO_ADD_INS (cfg->cbb, ins);
+ mono_call_inst_add_outarg_reg (cfg, call, ins->dreg, reg, TRUE);
+ break;
+ case RegTypeFPR4:
+ MONO_INST_NEW (cfg, ins, OP_S390_SETF4RET);
+ ins->dreg = mono_alloc_freg (cfg);
+ ins->sreg1 = tree->dreg;
+ MONO_ADD_INS (cfg->cbb, ins);
+ mono_call_inst_add_outarg_reg (cfg, call, ins->dreg, reg, TRUE);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+}
+
+static void
+emit_sig_cookie2 (MonoCompile *cfg, MonoCallInst *call, CallInfo *cinfo)
+{
+ MonoMethodSignature *tmpSig;
+ MonoInst *sig_arg;
+
+ 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, sig_arg, OP_ICONST);
+ sig_arg->dreg = mono_alloc_ireg (cfg);
+ sig_arg->inst_p0 = tmpSig;
+ MONO_ADD_INS (cfg->cbb, sig_arg);
+
+ MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORE_MEMBASE_REG, STK_BASE,
+ cinfo->sigCookie.offset, sig_arg->dreg);
+}
+
/*------------------------------------------------------------------*/
/* */
-/* Name - mono_arch_instrument_mem_needs */
+/* Name - mono_arch_emit_call */
/* */
-/* Function - Allow tracing to work with this interface (with */
-/* an optional argument). */
-/* */
/*------------------------------------------------------------------*/
void
-mono_arch_instrument_mem_needs (MonoMethod *method, int *stack, int *code)
+mono_arch_emit_call (MonoCompile *cfg, MonoCallInst *call)
{
- /* no stack room needed now (may be needed for FASTCALL-trace support) */
- *stack = 0;
- /* split prolog-epilog requirements? */
- *code = 50; /* max bytes needed: check this number */
+ MonoInst *in;
+ MonoMethodSignature *sig;
+ MonoInst *ins;
+ int i, n, lParamArea;
+ CallInfo *cinfo;
+ ArgInfo *ainfo = NULL;
+ int stackSize;
+
+ sig = call->signature;
+ n = sig->param_count + sig->hasthis;
+ DEBUG (g_print ("Call requires: %d parameters\n",n));
+
+ cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
+
+ stackSize = cinfo->sz.stack_size + cinfo->sz.local_size + cinfo->sz.parm_size + cinfo->sz.offset;
+ call->stack_usage = MAX(stackSize, call->stack_usage);
+ lParamArea = MAX((call->stack_usage-S390_MINIMAL_STACK_SIZE-cinfo->sz.parm_size), 0);
+ cfg->param_area = MAX(((signed) cfg->param_area), lParamArea);
+ cfg->flags |= MONO_CFG_HAS_CALLS;
+
+ if (cinfo->struct_ret) {
+ MONO_INST_NEW (cfg, ins, OP_MOVE);
+ ins->sreg1 = call->vret_var->dreg;
+ ins->dreg = mono_alloc_preg (cfg);
+ MONO_ADD_INS (cfg->cbb, ins);
+ mono_call_inst_add_outarg_reg (cfg, call, ins->dreg, cinfo->ret.reg, FALSE);
+ }
+
+ for (i = 0; i < n; ++i) {
+ ainfo = cinfo->args + i;
+ MonoType *t;
+
+ if (i >= sig->hasthis)
+ t = sig->params [i - sig->hasthis];
+ else
+ t = &mono_defaults.int_class->byval_arg;
+ t = mono_type_get_underlying_type (t);
+
+ in = call->args [i];
+
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (i == sig->sentinelpos)) {
+ emit_sig_cookie2 (cfg, call, cinfo);
+ }
+
+ switch (ainfo->regtype) {
+ case RegTypeGeneral:
+ add_outarg_reg2 (cfg, call, ainfo->regtype, ainfo->reg, in);
+ break;
+ case RegTypeFP:
+ if (MONO_TYPE_ISSTRUCT (t)) {
+ /* Valuetype passed in one fp register */
+ ainfo->regtype = RegTypeStructByValInFP;
+ /* Fall through */
+ } else {
+ if (ainfo->size == 4)
+ ainfo->regtype = RegTypeFPR4;
+ add_outarg_reg2 (cfg, call, ainfo->regtype, ainfo->reg, in);
+ break;
+ }
+ case RegTypeStructByVal:
+ case RegTypeStructByAddr: {
+ guint32 align;
+ guint32 size;
+
+ if (sig->params [i - sig->hasthis]->type == MONO_TYPE_TYPEDBYREF) {
+ size = sizeof (MonoTypedRef);
+ align = sizeof (gpointer);
+ }
+ else
+ if (sig->pinvoke)
+ size = mono_type_native_stack_size (&in->klass->byval_arg, &align);
+ else {
+ /*
+ * Other backends use mono_type_stack_size (), but that
+ * aligns the size to 8, which is larger than the size of
+ * the source, leading to reads of invalid memory if the
+ * source is at the end of address space.
+ */
+ size = mono_class_value_size (in->klass, &align);
+ }
+
+ g_assert (in->klass);
+
+ ainfo->offparm += cinfo->sz.offStruct;
+
+ MONO_INST_NEW (cfg, ins, OP_OUTARG_VT);
+ ins->sreg1 = in->dreg;
+ ins->klass = in->klass;
+ ins->backend.size = ainfo->size;
+ ins->inst_p0 = call;
+ ins->inst_p1 = mono_mempool_alloc (cfg->mempool, sizeof (ArgInfo));
+ memcpy (ins->inst_p1, ainfo, sizeof (ArgInfo));
+
+ MONO_ADD_INS (cfg->cbb, ins);
+
+ if (ainfo->regtype == RegTypeStructByAddr) {
+ /*
+ * We use OP_OUTARG_VT to copy the valuetype to a stack location, then
+ * use the normal OUTARG opcodes to pass the address of the location to
+ * the callee.
+ */
+ int treg = mono_alloc_preg (cfg);
+ MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ADD_IMM, treg,
+ STK_BASE, ainfo->offparm);
+ mono_call_inst_add_outarg_reg (cfg, call, treg, ainfo->reg, FALSE);
+ }
+ break;
+ }
+ case RegTypeBase:
+ if (!t->byref && t->type == MONO_TYPE_R4) {
+ MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER4_MEMBASE_REG,
+ STK_BASE, ainfo->offset + 4,
+ in->dreg);
+ } else if (!t->byref && (t->type == MONO_TYPE_R8)) {
+ MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORER8_MEMBASE_REG,
+ STK_BASE, ainfo->offset,
+ in->dreg);
+ } else {
+ MONO_INST_NEW (cfg, ins, OP_STORE_MEMBASE_REG);
+ ins->inst_destbasereg = STK_BASE;
+ ins->inst_offset = ainfo->offset;
+ ins->sreg1 = in->dreg;
+
+ /* This is needed by MonoTypedRef->value to point to the correct data */
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (i >= sig->sentinelpos)) {
+ switch (ainfo->size) {
+ case 1:
+ ins->opcode = OP_STOREI1_MEMBASE_REG;
+ break;
+ case 2:
+ ins->opcode = OP_STOREI2_MEMBASE_REG;
+ break;
+ case 4:
+ ins->opcode = OP_STOREI4_MEMBASE_REG;
+ break;
+ default:
+ break;
+ }
+ }
+
+ MONO_ADD_INS (cfg->cbb, ins);
+ }
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+ }
+
+ /*
+ * Handle the case where there are no implicit arguments
+ */
+ if ((sig->call_convention == MONO_CALL_VARARG) &&
+ (i == sig->sentinelpos)) {
+ emit_sig_cookie2 (cfg, call, cinfo);
+ }
}
/*========================= End of Function ========================*/
/*------------------------------------------------------------------*/
/* */
-/* Name - mono_arch_instrument_prolog */
+/* Name - mono_arch_emit_outarg_vt */
/* */
-/* Function - Create an "instrumented" prolog. */
-/* */
/*------------------------------------------------------------------*/
-void*
-mono_arch_instrument_prolog (MonoCompile *cfg, void *func, void *p,
- gboolean enable_arguments)
+void
+mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
{
- guchar *code = p;
- int parmOffset,
- fpOffset;
-
- parmOffset = cfg->stack_usage - S390_TRACE_STACK_SIZE;
- if (cfg->method->save_lmf)
- parmOffset -= sizeof(MonoLMF);
- fpOffset = parmOffset + (5*sizeof(long));
+ MonoCallInst *call = (MonoCallInst*)ins->inst_p0;
+ ArgInfo *ainfo = (ArgInfo*)ins->inst_p1;
+ int size = ins->backend.size;
+
+ if (ainfo->regtype == RegTypeStructByVal) {
+ /*
+ arg->ins.sreg1 = ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_VT;
+ arg->size = ainfo->size;
+ arg->offset = ainfo->offset;
+ arg->offPrm = ainfo->offparm + cinfo->sz.offStruct;
+ */
+ if (ainfo->reg != STK_BASE) {
+ MONO_OUTPUT_VTR2 (cfg, size, ainfo->reg, src->dreg, 0);
+ } else {
+ MONO_OUTPUT_VTS2 (cfg, size, ainfo->reg, ainfo->offset,
+ src->dreg, 0);
+ }
+ } else if (ainfo->regtype == RegTypeStructByValInFP) {
+ int dreg = mono_alloc_freg (cfg);
+
+ if (ainfo->size == 4) {
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADR4_MEMBASE, dreg, src->dreg, 0);
+ MONO_EMIT_NEW_UNALU (cfg, OP_S390_SETF4RET, dreg, dreg);
+ } else {
+ g_assert (ainfo->size == 8);
- s390_stmg (code, s390_r2, s390_r6, STK_BASE, parmOffset);
- s390_std (code, s390_f0, 0, STK_BASE, fpOffset);
- s390_std (code, s390_f1, 0, STK_BASE, fpOffset+sizeof(gdouble));
- s390_std (code, s390_f2, 0, STK_BASE, fpOffset+2*sizeof(gdouble));
- s390_basr (code, s390_r13, 0);
- s390_j (code, 10);
- s390_llong(code, cfg->method);
- s390_llong(code, func);
- s390_lg (code, s390_r2, 0, s390_r13, 4);
- s390_la (code, s390_r3, 0, STK_BASE, parmOffset);
- s390_lgr (code, s390_r4, STK_BASE);
- s390_aghi (code, s390_r4, cfg->stack_usage);
- s390_lg (code, s390_r1, 0, s390_r13, 12);
- s390_basr (code, s390_r14, s390_r1);
- s390_ld (code, s390_f2, 0, STK_BASE, fpOffset+2*sizeof(gdouble));
- s390_ld (code, s390_f1, 0, STK_BASE, fpOffset+sizeof(gdouble));
- s390_ld (code, s390_f0, 0, STK_BASE, fpOffset);
- s390_lmg (code, s390_r2, s390_r6, STK_BASE, parmOffset);
+ MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADR8_MEMBASE, dreg, src->dreg, 0);
+ }
- return code;
+ mono_call_inst_add_outarg_reg (cfg, call, dreg, ainfo->reg, TRUE);
+ } else {
+ MONO_EMIT_NEW_MOVE2 (cfg, STK_BASE, ainfo->offparm,
+ src->dreg, 0, size);
+ }
}
-/*========================= End of Function ========================*/
-
/*------------------------------------------------------------------*/
/* */
-/* Name - mono_arch_instrument_epilog */
+/* Name - mono_arch_emit_setret */
/* */
-/* Function - Create an epilog that will handle the returned */
-/* values used in instrumentation. */
-/* */
/*------------------------------------------------------------------*/
-void*
-mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments)
+void
+mono_arch_emit_setret (MonoCompile *cfg, MonoMethod *method, MonoInst *val)
{
- guchar *code = p;
- int save_mode = SAVE_NONE,
- saveOffset;
- MonoMethod *method = cfg->method;
- int rtype = mono_method_signature (method)->ret->type;
+ MonoType *ret = mono_type_get_underlying_type (mono_method_signature (method)->ret);
+
+ if (!ret->byref) {
+ if (ret->type == MONO_TYPE_R4) {
+ MONO_EMIT_NEW_UNALU (cfg, OP_S390_SETF4RET, s390_f0, val->dreg);
+ return;
+ } else if (ret->type == MONO_TYPE_R8) {
+ MONO_EMIT_NEW_UNALU (cfg, OP_FMOVE, s390_f0, val->dreg);
+ return;
+ }
+ }
+
+ 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 ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_instrument_mem_needs */
+/* */
+/* Function - Allow tracing to work with this interface (with */
+/* an optional argument). */
+/* */
+/*------------------------------------------------------------------*/
+
+void
+mono_arch_instrument_mem_needs (MonoMethod *method, int *stack, int *code)
+{
+ /* no stack room needed now (may be needed for FASTCALL-trace support) */
+ *stack = 0;
+ /* split prolog-epilog requirements? */
+ *code = 50; /* max bytes needed: check this number */
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_instrument_prolog */
+/* */
+/* Function - Create an "instrumented" prolog. */
+/* */
+/*------------------------------------------------------------------*/
+
+void*
+mono_arch_instrument_prolog (MonoCompile *cfg, void *func, void *p,
+ gboolean enable_arguments)
+{
+ guchar *code = p;
+ int parmOffset,
+ fpOffset,
+ baseReg;
+
+ parmOffset = cfg->stack_usage - S390_TRACE_STACK_SIZE;
+ if (cfg->method->save_lmf)
+ parmOffset -= sizeof(MonoLMF);
+ fpOffset = parmOffset + (5*sizeof(gpointer));
+ if ((!has_ld) && (fpOffset > 4096)) {
+ s390_lgr (code, s390_r12, STK_BASE);
+ baseReg = s390_r12;
+ while (fpOffset > 4096) {
+ s390_aghi (code, baseReg, 4096);
+ fpOffset -= 4096;
+ parmOffset -= 4096;
+ }
+ } else {
+ baseReg = STK_BASE;
+ }
+
+ s390_stmg (code, s390_r2, s390_r6, STK_BASE, parmOffset);
+ if (has_ld) {
+ s390_stdy (code, s390_f0, 0, STK_BASE, fpOffset);
+ s390_stdy (code, s390_f2, 0, STK_BASE, fpOffset+sizeof(gdouble));
+ s390_stdy (code, s390_f4, 0, STK_BASE, fpOffset+2*sizeof(gdouble));
+ s390_stdy (code, s390_f6, 0, STK_BASE, fpOffset+3*sizeof(gdouble));
+ } else {
+ s390_std (code, s390_f0, 0, baseReg, fpOffset);
+ s390_std (code, s390_f2, 0, baseReg, fpOffset+sizeof(gdouble));
+ s390_std (code, s390_f4, 0, baseReg, fpOffset+2*sizeof(gdouble));
+ s390_std (code, s390_f6, 0, baseReg, fpOffset+3*sizeof(gdouble));
+ }
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 10);
+ s390_llong(code, cfg->method);
+ s390_llong(code, func);
+ s390_lg (code, s390_r2, 0, s390_r13, 4);
+ if (has_ld)
+ s390_lay (code, s390_r3, 0, STK_BASE, parmOffset);
+ else
+ s390_la (code, s390_r3, 0, baseReg, parmOffset);
+ s390_lgr (code, s390_r4, STK_BASE);
+ s390_aghi (code, s390_r4, cfg->stack_usage);
+ s390_lg (code, s390_r1, 0, s390_r13, 12);
+ s390_basr (code, s390_r14, s390_r1);
+ if (has_ld) {
+ s390_ldy (code, s390_f6, 0, STK_BASE, fpOffset+3*sizeof(gdouble));
+ s390_ldy (code, s390_f4, 0, STK_BASE, fpOffset+2*sizeof(gdouble));
+ s390_ldy (code, s390_f2, 0, STK_BASE, fpOffset+sizeof(gdouble));
+ s390_ldy (code, s390_f0, 0, STK_BASE, fpOffset);
+ } else {
+ s390_ld (code, s390_f6, 0, baseReg, fpOffset+3*sizeof(gdouble));
+ s390_ld (code, s390_f4, 0, baseReg, fpOffset+2*sizeof(gdouble));
+ s390_ld (code, s390_f2, 0, baseReg, fpOffset+sizeof(gdouble));
+ s390_ld (code, s390_f0, 0, baseReg, fpOffset);
+ }
+ s390_lmg (code, s390_r2, s390_r6, STK_BASE, parmOffset);
+
+ return code;
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_instrument_epilog */
+/* */
+/* Function - Create an epilog that will handle the returned */
+/* values used in instrumentation. */
+/* */
+/*------------------------------------------------------------------*/
+
+void*
+mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments)
+{
+ guchar *code = p;
+ int save_mode = SAVE_NONE,
+ saveOffset;
+ MonoMethod *method = cfg->method;
+ int rtype = mono_type_get_underlying_type (mono_method_signature (method)->ret)->type;
saveOffset = cfg->stack_usage - S390_TRACE_STACK_SIZE;
if (method->save_lmf)
break;
case MONO_TYPE_I8:
case MONO_TYPE_U8:
- save_mode = SAVE_TWO;
+ save_mode = SAVE_ONE;
break;
case MONO_TYPE_R4:
+ save_mode = SAVE_R4;
+ break;
case MONO_TYPE_R8:
- save_mode = SAVE_FP;
+ save_mode = SAVE_R8;
break;
case MONO_TYPE_VALUETYPE:
if (mono_method_signature (method)->ret->data.klass->enumtype) {
}
switch (save_mode) {
- case SAVE_TWO:
- s390_stg (code, s390_r2, 0, cfg->frame_reg, saveOffset);
- if (enable_arguments)
- s390_lgr (code, s390_r3, s390_r2);
- break;
case SAVE_ONE:
s390_stg (code, s390_r2, 0, cfg->frame_reg, saveOffset);
- if (enable_arguments)
+ if (enable_arguments) {
s390_lgr (code, s390_r3, s390_r2);
+ }
break;
- case SAVE_FP:
+ case SAVE_R4:
s390_std (code, s390_f0, 0, cfg->frame_reg, saveOffset);
if (enable_arguments) {
- /* FIXME: what reg? */
- s390_ldr (code, s390_f2, s390_f0);
- s390_lg (code, s390_r3, 0, cfg->frame_reg, saveOffset);
+ s390_ldebr (code, s390_f0, s390_f0);
}
break;
+ case SAVE_R8:
+ s390_std (code, s390_f0, 0, cfg->frame_reg, saveOffset);
+ break;
case SAVE_STRUCT:
s390_stg (code, s390_r2, 0, cfg->frame_reg, saveOffset);
- if (enable_arguments)
+ if (enable_arguments) {
s390_lg (code, s390_r3, 0, cfg->frame_reg,
- S390_MINIMAL_STACK_SIZE+cfg->param_area);
+ S390_MINIMAL_STACK_SIZE+cfg->param_area);
+ }
break;
case SAVE_NONE:
default:
s390_llong(code, cfg->method);
s390_llong(code, func);
s390_lg (code, s390_r2, 0, s390_r13, 4);
- s390_lg (code, s390_r1, 0, s390_r13, 12);
+ s390_lg (code, s390_r1, 0, s390_r13, 12);
s390_basr (code, s390_r14, s390_r1);
switch (save_mode) {
- case SAVE_TWO:
- s390_lg (code, s390_r2, 0, cfg->frame_reg, saveOffset);
- break;
case SAVE_ONE:
s390_lg (code, s390_r2, 0, cfg->frame_reg, saveOffset);
break;
- case SAVE_FP:
+ case SAVE_R4:
+ case SAVE_R8:
s390_ld (code, s390_f0, 0, cfg->frame_reg, saveOffset);
break;
case SAVE_STRUCT:
/*========================= End of Function ========================*/
-/*------------------------------------------------------------------*/
-/* */
-/* Name - peephole_pass */
-/* */
-/* Function - Form a peephole pass at the code looking for */
-/* simple optimizations. */
-/* */
-/*------------------------------------------------------------------*/
-
-static void
-peephole_pass (MonoCompile *cfg, MonoBasicBlock *bb)
-{
- MonoInst *ins, *last_ins = NULL;
- ins = bb->code;
-
- while (ins) {
-
- switch (ins->opcode) {
- case OP_MUL_IMM:
- /* remove unnecessary multiplication with 1 */
- if (ins->inst_imm == 1) {
- if (ins->dreg != ins->sreg1) {
- ins->opcode = OP_MOVE;
- } else {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- }
- }
- break;
- case OP_LOAD_MEMBASE:
- case OP_LOADI4_MEMBASE:
- /*
- * OP_STORE_MEMBASE_REG reg, offset(basereg)
- * OP_LOAD_MEMBASE offset(basereg), reg
- */
- if (last_ins && (last_ins->opcode == OP_STOREI4_MEMBASE_REG
- || last_ins->opcode == OP_STORE_MEMBASE_REG) &&
- ins->inst_basereg == last_ins->inst_destbasereg &&
- ins->inst_offset == last_ins->inst_offset) {
- if (ins->dreg == last_ins->sreg1) {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- } else {
- //static int c = 0; printf ("MATCHX %s %d\n", cfg->method->name,c++);
- ins->opcode = OP_MOVE;
- ins->sreg1 = last_ins->sreg1;
- }
-
- /*
- * Note: reg1 must be different from the basereg in the second load
- * OP_LOAD_MEMBASE offset(basereg), reg1
- * OP_LOAD_MEMBASE offset(basereg), reg2
- * -->
- * OP_LOAD_MEMBASE offset(basereg), reg1
- * OP_MOVE reg1, reg2
- */
- } if (last_ins && (last_ins->opcode == OP_LOADI4_MEMBASE
- || last_ins->opcode == OP_LOAD_MEMBASE) &&
- ins->inst_basereg != last_ins->dreg &&
- ins->inst_basereg == last_ins->inst_basereg &&
- ins->inst_offset == last_ins->inst_offset) {
-
- if (ins->dreg == last_ins->dreg) {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- } else {
- ins->opcode = OP_MOVE;
- ins->sreg1 = last_ins->dreg;
- }
- }
- break;
- case OP_LOADU1_MEMBASE:
- case OP_LOADI1_MEMBASE:
- if (last_ins && (last_ins->opcode == OP_STOREI1_MEMBASE_REG) &&
- ins->inst_basereg == last_ins->inst_destbasereg &&
- ins->inst_offset == last_ins->inst_offset) {
- if (ins->dreg == last_ins->sreg1) {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- } else {
- ins->opcode = OP_MOVE;
- ins->sreg1 = last_ins->sreg1;
- }
- }
- break;
- case OP_LOADU2_MEMBASE:
- case OP_LOADI2_MEMBASE:
- if (last_ins && (last_ins->opcode == OP_STOREI2_MEMBASE_REG) &&
- ins->inst_basereg == last_ins->inst_destbasereg &&
- ins->inst_offset == last_ins->inst_offset) {
- if (ins->dreg == last_ins->sreg1) {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- } else {
- ins->opcode = OP_MOVE;
- ins->sreg1 = last_ins->sreg1;
- }
- }
- break;
- case CEE_CONV_I4:
- case CEE_CONV_U4:
- case CEE_CONV_OVF_U4:
- case OP_MOVE:
- /*
- * OP_MOVE reg, reg
- */
- if (ins->dreg == ins->sreg1) {
- if (last_ins)
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- }
- /*
- * OP_MOVE sreg, dreg
- * OP_MOVE dreg, sreg
- */
- if (last_ins && last_ins->opcode == OP_MOVE &&
- ins->sreg1 == last_ins->dreg &&
- ins->dreg == last_ins->sreg1) {
- last_ins->next = ins->next;
- ins = ins->next;
- continue;
- }
- break;
- }
- last_ins = ins;
- ins = ins->next;
- }
- bb->last_ins = last_ins;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - mono_spillvar_offset */
-/* */
-/* Function - Returns the offset used by spillvar. It allocates */
-/* a new spill variable if necessary. */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-mono_spillvar_offset (MonoCompile *cfg, int spillvar)
-{
- MonoSpillInfo **si, *info;
- int i = 0;
-
- si = &cfg->spill_info;
-
- while (i <= spillvar) {
-
- if (!*si) {
- *si = info = mono_mempool_alloc (cfg->mempool, sizeof (MonoSpillInfo));
- info->next = NULL;
- info->offset = cfg->stack_offset;
- cfg->stack_offset += sizeof (gpointer);
- }
-
- if (i == spillvar)
- return (*si)->offset;
-
- i++;
- si = &(*si)->next;
- }
-
- g_assert_not_reached ();
- return 0;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - mono_spillvar_offset_float */
-/* */
-/* Function - */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-mono_spillvar_offset_float (MonoCompile *cfg, int spillvar)
-{
- MonoSpillInfo **si, *info;
- int i = 0;
-
- si = &cfg->spill_info_float;
-
- while (i <= spillvar) {
-
- if (!*si) {
- *si = info = mono_mempool_alloc (cfg->mempool, sizeof (MonoSpillInfo));
- info->next = NULL;
- cfg->stack_offset = S390_ALIGN(cfg->stack_offset, S390_STACK_ALIGNMENT);
- info->offset = cfg->stack_offset;
- cfg->stack_offset += sizeof (double);
- }
-
- if (i == spillvar)
- return (*si)->offset;
-
- i++;
- si = &(*si)->next;
- }
-
- g_assert_not_reached ();
- return 0;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - print_ins */
-/* */
-/* Function - Decode and print the instruction for tracing. */
-/* */
-/*------------------------------------------------------------------*/
-
-static void
-print_ins (int i, MonoInst *ins)
-{
- const char *spec = ins_spec [ins->opcode];
- g_print ("\t%-2d %s", i, mono_inst_name (ins->opcode));
- if (spec [MONO_INST_DEST]) {
- if (ins->dreg >= MONO_MAX_IREGS)
- g_print (" R%d <-", ins->dreg);
- else
- g_print (" %s <-", mono_arch_regname (ins->dreg));
- }
- if (spec [MONO_INST_SRC1]) {
- if (ins->sreg1 >= MONO_MAX_IREGS)
- g_print (" R%d", ins->sreg1);
- else
- g_print (" %s", mono_arch_regname (ins->sreg1));
- }
- if (spec [MONO_INST_SRC2]) {
- if (ins->sreg2 >= MONO_MAX_IREGS)
- g_print (" R%d", ins->sreg2);
- else
- g_print (" %s", mono_arch_regname (ins->sreg2));
- }
- if (spec [MONO_INST_CLOB])
- g_print (" clobbers: %c", spec [MONO_INST_CLOB]);
- g_print ("\n");
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - print_regtrack. */
-/* */
-/* Function - */
-/* */
-/*------------------------------------------------------------------*/
-
-static void
-print_regtrack (RegTrack *t, int num)
-{
- int i;
- char buf [32];
- const char *r;
-
- for (i = 0; i < num; ++i) {
- if (!t [i].born_in)
- continue;
- if (i >= MONO_MAX_IREGS) {
- g_snprintf (buf, sizeof(buf), "R%d", i);
- r = buf;
- } else
- r = mono_arch_regname (i);
- g_print ("liveness: %s [%d - %d]\n", r, t [i].born_in, t[i].last_use);
- }
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - inst_list_prepend */
-/* */
-/* Function - Prepend an instruction to the list. */
-/* */
-/*------------------------------------------------------------------*/
-
-static inline InstList*
-inst_list_prepend (MonoMemPool *pool, InstList *list, MonoInst *data)
-{
- InstList *item = mono_mempool_alloc (pool, sizeof (InstList));
- item->data = data;
- item->prev = NULL;
- item->next = list;
- if (list)
- list->prev = item;
- return item;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - get_register_force_spilling */
-/* */
-/* Function - Force the spilling of the variable in the */
-/* symbolic register 'reg'. */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-get_register_force_spilling (MonoCompile *cfg, InstList *item, MonoInst *ins, int reg)
-{
- MonoInst *load;
- int i, sel, spill;
-
- sel = cfg->rs->iassign [reg];
- i = reg;
- spill = ++cfg->spill_count;
- cfg->rs->iassign [i] = -spill - 1;
- mono_regstate_free_int (cfg->rs, sel);
- /*----------------------------------------------------------*/
- /* we need to create a spill var and insert a load to sel */
- /* after the current instruction */
- /*----------------------------------------------------------*/
- MONO_INST_NEW (cfg, load, OP_LOAD_MEMBASE);
- load->dreg = sel;
- load->inst_basereg = cfg->frame_reg;
- load->inst_offset = mono_spillvar_offset (cfg, spill);
- if (item->prev) {
- while (ins->next != item->prev->data)
- ins = ins->next;
- }
- load->next = ins->next;
- ins->next = load;
- DEBUG (g_print ("SPILLED LOAD (%d at 0x%08x(%%sp)) R%d (freed %s)\n",
- spill, load->inst_offset, i, mono_arch_regname (sel)));
- i = mono_regstate_alloc_int (cfg->rs, 1 << sel);
- g_assert (i == sel);
-
- return sel;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - get_register_spilling */
-/* */
-/* Function - */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-get_register_spilling (MonoCompile *cfg, InstList *item, MonoInst *ins, guint32 regmask, int reg)
-{
- MonoInst *load;
- int i, sel, spill;
-
- DEBUG (g_print ("start regmask to assign R%d: 0x%08x (R%d <- R%d R%d)\n", reg, regmask, ins->dreg, ins->sreg1, ins->sreg2));
- /* exclude the registers in the current instruction */
- if (reg != ins->sreg1 &&
- (reg_is_freeable (ins->sreg1) ||
- (ins->sreg1 >= MONO_MAX_IREGS &&
- cfg->rs->iassign [ins->sreg1] >= 0))) {
- if (ins->sreg1 >= MONO_MAX_IREGS)
- regmask &= ~ (1 << cfg->rs->iassign [ins->sreg1]);
- else
- regmask &= ~ (1 << ins->sreg1);
- DEBUG (g_print ("excluding sreg1 %s\n", mono_arch_regname (ins->sreg1)));
- }
- if (reg != ins->sreg2 &&
- (reg_is_freeable (ins->sreg2) ||
- (ins->sreg2 >= MONO_MAX_IREGS &&
- cfg->rs->iassign [ins->sreg2] >= 0))) {
- if (ins->sreg2 >= MONO_MAX_IREGS)
- regmask &= ~ (1 << cfg->rs->iassign [ins->sreg2]);
- else
- regmask &= ~ (1 << ins->sreg2);
- DEBUG (g_print ("excluding sreg2 %s %d\n", mono_arch_regname (ins->sreg2), ins->sreg2));
- }
- if (reg != ins->dreg && reg_is_freeable (ins->dreg)) {
- regmask &= ~ (1 << ins->dreg);
- DEBUG (g_print ("excluding dreg %s\n", mono_arch_regname (ins->dreg)));
- }
-
- DEBUG (g_print ("available regmask: 0x%08x\n", regmask));
- g_assert (regmask); /* need at least a register we can free */
- sel = -1;
- /* we should track prev_use and spill the register that's farther */
- for (i = 0; i < MONO_MAX_IREGS; ++i) {
- if (regmask & (1 << i)) {
- sel = i;
- DEBUG (g_print ("selected register %s has assignment %d\n", mono_arch_regname (sel), cfg->rs->iassign [sel]));
- break;
- }
- }
- i = cfg->rs->isymbolic [sel];
- spill = ++cfg->spill_count;
- cfg->rs->iassign [i] = -spill - 1;
- mono_regstate_free_int (cfg->rs, sel);
- /* we need to create a spill var and insert a load to sel after the current instruction */
- MONO_INST_NEW (cfg, load, OP_LOAD_MEMBASE);
- load->dreg = sel;
- load->inst_basereg = cfg->frame_reg;
- load->inst_offset = mono_spillvar_offset (cfg, spill);
- if (item->prev) {
- while (ins->next != item->prev->data)
- ins = ins->next;
- }
- load->next = ins->next;
- ins->next = load;
- DEBUG (g_print ("SPILLED LOAD (%d at 0x%08x(%%sp)) R%d (freed %s)\n", spill, load->inst_offset, i, mono_arch_regname (sel)));
- i = mono_regstate_alloc_int (cfg->rs, 1 << sel);
- g_assert (i == sel);
-
- return sel;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - get_float_register_spilling */
-/* */
-/* Function - */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-get_float_register_spilling (MonoCompile *cfg, InstList *item, MonoInst *ins, guint32 regmask, int reg)
-{
- MonoInst *load;
- int i, sel, spill;
-
- DEBUG (g_print ("start regmask to assign R%d: 0x%08x (R%d <- R%d R%d)\n", reg, regmask, ins->dreg, ins->sreg1, ins->sreg2));
- /* exclude the registers in the current instruction */
- if (reg != ins->sreg1 &&
- (freg_is_freeable (ins->sreg1) ||
- (ins->sreg1 >= MONO_MAX_FREGS &&
- cfg->rs->fassign [ins->sreg1] >= 0))) {
- if (ins->sreg1 >= MONO_MAX_FREGS)
- regmask &= ~ (1 << cfg->rs->fassign [ins->sreg1]);
- else
- regmask &= ~ (1 << ins->sreg1);
- DEBUG (g_print ("excluding sreg1 %s\n", mono_arch_regname (ins->sreg1)));
- }
- if (reg != ins->sreg2 &&
- (freg_is_freeable (ins->sreg2) ||
- (ins->sreg2 >= MONO_MAX_FREGS &&
- cfg->rs->fassign [ins->sreg2] >= 0))) {
- if (ins->sreg2 >= MONO_MAX_FREGS)
- regmask &= ~ (1 << cfg->rs->fassign [ins->sreg2]);
- else
- regmask &= ~ (1 << ins->sreg2);
- DEBUG (g_print ("excluding sreg2 %s %d\n", mono_arch_regname (ins->sreg2), ins->sreg2));
- }
- if (reg != ins->dreg && freg_is_freeable (ins->dreg)) {
- regmask &= ~ (1 << ins->dreg);
- DEBUG (g_print ("excluding dreg %s\n", mono_arch_regname (ins->dreg)));
- }
-
- DEBUG (g_print ("available regmask: 0x%08x\n", regmask));
- g_assert (regmask); /* need at least a register we can free */
- sel = -1;
- /* we should track prev_use and spill the register that's farther */
- for (i = 0; i < MONO_MAX_FREGS; ++i) {
- if (regmask & (1 << i)) {
- sel = i;
- DEBUG (g_print ("selected register %s has assignment %d\n",
- mono_arch_regname (sel), cfg->rs->fassign [sel]));
- break;
- }
- }
- i = cfg->rs->fsymbolic [sel];
- spill = ++cfg->spill_count;
- cfg->rs->fassign [i] = -spill - 1;
- mono_regstate_free_float(cfg->rs, sel);
- /* we need to create a spill var and insert a load to sel after the current instruction */
- MONO_INST_NEW (cfg, load, OP_LOADR8_MEMBASE);
- load->dreg = sel;
- load->inst_basereg = cfg->frame_reg;
- load->inst_offset = mono_spillvar_offset_float (cfg, spill);
- if (item->prev) {
- while (ins->next != item->prev->data)
- ins = ins->next;
- }
- load->next = ins->next;
- ins->next = load;
- DEBUG (g_print ("SPILLED LOAD (%d at 0x%08x(%%sp)) R%d (freed %s)\n", spill, load->inst_offset, i, mono_arch_regname (sel)));
- i = mono_regstate_alloc_float (cfg->rs, 1 << sel);
- g_assert (i == sel);
-
- return sel;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - create_copy_ins */
-/* */
-/* Function - Create an instruction to copy from reg to reg. */
-/* */
-/*------------------------------------------------------------------*/
-
-static MonoInst*
-create_copy_ins (MonoCompile *cfg, int dest, int src, MonoInst *ins)
-{
- MonoInst *copy;
- MONO_INST_NEW (cfg, copy, OP_MOVE);
- copy->dreg = dest;
- copy->sreg1 = src;
- if (ins) {
- copy->next = ins->next;
- ins->next = copy;
- }
- DEBUG (g_print ("\tforced copy from %s to %s\n",
- mono_arch_regname (src), mono_arch_regname (dest)));
- return copy;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - create_copy_ins_float */
-/* */
-/* Function - Create an instruction to copy from float reg to */
-/* float reg. */
-/* */
-/*------------------------------------------------------------------*/
-
-static MonoInst*
-create_copy_ins_float (MonoCompile *cfg, int dest, int src, MonoInst *ins)
-{
- MonoInst *copy;
- MONO_INST_NEW (cfg, copy, OP_FMOVE);
- copy->dreg = dest;
- copy->sreg1 = src;
- if (ins) {
- copy->next = ins->next;
- ins->next = copy;
- }
- DEBUG (g_print ("\tforced copy from %s to %s\n",
- mono_arch_regname (src), mono_arch_regname (dest)));
- return copy;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - create_spilled_store */
-/* */
-/* Function - Spill register to storage. */
-/* */
-/*------------------------------------------------------------------*/
-
-static MonoInst*
-create_spilled_store (MonoCompile *cfg, int spill, int reg, int prev_reg, MonoInst *ins)
-{
- MonoInst *store;
- MONO_INST_NEW (cfg, store, OP_STORE_MEMBASE_REG);
- store->sreg1 = reg;
- store->inst_destbasereg = cfg->frame_reg;
- store->inst_offset = mono_spillvar_offset (cfg, spill);
- if (ins) {
- store->next = ins->next;
- ins->next = store;
- }
- DEBUG (g_print ("SPILLED STORE (%d at 0x%08x(%%sp)) R%d (from %s)\n",
- spill, store->inst_offset, prev_reg, mono_arch_regname (reg)));
- return store;
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - create_spilled_store_float */
-/* */
-/* Function - Spill floating point register to storage. */
-/* */
-/*------------------------------------------------------------------*/
-
-static MonoInst*
-create_spilled_store_float (MonoCompile *cfg, int spill, int reg, int prev_reg, MonoInst *ins)
+void
+mono_arch_peephole_pass_1 (MonoCompile *cfg, MonoBasicBlock *bb)
{
- MonoInst *store;
- MONO_INST_NEW (cfg, store, OP_STORER8_MEMBASE_REG);
- store->sreg1 = reg;
- store->inst_destbasereg = cfg->frame_reg;
- store->inst_offset = mono_spillvar_offset_float (cfg, spill);
- if (ins) {
- store->next = ins->next;
- ins->next = store;
- }
- DEBUG (g_print ("SPILLED STORE (%d at 0x%08x(%%sp)) R%d (from %s)\n",
- spill, store->inst_offset, prev_reg, mono_arch_regname (reg)));
- return store;
}
-/*========================= End of Function ========================*/
-
/*------------------------------------------------------------------*/
/* */
-/* Name - insert_before_ins */
+/* Name - mono_arch_peephole_pass */
/* */
-/* Function - Insert an instruction before another. */
+/* Function - Form a peephole pass at the code looking for */
+/* simple optimizations. */
/* */
/*------------------------------------------------------------------*/
-static void
-insert_before_ins (MonoInst *ins, InstList *item, MonoInst* to_insert)
+void
+mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb)
{
- MonoInst *prev;
- g_assert (item->next);
- prev = item->next->data;
-
- while (prev->next != ins)
- prev = prev->next;
- to_insert->next = ins;
- prev->next = to_insert;
- /*
- * needed otherwise in the next instruction we can add an ins to the
- * end and that would get past this instruction.
- */
- item->data = to_insert;
-}
+ MonoInst *ins, *n;
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/* */
-/* Name - alloc_int_reg */
-/* */
-/* Function - Allocate a general register. */
-/* */
-/*------------------------------------------------------------------*/
-
-static int
-alloc_int_reg (MonoCompile *cfg, InstList *curinst, MonoInst *ins, int sym_reg, guint32 allow_mask)
-{
- int val = cfg->rs->iassign [sym_reg];
- DEBUG (g_print ("Allocating a general register for %d (%d) with mask %08x\n",val,sym_reg,allow_mask));
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_int (cfg->rs, allow_mask);
- if (val < 0)
- val = get_register_spilling (cfg, curinst, ins, allow_mask, sym_reg);
- cfg->rs->iassign [sym_reg] = val;
- /* add option to store before the instruction for src registers */
- if (spill)
- create_spilled_store (cfg, spill, val, sym_reg, ins);
+ MONO_BB_FOR_EACH_INS_SAFE (bb, n, ins) {
+ mono_peephole_ins (bb, ins);
}
- DEBUG (g_print ("Allocated %d for %d\n",val,sym_reg));
- cfg->rs->isymbolic [val] = sym_reg;
- return val;
}
/*========================= End of Function ========================*/
-/*------------------------------------------------------------------*/
-/* */
-/* Name - mono_arch_local_regalloc. */
-/* */
-/* Function - We first scan the list of instructions and we */
-/* save the liveness information of each register */
-/* (when the register is first used, when its value */
-/* is set etc.). We also reverse the list of instr- */
-/* uctions (in the InstList list) because assigning */
-/* registers backwards allows for more tricks to be */
-/* used. */
-/* */
-/*------------------------------------------------------------------*/
-
-void
-mono_arch_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
-{
- MonoInst *ins;
- MonoRegState *rs = cfg->rs;
- int i, val;
- RegTrack *reginfo, *reginfof;
- RegTrack *reginfo1, *reginfo2, *reginfod;
- InstList *tmp, *reversed = NULL;
- const char *spec;
- guint32 src1_mask, src2_mask, dest_mask;
- guint32 cur_iregs, cur_fregs;
-
- if (!bb->code)
- return;
- rs->next_vireg = bb->max_ireg;
- rs->next_vfreg = bb->max_freg;
- mono_regstate_assign (rs);
- reginfo = mono_mempool_alloc0 (cfg->mempool, sizeof (RegTrack) * rs->next_vireg);
- reginfof = mono_mempool_alloc0 (cfg->mempool, sizeof (RegTrack) * rs->next_vfreg);
- rs->ifree_mask = S390_CALLER_REGS;
- rs->ffree_mask = S390_CALLER_FREGS;
-
- ins = bb->code;
- i = 1;
- DEBUG (g_print ("LOCAL regalloc: basic block: %d\n", bb->block_num));
- /* forward pass on the instructions to collect register liveness info */
- while (ins) {
- spec = ins_spec [ins->opcode];
- DEBUG (print_ins (i, ins));
- if (spec [MONO_INST_CLOB] == 'c') {
- MonoCallInst * call = (MonoCallInst*)ins;
- int j;
- }
- if (spec [MONO_INST_SRC1]) {
- if (spec [MONO_INST_SRC1] == 'f')
- reginfo1 = reginfof;
- else
- reginfo1 = reginfo;
- reginfo1 [ins->sreg1].prev_use = reginfo1 [ins->sreg1].last_use;
- reginfo1 [ins->sreg1].last_use = i;
- } else {
- ins->sreg1 = -1;
- }
- if (spec [MONO_INST_SRC2]) {
- if (spec [MONO_INST_SRC2] == 'f')
- reginfo2 = reginfof;
- else
- reginfo2 = reginfo;
- reginfo2 [ins->sreg2].prev_use = reginfo2 [ins->sreg2].last_use;
- reginfo2 [ins->sreg2].last_use = i;
- } else {
- ins->sreg2 = -1;
- }
- if (spec [MONO_INST_DEST]) {
- if (spec [MONO_INST_DEST] == 'f')
- reginfod = reginfof;
- else
- reginfod = reginfo;
- if (spec [MONO_INST_DEST] != 'b') /* it's not just a base register */
- reginfod [ins->dreg].killed_in = i;
- reginfod [ins->dreg].prev_use = reginfod [ins->dreg].last_use;
- reginfod [ins->dreg].last_use = i;
- if (reginfod [ins->dreg].born_in == 0 || reginfod [ins->dreg].born_in > i)
- reginfod [ins->dreg].born_in = i;
-#if 0
- if (spec [MONO_INST_DEST] == 'l') {
- /* result in eax:edx, the virtual register is allocated sequentially */
- reginfod [ins->dreg + 1].prev_use = reginfod [ins->dreg + 1].last_use;
- reginfod [ins->dreg + 1].last_use = i;
- if (reginfod [ins->dreg + 1].born_in == 0 || reginfod [ins->dreg + 1].born_in > i)
- reginfod [ins->dreg + 1].born_in = i;
- }
-#endif
- } else {
- ins->dreg = -1;
- }
- reversed = inst_list_prepend (cfg->mempool, reversed, ins);
- ++i;
- ins = ins->next;
- }
-
- cur_iregs = S390_CALLER_REGS;
- cur_fregs = S390_CALLER_FREGS;
-
- DEBUG (print_regtrack (reginfo, rs->next_vireg));
- DEBUG (print_regtrack (reginfof, rs->next_vfreg));
- tmp = reversed;
- while (tmp) {
- int prev_dreg, prev_sreg1, prev_sreg2;
- --i;
- ins = tmp->data;
- spec = ins_spec [ins->opcode];
- DEBUG (g_print ("processing:"));
- DEBUG (print_ins (i, ins));
- /* make the register available for allocation: FIXME add fp reg */
- if (ins->opcode == OP_SETREG || ins->opcode == OP_SETREGIMM) {
- cur_iregs |= 1 << ins->dreg;
- DEBUG (g_print ("adding %d to cur_iregs\n", ins->dreg));
- } else if (ins->opcode == OP_SETFREG) {
- cur_fregs |= 1 << ins->dreg;
- DEBUG (g_print ("adding %d to cur_fregs\n", ins->dreg));
- } else if (spec [MONO_INST_CLOB] == 'c') {
- MonoCallInst *cinst = (MonoCallInst*)ins;
- DEBUG (g_print ("excluding regs 0x%x from cur_iregs (0x%x)\n",
- cinst->used_iregs, cur_iregs));
- DEBUG (g_print ("excluding fpregs 0x%x from cur_fregs (0x%x)\n",
- cinst->used_fregs, cur_fregs));
- cur_iregs &= ~cinst->used_iregs;
- cur_fregs &= ~cinst->used_fregs;
- DEBUG (g_print ("available cur_iregs: 0x%x\n", cur_iregs));
- DEBUG (g_print ("available cur_fregs: 0x%x\n", cur_fregs));
- /*------------------------------------------------------------*/
- /* registers used by the calling convention are excluded from */
- /* allocation: they will be selectively enabled when they are */
- /* assigned by the special SETREG opcodes. */
- /*------------------------------------------------------------*/
- }
- dest_mask = src1_mask = src2_mask = cur_iregs;
- /*------------------------------------------------------*/
- /* update for use with FP regs... */
- /*------------------------------------------------------*/
- if (spec [MONO_INST_DEST] == 'f') {
- dest_mask = cur_fregs;
- if (ins->dreg >= MONO_MAX_FREGS) {
- val = rs->fassign [ins->dreg];
- prev_dreg = ins->dreg;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_float (rs, dest_mask);
- if (val < 0)
- val = get_float_register_spilling (cfg, tmp, ins, dest_mask, ins->dreg);
- rs->fassign [ins->dreg] = val;
- if (spill)
- create_spilled_store_float (cfg, spill, val, prev_dreg, ins);
- }
- DEBUG (g_print ("\tassigned dreg %s to dest R%d\n",
- mono_arch_regname (val), ins->dreg));
- rs->fsymbolic [val] = prev_dreg;
- ins->dreg = val;
- if (spec [MONO_INST_CLOB] == 'c' && ins->dreg != s390_f0) {
- /* this instruction only outputs to s390_f0, need to copy */
- create_copy_ins_float (cfg, ins->dreg, s390_f0, ins);
- }
- } else {
- prev_dreg = -1;
- }
- if (freg_is_freeable (ins->dreg) && prev_dreg >= 0 && (reginfof [prev_dreg].born_in >= i || !(cur_fregs & (1 << ins->dreg)))) {
- DEBUG (g_print ("\tfreeable %s (R%d) (born in %d)\n", mono_arch_regname (ins->dreg), prev_dreg, reginfo [prev_dreg].born_in));
- mono_regstate_free_float (rs, ins->dreg);
- }
- } else if (ins->dreg >= MONO_MAX_IREGS) {
- val = rs->iassign [ins->dreg];
- prev_dreg = ins->dreg;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_int (rs, dest_mask);
- if (val < 0)
- val = get_register_spilling (cfg, tmp, ins, dest_mask, ins->dreg);
- rs->iassign [ins->dreg] = val;
- if (spill)
- create_spilled_store (cfg, spill, val, prev_dreg, ins);
- }
- DEBUG (g_print ("\tassigned dreg %s to dest R%d (prev: R%d)\n",
- mono_arch_regname (val), ins->dreg, prev_dreg));
- rs->isymbolic [val] = prev_dreg;
- ins->dreg = val;
- if (spec [MONO_INST_DEST] == 'l') {
- if (ins->dreg != s390_r2)
- create_copy_ins (cfg, ins->dreg, s390_r2, ins);
-#if 0
- int hreg = prev_dreg + 1;
- val = rs->iassign [hreg];
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_int (rs, dest_mask);
- if (val < 0)
- val = get_register_spilling (cfg, tmp, ins, dest_mask, hreg);
- rs->iassign [hreg] = val;
- if (spill)
- create_spilled_store (cfg, spill, val, hreg, ins);
- }
- DEBUG (g_print ("\tassigned hreg %s to dest R%d\n", mono_arch_regname (val), hreg));
- rs->isymbolic [val] = hreg;
-// #if 0
- /* FIXME:? ins->dreg = val; */
- if (ins->dreg == s390_r3) {
- if (val != s390_r2)
- create_copy_ins (cfg, val, s390_r2, ins);
- } else if (ins->dreg == s390_r2) {
- if (val == s390_r3) {
- /* swap */
- create_copy_ins (cfg, s390_r3, s390_r0, ins);
- create_copy_ins (cfg, s390_r2, s390_r3, ins);
- create_copy_ins (cfg, s390_r0, s390_r2, ins);
- } else {
- /* two forced copies */
- create_copy_ins (cfg, ins->dreg, s390_r3, ins);
- create_copy_ins (cfg, val, s390_r2, ins);
- }
- } else {
- if (val == s390_r2) {
- create_copy_ins (cfg, ins->dreg, s390_r2, ins);
- } else {
- /* two forced copies */
- create_copy_ins (cfg, val, s390_r2, ins);
- create_copy_ins (cfg, ins->dreg, s390_r3, ins);
- }
- }
-// #endif
- if (reg_is_freeable (val) && !(cur_iregs & (1 << val))) {
- DEBUG (g_print ("\tfreeable %s (R%d)\n", mono_arch_regname (val), val));
- mono_regstate_free_int (rs, val);
- }
-#endif
- } else if (spec [MONO_INST_DEST] == 'a' && ins->dreg != s390_r2 && spec [MONO_INST_CLOB] != 'd') {
- /* this instruction only outputs to s390_r2, need to copy */
- create_copy_ins (cfg, ins->dreg, s390_r2, ins);
- }
- } else {
- prev_dreg = -1;
- }
- if (spec [MONO_INST_DEST] == 'f' &&
- freg_is_freeable (ins->dreg) &&
- prev_dreg >= 0 && (reginfof [prev_dreg].born_in >= i)) {
- DEBUG (g_print ("\tfreeable %s (R%d) (born in %d)\n", mono_arch_regname (ins->dreg), prev_dreg, reginfo [prev_dreg].born_in));
- mono_regstate_free_float (rs, ins->dreg);
- } else if (spec [MONO_INST_DEST] != 'f' &&
- reg_is_freeable (ins->dreg) &&
- prev_dreg >= 0 && (reginfo [prev_dreg].born_in >= i)) {
- DEBUG (g_print ("\tfreeable %s (R%d) (born in %d)\n", mono_arch_regname (ins->dreg), prev_dreg, reginfo [prev_dreg].born_in));
- mono_regstate_free_int (rs, ins->dreg);
- }
- if (spec [MONO_INST_SRC1] == 'f') {
- src1_mask = cur_fregs;
- if (ins->sreg1 >= MONO_MAX_FREGS) {
- val = rs->fassign [ins->sreg1];
- prev_sreg1 = ins->sreg1;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- //g_assert (val == -1); /* source cannot be spilled */
- val = mono_regstate_alloc_float (rs, src1_mask);
- if (val < 0)
- val = get_float_register_spilling (cfg, tmp, ins, src1_mask, ins->sreg1);
- rs->fassign [ins->sreg1] = val;
- DEBUG (g_print ("\tassigned sreg1 %s to R%d\n", mono_arch_regname (val), ins->sreg1));
- if (spill) {
- MonoInst *store = create_spilled_store_float (cfg, spill, val, prev_sreg1, NULL);
- insert_before_ins (ins, tmp, store);
- }
- }
- rs->fsymbolic [val] = prev_sreg1;
- ins->sreg1 = val;
- } else {
- prev_sreg1 = -1;
- }
- } else if (ins->sreg1 >= MONO_MAX_IREGS) {
- val = rs->iassign [ins->sreg1];
- prev_sreg1 = ins->sreg1;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_int (rs, src1_mask);
- if (val < 0)
- val = get_register_spilling (cfg, tmp, ins,
- src1_mask,
- ins->sreg1);
- rs->iassign [ins->sreg1] = val;
- DEBUG (g_print ("\tassigned sreg1 %s to R%d\n",
- mono_arch_regname (val), ins->sreg1));
- if (spill) {
- MonoInst *store;
- store = create_spilled_store (cfg, spill, val,
- prev_sreg1, NULL);
- insert_before_ins (ins, tmp, store);
- }
- }
- rs->isymbolic [val] = prev_sreg1;
- ins->sreg1 = val;
- } else {
- prev_sreg1 = -1;
- }
- /*----------------------------------------------*/
- /* handle clobbering of sreg1 */
- /*----------------------------------------------*/
- if ((spec [MONO_INST_CLOB] == '1' ||
- spec [MONO_INST_CLOB] == 's') &&
- ins->dreg != ins->sreg1) {
- MonoInst *copy;
- copy = create_copy_ins (cfg, ins->dreg, ins->sreg1, NULL);
- DEBUG (g_print ("\tneed to copy sreg1 %s to dreg %s\n",
- mono_arch_regname (ins->sreg1),
- mono_arch_regname (ins->dreg)));
- if (ins->sreg2 == -1 || spec [MONO_INST_CLOB] == 's') {
- /* note: the copy is inserted before the current instruction! */
- insert_before_ins (ins, tmp, copy);
- /* we set sreg1 to dest as well */
- prev_sreg1 = ins->sreg1 = ins->dreg;
- } else {
- /* inserted after the operation */
- copy->next = ins->next;
- ins->next = copy;
- }
- }
-
- if (spec [MONO_INST_SRC2] == 'f') {
- src2_mask = cur_fregs;
- if (ins->sreg2 >= MONO_MAX_FREGS) {
- val = rs->fassign [ins->sreg2];
- prev_sreg2 = ins->sreg2;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_float (rs, src2_mask);
- if (val < 0)
- val = get_float_register_spilling (cfg, tmp, ins, src2_mask, ins->sreg2);
- rs->fassign [ins->sreg2] = val;
- DEBUG (g_print ("\tassigned sreg2 %s to R%d\n", mono_arch_regname (val), ins->sreg2));
- if (spill)
- create_spilled_store_float (cfg, spill, val, prev_sreg2, ins);
- }
- rs->fsymbolic [val] = prev_sreg2;
- ins->sreg2 = val;
- } else {
- prev_sreg2 = -1;
- }
- } else if (ins->sreg2 >= MONO_MAX_IREGS) {
- val = rs->iassign [ins->sreg2];
- prev_sreg2 = ins->sreg2;
- if (val < 0) {
- int spill = 0;
- if (val < -1) {
- /* the register gets spilled after this inst */
- spill = -val -1;
- }
- val = mono_regstate_alloc_int (rs, src2_mask);
- if (val < 0)
- val = get_register_spilling (cfg, tmp, ins, src2_mask, ins->sreg2);
- rs->iassign [ins->sreg2] = val;
- DEBUG (g_print ("\tassigned sreg2 %s to R%d\n", mono_arch_regname (val), ins->sreg2));
- if (spill)
- create_spilled_store (cfg, spill, val, prev_sreg2, ins);
- }
- rs->isymbolic [val] = prev_sreg2;
- ins->sreg2 = val;
- } else {
- prev_sreg2 = -1;
- }
+void
+mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
+{
+ MonoInst *ins, *next;
- if (spec [MONO_INST_CLOB] == 'c') {
- int j, s;
- guint32 clob_mask = S390_CALLER_REGS;
- for (j = 0; j < MONO_MAX_IREGS; ++j) {
- s = 1 << j;
- if ((clob_mask & s) && !(rs->ifree_mask & s) && j != ins->sreg1) {
- }
- }
+ 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:
+ case OP_REM_IMM:
+ case OP_IDIV_IMM:
+ case OP_IREM_IMM:
+ case OP_IDIV_UN_IMM:
+ case OP_IREM_UN_IMM:
+ case OP_LAND_IMM:
+ case OP_LOR_IMM:
+ case OP_LXOR_IMM:
+ case OP_LOCALLOC_IMM:
+ mono_decompose_op_imm (cfg, bb, ins);
+ break;
+ case OP_LADD_IMM:
+ if (!s390_is_imm16 (ins->inst_imm))
+ /* This is created by the memcpy code which ignores is_inst_imm */
+ mono_decompose_op_imm (cfg, bb, ins);
+ break;
+ default:
+ break;
}
- tmp = tmp->next;
}
+
+ bb->max_vreg = cfg->rs->next_vreg;
}
/*========================= End of Function ========================*/
s390_lghi (code, s390_r0, 0);
s390_lghi (code, s390_r13, 0xff);
s390_ltgr (code, dreg, dreg);
- s390_jnl (code, 6);
- s390_lhi (code, s390_r0, 0x80);
+ s390_jnl (code, 4);
+ s390_lghi (code, s390_r0, 0x80);
s390_ngr (code, dreg, s390_r13);
s390_ogr (code, dreg, s390_r0);
break;
}
} else {
+ short *o[1];
s390_basr (code, s390_r13, 0);
s390_j (code, 10);
s390_llong (code, 0x41e0000000000000);
s390_llong (code, 0x41f0000000000000);
s390_ldr (code, s390_f15, sreg);
- s390_cdb (code, s390_f15, 0, s390_r13, 0);
- s390_jl (code, 10);
- s390_sdb (code, s390_f15, 0, s390_r13, 8);
+ s390_cdb (code, s390_f15, 0, s390_r13, 4);
+ s390_jl (code, 0); CODEPTR (code, o[0]);
+ s390_sdb (code, s390_f15, 0, s390_r13, 12);
s390_cfdbr (code, dreg, 7, s390_f15);
- s390_j (code, 6);
+ s390_j (code, 4);
+ PTRSLOT (code, o[0]);
s390_cfdbr (code, dreg, 5, sreg);
switch (size) {
case 1:
/*========================= End of Function ========================*/
-/*------------------------------------------------------------------*/
-/* */
-/* Name - mono_emit_stack_alloc */
-/* */
-/* Function - */
-/* */
-/*------------------------------------------------------------------*/
-
-static unsigned char*
-mono_emit_stack_alloc (guchar *code, MonoInst* tree)
+static gboolean is_unsigned (MonoInst *next)
{
- return code;
+ if ((next) &&
+ (((next->opcode >= OP_IBNE_UN) &&
+ (next->opcode <= OP_IBLT_UN)) ||
+ ((next->opcode >= OP_LBNE_UN) &&
+ (next->opcode <= OP_LBLT_UN)) ||
+ ((next->opcode >= OP_COND_EXC_NE_UN) &&
+ (next->opcode <= OP_COND_EXC_LT_UN)) ||
+ ((next->opcode >= OP_COND_EXC_INE_UN) &&
+ (next->opcode <= OP_COND_EXC_ILT_UN)) ||
+ ((next->opcode == OP_CLT_UN) ||
+ (next->opcode == OP_CGT_UN)) ||
+ ((next->opcode == OP_ICLT_UN) ||
+ (next->opcode == OP_ICGT_UN) ||
+ (next->opcode == OP_LCLT_UN) ||
+ (next->opcode == OP_LCGT_UN))))
+ return TRUE;
+ else
+ return FALSE;
}
-/*========================= End of Function ========================*/
-
/*------------------------------------------------------------------*/
/* */
/* Name - mono_arch_output_basic_block */
MonoCallInst *call;
guint offset;
guint8 *code = cfg->native_code + cfg->code_len;
- MonoInst *last_ins = NULL;
guint last_offset = 0;
- int max_len, cpos;
-guint8 cond;
-
- if (cfg->opt & MONO_OPT_PEEPHOLE)
- peephole_pass (cfg, bb);
+ int max_len, cpos, src2;
/* we don't align basic blocks of loops on s390 */
//x86_inc_mem (code, &cov->data [bb->dfn].count);
}
- ins = bb->code;
- while (ins) {
+ MONO_BB_FOR_EACH_INS (bb, ins) {
offset = code - cfg->native_code;
- max_len = ((guint8 *)ins_spec [ins->opcode])[MONO_INST_LEN];
+ max_len = ((guint8 *)ins_get_spec (ins->opcode))[MONO_INST_LEN];
if (offset > (cfg->code_size - max_len - 16)) {
cfg->code_size *= 2;
switch (ins->opcode) {
case OP_STOREI1_MEMBASE_IMM: {
- s390_lghi (code, s390_r14, ins->inst_imm);
- if (s390_is_uimm12(ins->inst_offset))
- s390_stc (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
- else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_stc (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
- }
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ S390_LONG (code, stcy, stc, s390_r0, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_STOREI2_MEMBASE_IMM: {
- s390_lghi (code, s390_r14, ins->inst_imm);
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_sth (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_sth (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
- }
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ S390_LONG (code, sthy, sth, s390_r0, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
- case OP_STORE_MEMBASE_IMM:
- case OP_STOREI8_MEMBASE_IMM: {
+ case OP_STOREI4_MEMBASE_IMM: {
if (s390_is_imm16(ins->inst_imm)) {
- s390_lghi (code, s390_r14, ins->inst_imm);
+ s390_lghi (code, s390_r0, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- s390_lg (code, s390_r14, 0, s390_r13, 4);
- }
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_stg (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_stg (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
+ s390_lg (code, s390_r0, 0, s390_r13, 4);
}
+ S390_LONG (code, sty, st, s390_r0, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
- case OP_STOREI4_MEMBASE_IMM: {
+ case OP_STORE_MEMBASE_IMM:
+ case OP_STOREI8_MEMBASE_IMM: {
if (s390_is_imm16(ins->inst_imm)) {
- s390_lghi (code, s390_r14, ins->inst_imm);
+ s390_lghi (code, s390_r0, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- s390_lg (code, s390_r14, 0, s390_r13, 4);
- }
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_st (code, s390_r14, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_st (code, s390_r14, s390_r13, ins->inst_destbasereg, 0);
+ s390_lg (code, s390_r0, 0, s390_r13, 4);
}
+ S390_LONG (code, stg, stg, s390_r0, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_STOREI1_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_stc (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_stc (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
- }
+ S390_LONG (code, stcy, stc, ins->sreg1, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_STOREI2_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_sth (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_sth (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
- }
- }
- break;
- case OP_STORE_MEMBASE_REG:
- case OP_STOREI8_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_stg (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_stg (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
- }
+ S390_LONG (code, sthy, sth, ins->sreg1, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_STOREI4_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_st (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_st (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
- }
- }
- break;
- case CEE_LDIND_I:
- case CEE_LDIND_I4: {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_word (code, ins->inst_p0);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lgf (code, ins->dreg, 0, s390_r13, 0);
+ S390_LONG (code, sty, st, ins->sreg1, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
- case CEE_LDIND_U4: {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_word (code, ins->inst_p0);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_llgf (code, ins->dreg, 0, s390_r13, 0);
+ case OP_STORE_MEMBASE_REG:
+ case OP_STOREI8_MEMBASE_REG: {
+ S390_LONG (code, stg, stg, ins->sreg1, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_LOADU4_MEM:
break;
case OP_LOAD_MEMBASE:
case OP_LOADI8_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_lg (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- if (s390_is_imm16(ins->inst_offset)) {
- s390_lghi(code, s390_r13, ins->inst_offset);
- s390_lg (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lg (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
- }
+ S390_LONG (code, lg, lg, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
+ }
+ break;
+ case OP_LOADI4_MEMBASE: {
+ S390_LONG (code, lgf, lgf, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
- case OP_LOADI4_MEMBASE:
case OP_LOADU4_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_lgf (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- if (s390_is_imm16(ins->inst_offset)) {
- s390_lghi(code, s390_r13, ins->inst_offset);
- s390_lgf (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lgf (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
- }
+ S390_LONG (code, llgf, llgf, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
case OP_LOADU1_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_llgc (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_llgc (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, llgc, llgc, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
case OP_LOADI1_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_lgb (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lgb (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, lgb, lgb, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
case OP_LOADU2_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_llgh (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_llgh (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, llgh, llgh, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
case OP_LOADI2_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset))
- s390_lh (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lh (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, lgh, lgh, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
- case CEE_CONV_I1: {
- s390_lghi (code, s390_r0, 0x80);
+ case OP_LCONV_TO_I1: {
+ s390_lghi (code, s390_r0, 0x80);
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
s390_ngr (code, s390_r0, ins->sreg1);
- s390_jz (code, 7);
+ s390_jz (code, 9);
s390_lghi (code, s390_r13, -1);
s390_sllg (code, s390_r13, s390_r13, 0, 8);
s390_ogr (code, ins->dreg, s390_r13);
}
break;
- case CEE_CONV_I2: {
+ case OP_LCONV_TO_I2: {
s390_lghi (code, s390_r0, 0x80);
s390_sllg (code, s390_r0, s390_r0, 0, 8);
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
s390_ngr (code, s390_r0, ins->sreg1);
- s390_jz (code, 7);
+ s390_jz (code, 9);
s390_lghi (code, s390_r13, -1);
s390_sllg (code, s390_r13, s390_r13, 0, 16);
s390_ogr (code, ins->dreg, s390_r13);
}
break;
- case CEE_CONV_U1: {
+ case OP_LCONV_TO_U1: {
s390_lghi (code, s390_r0, 0xff);
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
s390_ngr (code, ins->dreg, s390_r0);
}
break;
- case CEE_CONV_U2: {
+ case OP_LCONV_TO_U2: {
s390_lghi (code, s390_r0, -1);
- s390_sllg (code, s390_r0, s390_r0, 0, 48);
- s390_srlg (code, s390_r0, s390_r0, 0, 48);
+ s390_sllg (code, s390_r0, s390_r0, 0, 16);
+ s390_srlg (code, s390_r0, s390_r0, 0, 16);
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
s390_ngr (code, ins->dreg, s390_r0);
}
break;
+ case OP_ICONV_TO_I1: {
+ s390_lhi (code, s390_r0, 0x80);
+ if (ins->dreg != ins->sreg1) {
+ s390_lr (code, ins->dreg, ins->sreg1);
+ }
+ s390_nr (code, s390_r0, ins->sreg1);
+ s390_jz (code, 7);
+ s390_lhi (code, s390_r13, -1);
+ s390_sll (code, s390_r13, 0, 8);
+ s390_or (code, ins->dreg, s390_r13);
+ }
+ break;
+ case OP_ICONV_TO_I2: {
+ s390_lhi (code, s390_r0, 0x80);
+ s390_sll (code, s390_r0, 0, 8);
+ if (ins->dreg != ins->sreg1) {
+ s390_lr (code, ins->dreg, ins->sreg1);
+ }
+ s390_nr (code, s390_r0, ins->sreg1);
+ s390_jz (code, 7);
+ s390_lhi (code, s390_r13, -1);
+ s390_sll (code, s390_r13, 0, 16);
+ s390_or (code, ins->dreg, s390_r13);
+ }
+ break;
+ case OP_ICONV_TO_U1: {
+ s390_lhi (code, s390_r0, 0xff);
+ if (ins->dreg != ins->sreg1) {
+ s390_lr (code, ins->dreg, ins->sreg1);
+ }
+ s390_nr (code, ins->dreg, s390_r0);
+ }
+ break;
+ case OP_ICONV_TO_U2: {
+ s390_lhi (code, s390_r0, -1);
+ s390_sll (code, s390_r0, 0, 16);
+ s390_srl (code, s390_r0, 0, 16);
+ if (ins->dreg != ins->sreg1) {
+ s390_lr (code, ins->dreg, ins->sreg1);
+ }
+ s390_nr (code, ins->dreg, s390_r0);
+ }
+ break;
case OP_COMPARE:
case OP_LCOMPARE: {
- if ((ins->next) &&
- ((ins->next->opcode >= CEE_BNE_UN) &&
- (ins->next->opcode <= CEE_BLT_UN)) ||
- ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
- (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
- ((ins->next->opcode == OP_CLT_UN) ||
- (ins->next->opcode == OP_CGT_UN)))
+ if (is_unsigned (ins->next))
s390_clgr (code, ins->sreg1, ins->sreg2);
else
s390_cgr (code, ins->sreg1, ins->sreg2);
}
break;
- case OP_COMPARE_IMM: {
+ case OP_ICOMPARE: {
+ if (is_unsigned (ins->next))
+ s390_clr (code, ins->sreg1, ins->sreg2);
+ else
+ s390_cr (code, ins->sreg1, ins->sreg2);
+ }
+ break;
+ case OP_COMPARE_IMM:
+ case OP_LCOMPARE_IMM: {
if (s390_is_imm16 (ins->inst_imm)) {
s390_lghi (code, s390_r0, ins->inst_imm);
- if ((ins->next) &&
- ((ins->next->opcode >= CEE_BNE_UN) &&
- (ins->next->opcode <= CEE_BLT_UN)) ||
- ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
- (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
- ((ins->next->opcode == OP_CLT_UN) ||
- (ins->next->opcode == OP_CGT_UN)))
+ if (is_unsigned (ins->next))
s390_clgr (code, ins->sreg1, s390_r0);
else
s390_cgr (code, ins->sreg1, s390_r0);
- }
- else {
+ } else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if ((ins->next) &&
- ((ins->next->opcode >= CEE_BNE_UN) &&
- (ins->next->opcode <= CEE_BLT_UN)) ||
- ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
- (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
- ((ins->next->opcode == OP_CLT_UN) &&
- (ins->next->opcode == OP_CGT_UN)))
+ if (is_unsigned (ins->next))
s390_clg (code, ins->sreg1, 0, s390_r13, 4);
else
s390_cg (code, ins->sreg1, 0, s390_r13, 4);
}
}
break;
- case OP_ICOMPARE: {
- if (((ins->next) &&
- (((ins->next->opcode >= OP_IBNE_UN) &&
- (ins->next->opcode <= OP_IBLT_UN)) ||
- ((ins->next->opcode == OP_ICLT_UN) ||
- (ins->next->opcode == OP_ICGT_UN)))))
- s390_clr (code, ins->sreg1, ins->sreg2);
- else
- s390_cr (code, ins->sreg1, ins->sreg2);
- }
- break;
case OP_ICOMPARE_IMM: {
if (s390_is_imm16 (ins->inst_imm)) {
s390_lghi (code, s390_r0, ins->inst_imm);
- if ((ins->next) &&
- ((ins->next->opcode >= CEE_BNE_UN) &&
- (ins->next->opcode <= CEE_BLT_UN)) ||
- ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
- (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
- ((ins->next->opcode == OP_CLT_UN) ||
- (ins->next->opcode == OP_CGT_UN)))
- s390_clr (code, ins->sreg1, s390_r0);
+ if (is_unsigned (ins->next))
+ s390_clr (code, ins->sreg1, s390_r0);
else
- s390_cr (code, ins->sreg1, s390_r0);
+ s390_cr (code, ins->sreg1, s390_r0);
}
else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- if ((ins->next) &&
- ((ins->next->opcode >= CEE_BNE_UN) &&
- (ins->next->opcode <= CEE_BLT_UN)) ||
- ((ins->next->opcode >= OP_COND_EXC_NE_UN) &&
- (ins->next->opcode <= OP_COND_EXC_LT_UN)) ||
- ((ins->next->opcode == OP_CLT_UN) &&
- (ins->next->opcode == OP_CGT_UN)))
+ if (is_unsigned (ins->next))
s390_cl (code, ins->sreg1, 0, s390_r13, 4);
else
s390_c (code, ins->sreg1, 0, s390_r13, 4);
}
}
break;
- case OP_X86_TEST_NULL: {
- s390_ltgr(code, ins->sreg1, ins->sreg1);
- }
- break;
- case CEE_BREAK: {
- s390_break (code);
+ case OP_BREAK: {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_ABS,
+ mono_break);
+ s390_llong (code, mono_break);
+ s390_lg (code, s390_r14, 0, s390_r13, 4);
+ s390_basr (code, s390_r14, s390_r14);
}
break;
case OP_ADDCC: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_algr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_COM;
+ s390_agr (code, ins->dreg, src2);
}
break;
- case CEE_ADD: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_agr (code, ins->dreg, ins->sreg2);
+ case OP_LADD: {
+ CHECK_SRCDST_COM;
+ s390_agr (code, ins->dreg, src2);
}
break;
case OP_ADC: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_alcgr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_COM;
+ s390_alcgr (code, ins->dreg, src2);
}
break;
case OP_ADD_IMM: {
- if ((ins->next) &&
- (ins->next->opcode == OP_ADC_IMM)) {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_alg (code, ins->dreg, 0, s390_r13, 4);
- } else {
- if (s390_is_imm16 (ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_aghi (code, ins->dreg, ins->inst_imm);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_ag (code, ins->dreg, 0, s390_r13, 4);
- }
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
}
- }
- break;
- case OP_ADC_IMM: {
if (s390_is_imm16 (ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_lghi (code, s390_r0, ins->inst_imm);
- s390_alcgr (code, ins->dreg, s390_r0);
+ s390_aghi (code, ins->dreg, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_alcgr(code, ins->dreg, s390_r13);
+ s390_ag (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
- case CEE_ADD_OVF: {
+ case OP_LADD_IMM: {
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
- s390_ar (code, ins->dreg, ins->sreg2);
- EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+ g_assert (s390_is_imm16 (ins->inst_imm));
+ s390_aghi (code, ins->dreg, ins->inst_imm);
}
break;
- case CEE_ADD_OVF_UN: {
+ case OP_ADC_IMM: {
if (ins->dreg != ins->sreg1) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
- s390_algr (code, ins->dreg, ins->sreg2);
+ if (s390_is_imm16 (ins->inst_imm)) {
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_alcgr (code, ins->dreg, s390_r0);
+ } else {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong (code, ins->inst_imm);
+ s390_lg (code, s390_r13, 0, s390_r13, 4);
+ s390_alcgr (code, ins->dreg, s390_r13);
+ }
+ }
+ break;
+ case OP_IADD_OVF:
+ case OP_S390_IADD_OVF: {
+ CHECK_SRCDST_COM;
+ s390_ar (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+ s390_lgfr (code, ins->dreg, ins->dreg);
+ }
+ break;
+ case OP_IADD_OVF_UN:
+ case OP_S390_IADD_OVF_UN: {
+ CHECK_SRCDST_COM;
+ s390_algr (code, ins->dreg, src2);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, "OverflowException");
+ s390_llgfr (code, ins->dreg, ins->dreg);
}
break;
case OP_ADD_OVF_CARRY: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_lghi (code, s390_r0, 0);
- s390_lgr (code, s390_r1, s390_r0);
- s390_alcgr(code, s390_r0, s390_r1);
- s390_agr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_COM;
+ s390_lghi (code, s390_r0, 0);
+ s390_lgr (code, s390_r1, s390_r0);
+ s390_alcgr (code, s390_r0, s390_r1);
+ s390_agr (code, ins->dreg, src2);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
- s390_agr (code, ins->dreg, s390_r0);
+ s390_agr (code, ins->dreg, s390_r0);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
}
break;
case OP_ADD_OVF_UN_CARRY: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_alcgr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_COM;
+ s390_alcgr (code, ins->dreg, src2);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, "OverflowException");
}
break;
case OP_SUBCC: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_slgr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM;
+ s390_sgr (code, ins->dreg, src2);
}
break;
- case CEE_SUB: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_sgr (code, ins->dreg, ins->sreg2);
+ case OP_LSUB: {
+ CHECK_SRCDST_NCOM;
+ s390_sgr (code, ins->dreg, src2);
}
break;
case OP_SBB: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_slbgr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM;
+ s390_slbgr(code, ins->dreg, src2);
}
break;
case OP_SUB_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (-ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_aghi (code, ins->dreg, -ins->inst_imm);
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_slgr (code, ins->dreg, s390_r0);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_sg (code, ins->dreg, 0, s390_r13, 4);
+ s390_slg (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
- case OP_SBB_IMM: {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_imm);
- s390_slg (code, ins->dreg, 0, s390_r13, 4);
- }
- break;
- case CEE_SUB_OVF: {
+ case OP_LSUB_IMM: {
if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
+ if (s390_is_imm16 (-ins->inst_imm)) {
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_slgr (code, ins->dreg, s390_r0);
+ } else {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, ins->inst_imm);
+ s390_slg (code, ins->dreg, 0, s390_r13, 4);
}
- s390_sgr (code, ins->dreg, ins->sreg2);
- EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
}
break;
- case CEE_SUB_OVF_UN: {
+ case OP_SBB_IMM: {
if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
+ if (s390_is_imm16 (-ins->inst_imm)) {
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_slbgr (code, ins->dreg, s390_r0);
+ } else {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, ins->inst_imm);
+ s390_slbg (code, ins->dreg, 0, s390_r13, 4);
}
- s390_slr (code, ins->dreg, ins->sreg2);
- EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
}
break;
case OP_SUB_OVF_CARRY: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_lghi (code, s390_r0, 0);
- s390_lgr (code, s390_r1, s390_r0);
- s390_slbr (code, s390_r0, s390_r1);
- s390_sr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM;
+ s390_lghi (code, s390_r0, 0);
+ s390_lgr (code, s390_r1, s390_r0);
+ s390_slbgr (code, s390_r0, s390_r1);
+ s390_sgr (code, ins->dreg, src2);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
- s390_agr (code, ins->dreg, s390_r0);
+ s390_agr (code, ins->dreg, s390_r0);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
}
break;
case OP_SUB_OVF_UN_CARRY: {
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_slbgr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM;
+ s390_slbgr (code, ins->dreg, src2);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
}
break;
- case CEE_AND: {
+ case OP_LAND: {
if (ins->sreg1 == ins->dreg) {
s390_ngr (code, ins->dreg, ins->sreg2);
}
else {
if (ins->sreg2 == ins->dreg) {
- s390_ngr (code, ins->dreg, ins->sreg1);
+ s390_ngr (code, ins->dreg, ins->sreg1);
}
else {
s390_lgr (code, ins->dreg, ins->sreg1);
}
break;
case OP_AND_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
s390_lghi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
s390_ngr (code, ins->dreg, s390_r0);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
s390_ng (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
- case CEE_DIV: {
- s390_lr (code, s390_r0, ins->sreg1);
- s390_srda (code, s390_r0, 0, 32);
- s390_dr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r1);
- }
- break;
- case CEE_DIV_UN: {
- s390_lr (code, s390_r0, ins->sreg1);
- s390_srdl (code, s390_r0, 0, 32);
- s390_dlr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r1);
+ case OP_LDIV: {
+ s390_lgr (code, s390_r1, ins->sreg1);
+ s390_dsgr (code, s390_r0, ins->sreg2);
+ s390_lgr (code, ins->dreg, s390_r1);
}
break;
- case OP_DIV_IMM: {
- if (s390_is_imm16 (ins->inst_imm)) {
- s390_lghi (code, s390_r13, ins->inst_imm);
- s390_lgr (code, s390_r0, ins->sreg1);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_imm);
- s390_lgr (code, s390_r0, ins->sreg1);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- }
- s390_srda (code, s390_r0, 0, 32);
- s390_dr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r1);
+ case OP_LDIV_UN: {
+ s390_lgr (code, s390_r1, ins->sreg1);
+ s390_lghi (code, s390_r0, 0);
+ s390_dlgr (code, s390_r0, ins->sreg2);
+ s390_lgr (code, ins->dreg, s390_r1);
}
break;
- case CEE_REM: {
- s390_lgr (code, s390_r0, ins->sreg1);
- s390_srda (code, s390_r0, 0, 32);
- s390_dr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r0);
+ case OP_LREM: {
+ s390_lgr (code, s390_r1, ins->sreg1);
+ s390_dsgr (code, s390_r0, ins->sreg2);
+ s390_lgr (code, ins->dreg, s390_r0);
break;
- case CEE_REM_UN:
- s390_lgr (code, s390_r0, ins->sreg1);
- s390_srdl (code, s390_r0, 0, 32);
- s390_dlr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r0);
}
- break;
- case OP_REM_IMM: {
- if (s390_is_imm16 (ins->inst_imm)) {
- s390_lghi (code, s390_r13, ins->inst_imm);
- s390_lgr (code, s390_r0, ins->sreg1);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_imm);
- s390_lgr (code, s390_r0, ins->sreg1);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- }
- s390_srda (code, s390_r0, 0, 32);
- s390_dr (code, s390_r0, ins->sreg2);
- s390_lgfr (code, ins->dreg, s390_r0);
+ case OP_LREM_UN: {
+ s390_lgr (code, s390_r1, ins->sreg1);
+ s390_lghi (code, s390_r0, 0);
+ s390_dlgr (code, s390_r0, ins->sreg2);
+ s390_lgr (code, ins->dreg, s390_r0);
}
break;
- case CEE_OR: {
+ case OP_LOR: {
if (ins->sreg1 == ins->dreg) {
s390_ogr (code, ins->dreg, ins->sreg2);
}
else {
if (ins->sreg2 == ins->dreg) {
- s390_ogr (code, ins->dreg, ins->sreg1);
+ s390_ogr (code, ins->dreg, ins->sreg1);
}
else {
- s390_lr (code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
s390_ogr (code, ins->dreg, ins->sreg2);
}
}
}
break;
case OP_OR_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
s390_lghi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
s390_ogr (code, ins->dreg, s390_r0);
} else {
- s390_bras (code, s390_r13, 4);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_og (code, ins->dreg, 0, s390_r13, 0);
+ s390_og (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
- case CEE_XOR: {
+ case OP_LXOR: {
if (ins->sreg1 == ins->dreg) {
s390_xgr (code, ins->dreg, ins->sreg2);
}
}
break;
case OP_XOR_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lghi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
+ s390_lghi (code, s390_r0, ins->inst_imm);
s390_xgr (code, ins->dreg, s390_r0);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
s390_xg (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
- case CEE_SHL:
case OP_LSHL: {
- if (ins->sreg1 != ins->dreg) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_sllg (code, ins->dreg, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_sllg (code, ins->dreg, ins->dreg, src2, 0);
}
break;
- case OP_SHL_IMM:
+ case OP_SHL_IMM:
case OP_LSHL_IMM: {
if (ins->sreg1 != ins->dreg) {
- s390_lgr (code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
}
- s390_sllg (code, ins->dreg, ins->dreg, 0,
- (ins->inst_imm & 0x1f));
+ s390_sllg (code, ins->dreg, ins->dreg, 0, (ins->inst_imm & 0x3f));
}
break;
- case CEE_SHR:
case OP_LSHR: {
- if (ins->sreg1 != ins->dreg) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_srag (code, ins->dreg, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_srag (code, ins->dreg, ins->dreg, src2, 0);
}
break;
- case OP_SHR_IMM:
+ case OP_SHR_IMM:
case OP_LSHR_IMM: {
if (ins->sreg1 != ins->dreg) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
- s390_srag (code, ins->dreg, ins->dreg, 0,
- (ins->inst_imm & 0x1f));
+ s390_srag (code, ins->dreg, ins->dreg, 0, (ins->inst_imm & 0x3f));
}
break;
- case OP_SHR_UN_IMM:
+ case OP_SHR_UN_IMM:
case OP_LSHR_UN_IMM: {
if (ins->sreg1 != ins->dreg) {
- s390_lgr (code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
}
- s390_srlg (code, ins->dreg, ins->dreg, 0,
- (ins->inst_imm & 0x1f));
+ s390_srlg (code, ins->dreg, ins->dreg, 0, (ins->inst_imm & 0x3f));
}
break;
- case CEE_SHR_UN:
case OP_LSHR_UN: {
- if (ins->sreg1 != ins->dreg) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
- s390_srlg (code, ins->dreg, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_srlg (code, ins->dreg, ins->dreg, src2, 0);
}
break;
- case CEE_NOT: {
+ case OP_LNOT: {
if (ins->sreg1 != ins->dreg) {
s390_lgr (code, ins->dreg, ins->sreg1);
}
s390_xgr (code, ins->dreg, s390_r0);
}
break;
- case CEE_NEG: {
+ case OP_LNEG: {
s390_lcgr (code, ins->dreg, ins->sreg1);
}
break;
- case CEE_MUL: {
- if (ins->sreg1 == ins->dreg) {
- s390_msgr (code, ins->dreg, ins->sreg2);
- }
- else {
- if (ins->sreg2 == ins->dreg) {
- s390_msgr (code, ins->dreg, ins->sreg1);
- }
- else {
- s390_lgr (code, ins->dreg, ins->sreg1);
- s390_msgr (code, ins->dreg, ins->sreg2);
- }
- }
+ case OP_LMUL: {
+ CHECK_SRCDST_COM;
+ s390_msgr (code, ins->dreg, src2);
}
break;
- case OP_MUL_IMM: {
+ case OP_MUL_IMM:
+ case OP_LMUL_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lghi (code, s390_r13, ins->inst_imm);
+ s390_lghi (code, s390_r13, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong(code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lgr (code, ins->dreg, ins->sreg1);
- }
s390_lg (code, s390_r13, 0, s390_r13, 4);
}
s390_msgr (code, ins->dreg, s390_r13);
}
break;
- case CEE_MUL_OVF: {
+ case OP_LMUL_OVF: {
short int *o[2];
s390_ltgr (code, s390_r1, ins->sreg1);
s390_jz (code, 0); CODEPTR(code, o[0]);
s390_xgr (code, s390_r0, s390_r1);
s390_msgr (code, s390_r1, ins->sreg2);
s390_xgr (code, s390_r0, s390_r1);
- s390_srlg (code, s390_r0, s390_r0, 0, 64);
+ s390_srlg (code, s390_r0, s390_r0, 0, 63);
s390_ltgr (code, s390_r0, s390_r0);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
PTRSLOT (code, o[0]);
s390_lgr (code, ins->dreg, s390_r1);
}
break;
- case CEE_MUL_OVF_UN: {
- s390_lghi (code, s390_r0, 0);
- s390_lgr (code, s390_r1, ins->sreg1);
- s390_mlgr (code, s390_r0, ins->sreg2);
- s390_ltgr (code, s390_r0, s390_r0);
+ case OP_LMUL_OVF_UN: {
+ s390_lghi (code, s390_r0, 0);
+ s390_lgr (code, s390_r1, ins->sreg1);
+ s390_mlgr (code, s390_r0, ins->sreg2);
+ s390_ltgr (code, s390_r0, s390_r0);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
- s390_lgr (code, ins->dreg, s390_r1);
+ s390_lgr (code, ins->dreg, s390_r1);
}
break;
case OP_IADDCC: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_alr (code, ins->dreg, ins->sreg2);
+ g_assert_not_reached ();
+ CHECK_SRCDST_COM_I;
+ s390_algr (code, ins->dreg, src2);
}
break;
case OP_IADD: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_ar (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_COM_I;
+ s390_agr (code, ins->dreg, src2);
}
break;
case OP_IADC: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_alcr (code, ins->dreg, ins->sreg2);
+ g_assert_not_reached ();
+ CHECK_SRCDST_COM_I;
+ s390_alcgr (code, ins->dreg, src2);
}
break;
case OP_IADD_IMM: {
- if ((ins->next) &&
- (ins->next->opcode == OP_ADC_IMM)) {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
+ if (s390_is_imm16 (ins->inst_imm)) {
+ s390_aghi(code, ins->dreg, ins->inst_imm);
+ } else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_al (code, ins->dreg, 0, s390_r13, 4);
- } else {
- if (s390_is_imm16 (ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_ahi (code, ins->dreg, ins->inst_imm);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 4);
- s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_a (code, ins->dreg, 0, s390_r13, 4);
- }
+ s390_agf (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
case OP_IADC_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_lhi (code, s390_r0, ins->inst_imm);
- s390_alcr (code, ins->dreg, s390_r0);
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_alcgr (code, ins->dreg, s390_r0);
} else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 4);
- s390_word (code, ins->inst_imm);
- s390_l (code, s390_r13, 0, s390_r13, 4);
- s390_alcr (code, ins->dreg, s390_r13);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 4);
+ s390_word (code, ins->inst_imm);
+ s390_lgf (code, s390_r13, 0, s390_r13, 4);
+ s390_alcgr (code, ins->dreg, s390_r13);
}
}
break;
+ case OP_LADD_OVF:
+ case OP_S390_LADD_OVF: {
+ CHECK_SRCDST_COM;
+ s390_agr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+ }
+ break;
+ case OP_LADD_OVF_UN:
+ case OP_S390_LADD_OVF_UN: {
+ CHECK_SRCDST_COM;
+ s390_algr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, "OverflowException");
+ }
+ break;
case OP_ISUBCC: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_slr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM_I;
+ s390_slgr (code, ins->dreg, src2);
}
break;
case OP_ISUB: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_sr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM_I;
+ s390_sgr (code, ins->dreg, src2);
}
break;
case OP_ISBB: {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_slbr (code, ins->dreg, ins->sreg2);
+ CHECK_SRCDST_NCOM_I;
+ s390_slbgr (code, ins->dreg, src2);
}
break;
case OP_ISUB_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (-ins->inst_imm)) {
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_ahi (code, ins->dreg, -ins->inst_imm);
+ s390_aghi (code, ins->dreg, -ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_s (code, ins->dreg, 0, s390_r13, 4);
+ s390_sgf (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- s390_sl (code, ins->dreg, 0, s390_r13, 4);
+ s390_slgf (code, ins->dreg, 0, s390_r13, 4);
+ }
+ break;
+ case OP_ISUB_OVF:
+ case OP_S390_ISUB_OVF: {
+ CHECK_SRCDST_NCOM;
+ s390_sr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+ s390_lgfr (code, ins->dreg, ins->dreg);
+ }
+ break;
+ case OP_ISUB_OVF_UN:
+ case OP_S390_ISUB_OVF_UN: {
+ CHECK_SRCDST_NCOM;
+ s390_slr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
+ s390_llgfr(code, ins->dreg, ins->dreg);
+ }
+ break;
+ case OP_LSUB_OVF:
+ case OP_S390_LSUB_OVF: {
+ CHECK_SRCDST_NCOM;
+ s390_sgr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, "OverflowException");
+ }
+ break;
+ case OP_LSUB_OVF_UN:
+ case OP_S390_LSUB_OVF_UN: {
+ CHECK_SRCDST_NCOM;
+ s390_slgr (code, ins->dreg, src2);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, "OverflowException");
}
break;
case OP_IAND: {
- if (ins->sreg1 == ins->dreg) {
- s390_nr (code, ins->dreg, ins->sreg2);
- }
- else {
- if (ins->sreg2 == ins->dreg) {
- s390_nr (code, ins->dreg, ins->sreg1);
- }
- else {
- s390_lr (code, ins->dreg, ins->sreg1);
- s390_nr (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_NCOM_I;
+ s390_ngr (code, ins->dreg, src2);
}
break;
case OP_IAND_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_nr (code, ins->dreg, s390_r0);
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_ngr (code, ins->dreg, s390_r0);
} else {
s390_basr (code, s390_r13, 0);
- s390_j (code, 4);
- s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_n (code, ins->dreg, 0, s390_r13, 4);
+ s390_j (code, 6);
+ s390_llong(code, ins->inst_imm);
+ s390_ng (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
case OP_IDIV: {
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lgfr (code, s390_r0, ins->sreg1);
s390_srda (code, s390_r0, 0, 32);
s390_dr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r1);
+ s390_lgfr (code, ins->dreg, s390_r1);
}
break;
case OP_IDIV_UN: {
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lgfr (code, s390_r0, ins->sreg1);
s390_srdl (code, s390_r0, 0, 32);
s390_dlr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r1);
+ s390_lgfr (code, ins->dreg, s390_r1);
}
break;
case OP_IDIV_IMM: {
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r13, ins->inst_imm);
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lghi (code, s390_r13, ins->inst_imm);
+ s390_lgfr (code, s390_r0, ins->sreg1);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- s390_lr (code, s390_r0, ins->sreg1);
- s390_l (code, s390_r13, 0, s390_r13, 4);
+ s390_lgfr (code, s390_r0, ins->sreg1);
+ s390_lgf (code, s390_r13, 0, s390_r13, 4);
}
s390_srda (code, s390_r0, 0, 32);
s390_dr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r1);
+ s390_lgfr (code, ins->dreg, s390_r1);
}
break;
case OP_IREM: {
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lgfr (code, s390_r0, ins->sreg1);
s390_srda (code, s390_r0, 0, 32);
s390_dr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r0);
+ s390_lgfr (code, ins->dreg, s390_r0);
break;
case OP_IREM_UN:
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lgfr (code, s390_r0, ins->sreg1);
s390_srdl (code, s390_r0, 0, 32);
s390_dlr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r0);
+ s390_lgfr (code, ins->dreg, s390_r0);
}
break;
case OP_IREM_IMM: {
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r13, ins->inst_imm);
- s390_lr (code, s390_r0, ins->sreg1);
+ s390_lghi (code, s390_r13, ins->inst_imm);
+ s390_lgfr (code, s390_r0, ins->sreg1);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- s390_lr (code, s390_r0, ins->sreg1);
- s390_l (code, s390_r13, 0, s390_r13, 4);
+ s390_lgfr (code, s390_r0, ins->sreg1);
+ s390_lgf (code, s390_r13, 0, s390_r13, 4);
}
s390_srda (code, s390_r0, 0, 32);
s390_dr (code, s390_r0, ins->sreg2);
- s390_lr (code, ins->dreg, s390_r0);
+ s390_lgfr (code, ins->dreg, s390_r0);
}
break;
case OP_IOR: {
- if (ins->sreg1 == ins->dreg) {
- s390_or (code, ins->dreg, ins->sreg2);
- }
- else {
- if (ins->sreg2 == ins->dreg) {
- s390_or (code, ins->dreg, ins->sreg1);
- }
- else {
- s390_lr (code, ins->dreg, ins->sreg1);
- s390_or (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_COM_I;
+ s390_ogr (code, ins->dreg, src2);
}
break;
case OP_IOR_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_or (code, ins->dreg, s390_r0);
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_ogr (code, ins->dreg, s390_r0);
} else {
- s390_bras (code, s390_r13, 4);
- s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_o (code, ins->dreg, 0, s390_r13, 0);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, ins->inst_imm);
+ s390_og (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
case OP_IXOR: {
- if (ins->sreg1 == ins->dreg) {
- s390_xr (code, ins->dreg, ins->sreg2);
- }
- else {
- if (ins->sreg2 == ins->dreg) {
- s390_xr (code, ins->dreg, ins->sreg1);
- }
- else {
- s390_lr (code, ins->dreg, ins->sreg1);
- s390_xr (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_COM_I;
+ s390_xgr (code, ins->dreg, src2);
}
break;
case OP_IXOR_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r0, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_xr (code, ins->dreg, s390_r0);
+ s390_lghi (code, s390_r0, ins->inst_imm);
+ s390_xgr (code, ins->dreg, s390_r0);
} else {
s390_basr (code, s390_r13, 0);
- s390_j (code, 4);
- s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_x (code, ins->dreg, 0, s390_r13, 4);
+ s390_j (code, 6);
+ s390_llong(code, ins->inst_imm);
+ s390_xg (code, ins->dreg, 0, s390_r13, 4);
}
}
break;
case OP_ISHL: {
- if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_sll (code, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_sll (code, ins->dreg, src2, 0);
}
break;
case OP_ISHL_IMM: {
if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
+ s390_lgfr (code, ins->dreg, ins->sreg1);
}
- s390_sll (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+ s390_sll (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
}
break;
case OP_ISHR: {
- if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_sra (code, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_sra (code, ins->dreg, src2, 0);
}
break;
case OP_ISHR_IMM: {
if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
+ s390_lgfr (code, ins->dreg, ins->sreg1);
}
- s390_sra (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+ s390_sra (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
}
break;
case OP_ISHR_UN_IMM: {
if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
+ s390_lgfr (code, ins->dreg, ins->sreg1);
}
- s390_srl (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
+ s390_srl (code, ins->dreg, 0, (ins->inst_imm & 0x1f));
}
break;
case OP_ISHR_UN: {
- if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_srl (code, ins->dreg, ins->sreg2, 0);
+ CHECK_SRCDST_NCOM;
+ s390_srl (code, ins->dreg, src2, 0);
}
break;
case OP_INOT: {
if (ins->sreg1 != ins->dreg) {
- s390_lr (code, ins->dreg, ins->sreg1);
+ s390_lgfr (code, ins->dreg, ins->sreg1);
}
- s390_lhi (code, s390_r0, -1);
- s390_xr (code, ins->dreg, s390_r0);
+ s390_lghi (code, s390_r0, -1);
+ s390_xgr (code, ins->dreg, s390_r0);
}
break;
case OP_INEG: {
- s390_lcr (code, ins->dreg, ins->sreg1);
+ s390_lcgr (code, ins->dreg, ins->sreg1);
}
break;
case OP_IMUL: {
- if (ins->sreg1 == ins->dreg) {
- s390_msr (code, ins->dreg, ins->sreg2);
- }
- else {
- if (ins->sreg2 == ins->dreg) {
- s390_msr (code, ins->dreg, ins->sreg1);
- }
- else {
- s390_lr (code, ins->dreg, ins->sreg1);
- s390_msr (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_COM_I;
+ s390_msr (code, ins->dreg, src2);
}
break;
case OP_IMUL_IMM: {
+ if (ins->dreg != ins->sreg1) {
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ }
if (s390_is_imm16 (ins->inst_imm)) {
- s390_lhi (code, s390_r13, ins->inst_imm);
+ s390_lghi (code, s390_r13, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
s390_word (code, ins->inst_imm);
- if (ins->dreg != ins->sreg1) {
- s390_lr (code, ins->dreg, ins->sreg1);
- }
- s390_l (code, s390_r13, 0, s390_r13, 4);
+ s390_lgf (code, s390_r13, 0, s390_r13, 4);
}
s390_msr (code, ins->dreg, s390_r13);
}
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
PTRSLOT (code, o[0]);
PTRSLOT (code, o[1]);
- s390_lr (code, ins->dreg, s390_r1);
+ s390_lgfr (code, ins->dreg, s390_r1);
}
break;
case OP_IMUL_OVF_UN: {
s390_mlr (code, s390_r0, ins->sreg2);
s390_ltr (code, s390_r0, s390_r0);
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NZ, "OverflowException");
- s390_lr (code, ins->dreg, s390_r1);
+ s390_lgfr (code, ins->dreg, s390_r1);
}
break;
- case OP_ICONST:
- case OP_I8CONST:
- case OP_SETREGIMM: {
+ case OP_ICONST:
+ case OP_I8CONST: {
if (s390_is_imm16(ins->inst_c0)) {
s390_lghi (code, ins->dreg, ins->inst_c0);
} else {
s390_lg (code,ins->dreg, 0, s390_r13, 4);
}
break;
- case CEE_CONV_I:
- case CEE_CONV_I4:
- case CEE_CONV_I8:
- case CEE_CONV_U:
- case CEE_CONV_U4:
- case CEE_CONV_OVF_U4:
- case CEE_CONV_U8:
+ case OP_JUMP_TABLE: {
+ mono_add_patch_info (cfg, code - cfg->native_code,
+ (MonoJumpInfoType)ins->inst_i1, ins->inst_p0);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong (code, 0);
+ s390_lg (code, ins->dreg, 0, s390_r13, 4);
+ }
+ break;
case OP_MOVE:
- case OP_SETREG: {
if (ins->dreg != ins->sreg1) {
- s390_lgr(code, ins->dreg, ins->sreg1);
+ s390_lgr (code, ins->dreg, ins->sreg1);
}
- }
break;
- case OP_SETFREG:
- case OP_FMOVE: {
+ case OP_LCONV_TO_I:
+ case OP_LCONV_TO_I8:
+ case OP_SEXT_I4:
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ break;
+ case OP_LCONV_TO_I4:
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ break;
+ case OP_LCONV_TO_U:
+ case OP_LCONV_TO_U8:
+ case OP_LCONV_TO_U4:
+ case OP_ZEXT_I4:
+ s390_llgfr (code, ins->dreg, ins->sreg1);
+ break;
+ case OP_LCONV_TO_OVF_U4:
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, 4294967295);
+ s390_clg (code, ins->sreg1, 0, s390_r13, 4);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_GT, "OverflowException");
+ s390_ltgr (code, ins->sreg1, ins->sreg1);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_LT, "OverflowException");
+ s390_llgfr(code, ins->dreg, ins->sreg1);
+ break;
+ case OP_LCONV_TO_OVF_I4_UN:
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, 2147483647);
+ s390_cg (code, ins->sreg1, 0, s390_r13, 4);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_GT, "OverflowException");
+ s390_ltgr (code, ins->sreg1, ins->sreg1);
+ EMIT_COND_SYSTEM_EXCEPTION (S390_CC_LT, "OverflowException");
+ s390_lgfr (code, ins->dreg, ins->sreg1);
+ break;
+ case OP_FMOVE:
+ case OP_FCONV_TO_R4: {
if (ins->dreg != ins->sreg1) {
s390_ldr (code, ins->dreg, ins->sreg1);
}
s390_ledbr (code, ins->dreg, ins->sreg1);
}
break;
- case OP_FCONV_TO_R4: {
- if ((ins->next) &&
- (ins->next->opcode != OP_STORER4_MEMBASE_REG))
- s390_ledbr (code, ins->dreg, ins->sreg1);
- }
- break;
- case CEE_JMP: {
- int fParm;
+ case OP_JMP: {
if (cfg->method->save_lmf)
- code = restoreLMF(cfg, code);
+ restoreLMF(code, cfg->frame_reg, cfg->stack_usage);
if (cfg->flags & MONO_CFG_HAS_TAIL) {
- s390_lmg(code, s390_r2, s390_r5, STK_BASE,
- S390_PARM_SAVE_OFFSET);
- for (fParm = 0; fParm < 4; fParm ++)
- s390_ld (code, fParm, 0, STK_BASE,
- S390_FLOAT_SAVE_OFFSET+fParm*sizeof(double));
+ code = emit_load_volatile_arguments (code, cfg);
}
code = backUpStackPtr(cfg, code);
- s390_lg (code, s390_r14, 0, STK_BASE, S390_RET_ADDR_OFFSET);
- s390_basr (code, s390_r10, 0);
- s390_j (code, 6);
+ s390_lg (code, s390_r14, 0, STK_BASE, S390_RET_ADDR_OFFSET);
mono_add_patch_info (cfg, code - cfg->native_code,
MONO_PATCH_INFO_METHOD_JUMP,
ins->inst_p0);
- s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r10, 4);
- s390_basr (code, s390_r0, s390_r1);
+ s390_jcl (code, S390_CC_UN, 0);
}
break;
case OP_CHECK_THIS: {
s390_ltgr (code, s390_r0, s390_r0);
}
break;
+ case OP_ARGLIST: {
+ int offset = cfg->sig_cookie + cfg->stack_usage;
+
+ if (s390_is_imm16 (offset))
+ s390_lghi (code, s390_r0, offset);
+ else {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, offset);
+ s390_lg (code, s390_r0, 0, s390_r13, 0);
+ }
+ s390_agr (code, s390_r0, cfg->frame_reg);
+ s390_stg (code, s390_r0, 0, ins->sreg1, 0);
+ }
+ break;
case OP_FCALL: {
- s390_basr (code, s390_r10, 0);
+ s390_basr (code, s390_r13, 0);
s390_j (code, 6);
call = (MonoCallInst*)ins;
if (ins->flags & MONO_INST_HAS_METHOD)
MONO_PATCH_INFO_ABS,
call->fptr);
s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r10, 4);
- s390_basr (code, s390_r14, s390_r1);
+ s390_lg (code, s390_r14, 0, s390_r13, 4);
+ s390_basr (code, s390_r14, s390_r14);
if (call->signature->ret->type == MONO_TYPE_R4)
s390_ldebr (code, s390_f0, s390_f0);
}
break;
case OP_LCALL:
case OP_VCALL:
+ case OP_VCALL2:
case OP_VOIDCALL:
- case CEE_CALL: {
- s390_basr (code, s390_r10, 0);
+ case OP_CALL: {
+ s390_basr (code, s390_r13, 0);
s390_j (code, 6);
call = (MonoCallInst*)ins;
if (ins->flags & MONO_INST_HAS_METHOD)
MONO_PATCH_INFO_ABS,
call->fptr);
s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r10, 4);
- s390_basr (code, s390_r14, s390_r1);
+ s390_lg (code, s390_r14, 0, s390_r13, 4);
+ s390_basr (code, s390_r14, s390_r14);
}
break;
case OP_FCALL_REG: {
break;
case OP_LCALL_REG:
case OP_VCALL_REG:
+ case OP_VCALL2_REG:
case OP_VOIDCALL_REG:
case OP_CALL_REG: {
s390_lgr (code, s390_r1, ins->sreg1);
break;
case OP_LCALL_MEMBASE:
case OP_VCALL_MEMBASE:
+ case OP_VCALL2_MEMBASE:
case OP_VOIDCALL_MEMBASE:
case OP_CALL_MEMBASE: {
s390_lg (code, s390_r1, 0, ins->sreg1, ins->inst_offset);
g_assert_not_reached ();
break;
case OP_LOCALLOC: {
- int alloca_skip = S390_MINIMAL_STACK_SIZE + cfg->param_area +
- S390_STACK_ALIGNMENT - 1;
+ int alloca_skip = S390_MINIMAL_STACK_SIZE + cfg->param_area;
int area_offset = S390_ALIGN(alloca_skip, S390_STACK_ALIGNMENT);
s390_lgr (code, s390_r1, ins->sreg1);
+ if (ins->flags & MONO_INST_INIT)
+ s390_lgr (code, s390_r0, ins->sreg1);
s390_aghi (code, s390_r1, 14);
s390_srlg (code, s390_r1, s390_r1, 0, 3);
s390_sllg (code, s390_r1, s390_r1, 0, 3);
- s390_lg (code, s390_r13, 0, STK_BASE, 0);
- s390_lcgr (code, s390_r1, s390_r1);
- s390_la (code, STK_BASE, STK_BASE, s390_r1, 0);
+ if (cfg->method->save_lmf) {
+ /*----------------------------------*/
+ /* we have to adjust lmf ebp value */
+ /*----------------------------------*/
+ int lmfOffset = cfg->stack_usage - sizeof(MonoLMF);
+
+ s390_lgr (code, s390_r13, cfg->frame_reg);
+ if (s390_is_imm16(lmfOffset))
+ s390_aghi (code, s390_r13, lmfOffset);
+ else {
+ s390_basr (code, s390_r14, 0);
+ s390_j (code, 4);
+ s390_word (code, lmfOffset);
+ s390_agf (code, s390_r13, 0, s390_r14, 4);
+ }
+ s390_lgr (code, s390_r14, STK_BASE);
+ s390_sgr (code, s390_r14, s390_r1);
+ s390_stg (code, s390_r14, 0, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, ebp));
+ }
+ s390_lg (code, s390_r13, 0, STK_BASE, 0);
+ s390_sgr (code, STK_BASE, s390_r1);
s390_stg (code, s390_r13, 0, STK_BASE, 0);
s390_la (code, ins->dreg, 0, STK_BASE, area_offset);
s390_srlg (code, ins->dreg, ins->dreg, 0, 3);
s390_sllg (code, ins->dreg, ins->dreg, 0, 3);
+ if (ins->flags & MONO_INST_INIT) {
+ s390_lgr (code, s390_r1, s390_r0);
+ s390_lgr (code, s390_r0, ins->dreg);
+ s390_lgr (code, s390_r14, s390_r12);
+ s390_lghi (code, s390_r13, 0);
+ s390_mvcle(code, s390_r0, s390_r12, 0, 0);
+ s390_jo (code, -2);
+ s390_lgr (code, s390_r12, s390_r14);
+ }
}
break;
- case CEE_RET: {
- s390_br (code, s390_r14);
+ case OP_THROW: {
+ s390_lgr (code, s390_r2, ins->sreg1);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ mono_add_patch_info (cfg, code-cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD,
+ (gpointer) "mono_arch_throw_exception");
+ s390_llong(code, 0);
+ s390_lg (code, s390_r14, 0, s390_r13, 4);
+ s390_basr (code, s390_r14, s390_r14);
}
break;
- case CEE_THROW: {
+ case OP_RETHROW: {
s390_lgr (code, s390_r2, ins->sreg1);
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
mono_add_patch_info (cfg, code-cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD,
- (gpointer)"mono_arch_throw_exception");
+ (gpointer) "mono_arch_rethrow_exception");
s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r13, 4);
- s390_basr (code, s390_r14, s390_r1);
+ s390_lg (code, s390_r14, 0, s390_r13, 4);
+ s390_basr (code, s390_r14, s390_r14);
}
break;
case OP_START_HANDLER: {
- if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
- s390_stg (code, s390_r14, 0,
- ins->inst_left->inst_basereg,
- ins->inst_left->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_left->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_stg (code, s390_r14, s390_r13,
- ins->inst_left->inst_basereg, 0);
- }
+ MonoInst *spvar = mono_find_spvar_for_region (cfg, bb->region);
+
+ S390_LONG (code, stg, stg, s390_r14, 0,
+ spvar->inst_basereg,
+ spvar->inst_offset);
}
break;
case OP_ENDFILTER: {
+ MonoInst *spvar = mono_find_spvar_for_region (cfg, bb->region);
+
if (ins->sreg1 != s390_r2)
s390_lgr(code, s390_r2, ins->sreg1);
- if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
- s390_l (code, s390_r14, 0, ins->inst_left->inst_basereg,
- ins->inst_left->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_left->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lg (code, s390_r14, s390_r13,
- ins->inst_left->inst_basereg, 0);
- }
+ S390_LONG (code, lg, lg, s390_r14, 0,
+ spvar->inst_basereg,
+ spvar->inst_offset);
s390_br (code, s390_r14);
}
break;
- case CEE_ENDFINALLY: {
- if (s390_is_uimm12 (ins->inst_left->inst_offset)) {
- s390_lg (code, s390_r14, 0, ins->inst_left->inst_basereg,
- ins->inst_left->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_left->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_lg (code, s390_r14, s390_r13,
- ins->inst_left->inst_basereg, 0);
- }
+ case OP_ENDFINALLY: {
+ MonoInst *spvar = mono_find_spvar_for_region (cfg, bb->region);
+
+ S390_LONG (code, lg, lg, s390_r14, 0,
+ spvar->inst_basereg,
+ spvar->inst_offset);
s390_br (code, s390_r14);
}
break;
ins->inst_c0 = code - cfg->native_code;
}
break;
- case CEE_BR:
+ case OP_NOP:
+ case OP_DUMMY_USE:
+ case OP_DUMMY_STORE:
+ case OP_NOT_REACHED:
+ case OP_NOT_NULL: {
+ }
+ break;
+ case OP_BR:
EMIT_UNCOND_BRANCH(ins);
break;
case OP_BR_REG: {
}
break;
case OP_CEQ:
- case OP_ICEQ: {
+ case OP_ICEQ:
+ case OP_LCEQ: {
s390_lghi(code, ins->dreg, 1);
s390_jz (code, 4);
s390_lghi(code, ins->dreg, 0);
}
break;
case OP_CLT:
- case OP_ICLT: {
+ case OP_ICLT:
+ case OP_LCLT: {
s390_lghi(code, ins->dreg, 1);
s390_jl (code, 4);
s390_lghi(code, ins->dreg, 0);
}
break;
case OP_CLT_UN:
- case OP_ICLT_UN: {
+ case OP_ICLT_UN:
+ case OP_LCLT_UN: {
s390_lghi(code, ins->dreg, 1);
s390_jlo (code, 4);
s390_lghi(code, ins->dreg, 0);
}
break;
case OP_CGT:
- case OP_ICGT: {
+ case OP_ICGT:
+ case OP_LCGT: {
s390_lghi(code, ins->dreg, 1);
s390_jh (code, 4);
s390_lghi(code, ins->dreg, 0);
}
break;
case OP_CGT_UN:
- case OP_ICGT_UN: {
+ case OP_ICGT_UN:
+ case OP_LCGT_UN: {
s390_lghi(code, ins->dreg, 1);
s390_jho (code, 4);
s390_lghi(code, ins->dreg, 0);
}
break;
case OP_COND_EXC_EQ:
+ case OP_COND_EXC_IEQ:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_EQ, ins->inst_p1);
break;
case OP_COND_EXC_NE_UN:
+ case OP_COND_EXC_INE_UN:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NE, ins->inst_p1);
break;
case OP_COND_EXC_LT:
+ case OP_COND_EXC_ILT:
case OP_COND_EXC_LT_UN:
+ case OP_COND_EXC_ILT_UN:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_LT, ins->inst_p1);
break;
case OP_COND_EXC_GT:
+ case OP_COND_EXC_IGT:
case OP_COND_EXC_GT_UN:
+ case OP_COND_EXC_IGT_UN:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_GT, ins->inst_p1);
break;
case OP_COND_EXC_GE:
+ case OP_COND_EXC_IGE:
case OP_COND_EXC_GE_UN:
+ case OP_COND_EXC_IGE_UN:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_GE, ins->inst_p1);
break;
case OP_COND_EXC_LE:
+ case OP_COND_EXC_ILE:
case OP_COND_EXC_LE_UN:
+ case OP_COND_EXC_ILE_UN:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_LE, ins->inst_p1);
break;
case OP_COND_EXC_OV:
+ case OP_COND_EXC_IOV:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_OV, ins->inst_p1);
break;
case OP_COND_EXC_NO:
+ case OP_COND_EXC_INO:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NO, ins->inst_p1);
break;
case OP_COND_EXC_C:
+ case OP_COND_EXC_IC:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_CY, ins->inst_p1);
break;
case OP_COND_EXC_NC:
+ case OP_COND_EXC_INC:
EMIT_COND_SYSTEM_EXCEPTION (S390_CC_NC, ins->inst_p1);
break;
- case CEE_BEQ:
+ case OP_LBEQ:
case OP_IBEQ:
EMIT_COND_BRANCH (ins, S390_CC_EQ);
break;
- case CEE_BNE_UN:
+ case OP_LBNE_UN:
case OP_IBNE_UN:
EMIT_COND_BRANCH (ins, S390_CC_NE);
break;
- case CEE_BLT:
- case CEE_BLT_UN:
+ case OP_LBLT:
+ case OP_LBLT_UN:
case OP_IBLT:
case OP_IBLT_UN:
EMIT_COND_BRANCH (ins, S390_CC_LT);
break;
- case CEE_BGT:
- case CEE_BGT_UN:
+ case OP_LBGT:
+ case OP_LBGT_UN:
case OP_IBGT:
case OP_IBGT_UN:
EMIT_COND_BRANCH (ins, S390_CC_GT);
break;
- case CEE_BGE:
- case CEE_BGE_UN:
+ case OP_LBGE:
+ case OP_LBGE_UN:
case OP_IBGE:
case OP_IBGE_UN:
EMIT_COND_BRANCH (ins, S390_CC_GE);
break;
- case CEE_BLE:
- case CEE_BLE_UN:
+ case OP_LBLE:
+ case OP_LBLE_UN:
case OP_IBLE:
case OP_IBLE_UN:
EMIT_COND_BRANCH (ins, S390_CC_LE);
s390_basr (code, s390_r13, 0);
s390_j (code, 6);
s390_llong (code, ins->inst_p0);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
+ s390_lg (code, s390_r13, 0, s390_r13, 4);
s390_ld (code, ins->dreg, 0, s390_r13, 0);
}
}
}
break;
case OP_STORER8_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_std (code, ins->sreg1, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_std (code, ins->sreg1, s390_r13, ins->inst_destbasereg, 0);
- }
+ S390_LONG (code, stdy, std, ins->sreg1, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_LOADR8_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_ld (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_ld (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, ldy, ld, ins->dreg, 0,
+ ins->inst_basereg, ins->inst_offset);
}
break;
case OP_STORER4_MEMBASE_REG: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_ledbr(code, s390_f15, ins->sreg1);
- s390_ste (code, s390_f15, 0, ins->inst_destbasereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_ledbr(code, s390_f15, ins->sreg1);
- s390_ste (code, s390_f15, s390_r13, ins->inst_destbasereg, 0);
- }
+ s390_ledbr (code, s390_f15, ins->sreg1);
+ S390_LONG (code, stey, ste, s390_f15, 0,
+ ins->inst_destbasereg, ins->inst_offset);
}
break;
case OP_LOADR4_MEMBASE: {
- if (s390_is_uimm12(ins->inst_offset)) {
- s390_ldeb (code, ins->dreg, 0, ins->inst_basereg, ins->inst_offset);
- } else {
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- s390_llong(code, ins->inst_offset);
- s390_lg (code, s390_r13, 0, s390_r13, 4);
- s390_ldeb (code, ins->dreg, s390_r13, ins->inst_basereg, 0);
- }
+ S390_LONG (code, ldy, ld, s390_f15, 0,
+ ins->inst_basereg, ins->inst_offset);
+ s390_ldebr (code, ins->dreg, s390_f15);
}
break;
- case CEE_CONV_R_UN: {
+ case OP_ICONV_TO_R_UN: {
s390_cdfbr (code, ins->dreg, ins->sreg1);
+ s390_ltr (code, ins->sreg1, ins->sreg1);
+ s390_jnl (code, 12);
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_word (code, 0x41f00000);
+ s390_word (code, 0);
+ s390_adb (code, ins->dreg, 0, s390_r13, 4);
+ }
+ break;
+ case OP_LCONV_TO_R_UN: {
+ s390_cdgbr (code, ins->dreg, ins->sreg1);
s390_ltgr (code, ins->sreg1, ins->sreg1);
s390_jnl (code, 12);
s390_basr (code, s390_r13, 0);
s390_adb (code, ins->dreg, 0, s390_r13, 4);
}
break;
- case CEE_CONV_R4: {
- s390_cdfbr (code, ins->dreg, ins->sreg1);
+ case OP_LCONV_TO_R4:
+ case OP_ICONV_TO_R4: {
+ s390_cdgbr (code, ins->dreg, ins->sreg1);
}
break;
- case CEE_CONV_R8: {
- s390_cdfbr (code, ins->dreg, ins->sreg1);
+ case OP_LCONV_TO_R8:
+ case OP_ICONV_TO_R8: {
+ s390_cdgbr (code, ins->dreg, ins->sreg1);
}
break;
case OP_FCONV_TO_I1:
code = emit_float_to_int (cfg, code, ins->dreg, ins->sreg1, 4, FALSE);
break;
case OP_FCONV_TO_I8:
- case OP_FCONV_TO_U8:
- g_assert_not_reached ();
- /* Implemented as helper calls */
- break;
- case OP_LCONV_TO_R_UN:
- g_assert_not_reached ();
- /* Implemented as helper calls */
+ s390_cgdbr (code, ins->dreg, 5, ins->sreg1);
break;
case OP_LCONV_TO_OVF_I: {
/* Valid ints: 0xffffffff:8000000 to 00000000:0x7f000000 */
PTRSLOT(code, o[4]);
}
break;
+ case OP_ABS: {
+ s390_lpdbr (code, ins->dreg, ins->sreg1);
+ }
+ break;
case OP_SQRT: {
s390_sqdbr (code, ins->dreg, ins->sreg1);
}
break;
case OP_FADD: {
- if (ins->dreg == ins->sreg1)
- s390_adbr (code, ins->dreg, ins->sreg2);
- else {
- if (ins->dreg == ins->sreg2)
- s390_adbr (code, ins->dreg, ins->sreg1);
- else {
- s390_ldr (code, ins->dreg, ins->sreg1);
- s390_adbr (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_COM_F;
+ s390_adbr (code, ins->dreg, src2);
}
break;
case OP_FSUB: {
- if (ins->dreg == ins->sreg1)
- s390_sdbr (code, ins->dreg, ins->sreg2);
- else {
- s390_ldr (code, ins->dreg, ins->sreg1);
- s390_sdbr (code, ins->dreg, ins->sreg2);
- }
+ CHECK_SRCDST_NCOM_F;
+ s390_sdbr (code, ins->dreg, src2);
}
break;
case OP_FMUL: {
- if (ins->dreg == ins->sreg1)
- s390_mdbr (code, ins->dreg, ins->sreg2);
- else {
- if (ins->dreg == ins->sreg2)
- s390_mdbr (code, ins->dreg, ins->sreg1);
- else {
- s390_ldr (code, ins->dreg, ins->sreg1);
- s390_mdbr (code, ins->dreg, ins->sreg2);
- }
- }
+ CHECK_SRCDST_COM_F;
+ s390_mdbr (code, ins->dreg, src2);
}
break;
case OP_FDIV: {
- if (ins->dreg == ins->sreg1)
- s390_ddbr (code, ins->dreg, ins->sreg2);
- else {
- s390_ldr (code, ins->dreg, ins->sreg1);
- s390_ddbr (code, ins->dreg, ins->sreg2);
- }
+ CHECK_SRCDST_NCOM_F;
+ s390_ddbr (code, ins->dreg, src2);
}
break;
case OP_FNEG: {
}
break;
case OP_FREM: {
- if (ins->dreg != ins->sreg1) {
- s390_ldr (code, ins->dreg, ins->sreg1);
- }
- s390_didbr (code, ins->dreg, ins->sreg2, 5, s390_f15);
+ CHECK_SRCDST_NCOM_F;
+ s390_didbr (code, ins->dreg, src2, 5, s390_f15);
}
break;
case OP_FCOMPARE: {
case OP_FCEQ: {
s390_cdbr (code, ins->sreg1, ins->sreg2);
s390_lghi (code, ins->dreg, 1);
- s390_je (code, 6);
+ s390_je (code, 4);
s390_lghi (code, ins->dreg, 0);
}
break;
s390_lghi (code, ins->dreg, 0);
}
break;
- case OP_FBEQ:
- EMIT_COND_BRANCH (ins, S390_CC_EQ|S390_CC_OV);
+ case OP_FBEQ: {
+ short *o;
+ s390_jo (code, 0); CODEPTR(code, o);
+ EMIT_COND_BRANCH (ins, S390_CC_EQ);
+ PTRSLOT (code, o);
+ }
break;
case OP_FBNE_UN:
EMIT_COND_BRANCH (ins, S390_CC_NE|S390_CC_OV);
break;
- case OP_FBLT:
+ case OP_FBLT: {
+ short *o;
+ s390_jo (code, 0); CODEPTR(code, o);
EMIT_COND_BRANCH (ins, S390_CC_LT);
+ PTRSLOT (code, o);
+ }
break;
case OP_FBLT_UN:
EMIT_COND_BRANCH (ins, S390_CC_LT|S390_CC_OV);
break;
- case OP_FBGT:
+ case OP_FBGT: {
+ short *o;
+ s390_jo (code, 0); CODEPTR(code, o);
EMIT_COND_BRANCH (ins, S390_CC_GT);
+ PTRSLOT (code, o);
+ }
break;
case OP_FBGT_UN:
EMIT_COND_BRANCH (ins, S390_CC_GT|S390_CC_OV);
break;
- case OP_FBGE:
+ case OP_FBGE: {
+ short *o;
+ s390_jo (code, 0); CODEPTR(code, o);
EMIT_COND_BRANCH (ins, S390_CC_GE);
+ PTRSLOT (code, o);
+ }
break;
case OP_FBGE_UN:
EMIT_COND_BRANCH (ins, S390_CC_GE|S390_CC_OV);
break;
- case OP_FBLE:
+ case OP_FBLE: {
+ short *o;
+ s390_jo (code, 0); CODEPTR(code, o);
EMIT_COND_BRANCH (ins, S390_CC_LE);
+ PTRSLOT (code, o);
+ }
break;
case OP_FBLE_UN:
EMIT_COND_BRANCH (ins, S390_CC_LE|S390_CC_OV);
break;
- case CEE_CKFINITE: {
+ case OP_CKFINITE: {
short *o;
s390_lhi (code, s390_r13, 0x7f);
s390_tcdb (code, ins->sreg1, 0, s390_r13, 0);
}
break;
case OP_S390_MOVE: {
- if (ins->unused > 0) {
- if (ins->unused <= 256) {
- s390_mvc (code, ins->unused, ins->dreg,
+ if (ins->backend.size > 0) {
+ if (ins->backend.size <= 256) {
+ s390_mvc (code, ins->backend.size, ins->dreg,
ins->inst_offset, ins->sreg1, ins->inst_imm);
} else {
- s390_lr (code, s390_r0, ins->dreg);
+ s390_lgr (code, s390_r0, ins->dreg);
if (s390_is_imm16 (ins->inst_offset)) {
s390_aghi (code, s390_r0, ins->inst_offset);
} else {
s390_llong(code, ins->inst_offset);
s390_a (code, s390_r0, 0, s390_r13, 4);
}
- s390_lr (code, s390_r12, ins->sreg1);
+ s390_lgr (code, s390_r12, ins->sreg1);
if (s390_is_imm16 (ins->inst_imm)) {
s390_aghi (code, s390_r12, ins->inst_imm);
} else {
s390_jo (code, -2);
}
}
+ }
+ break;
+ case OP_ATOMIC_ADD_I8: {
+ s390_lgr (code, s390_r1, ins->sreg2);
+ s390_lg (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_agr (code, s390_r1, s390_r0);
+ s390_csg (code, s390_r0, s390_r1, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -10);
+ s390_lgr (code, ins->dreg, s390_r1);
+ }
+ break;
+ case OP_ATOMIC_ADD_NEW_I8: {
+ s390_lgr (code, s390_r1, ins->sreg2);
+ s390_lg (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_agr (code, s390_r1, s390_r0);
+ s390_csg (code, s390_r0, s390_r1, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -10);
+ s390_lgr (code, ins->dreg, s390_r1);
+ }
+ break;
+ case OP_ATOMIC_EXCHANGE_I8: {
+ s390_lg (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_csg (code, s390_r0, ins->sreg2, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -6);
+ s390_lgr (code, ins->dreg, s390_r0);
+ }
+ break;
+ case OP_ATOMIC_ADD_I4: {
+ s390_lgfr(code, s390_r1, ins->sreg2);
+ s390_lgf (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_agr (code, s390_r1, s390_r0);
+ s390_cs (code, s390_r0, s390_r1, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -9);
+ s390_lgfr(code, ins->dreg, s390_r1);
+ }
+ break;
+ case OP_ATOMIC_ADD_NEW_I4: {
+ s390_lgfr(code, s390_r1, ins->sreg2);
+ s390_lgf (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_agr (code, s390_r1, s390_r0);
+ s390_cs (code, s390_r0, s390_r1, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -9);
+ s390_lgfr(code, ins->dreg, s390_r1);
+ }
+ break;
+ case OP_ATOMIC_EXCHANGE_I4: {
+ s390_lg (code, s390_r0, 0, ins->inst_basereg, ins->inst_offset);
+ s390_cs (code, s390_r0, ins->sreg2, ins->inst_basereg, ins->inst_offset);
+ s390_jnz (code, -4);
+ s390_lgfr(code, ins->dreg, s390_r0);
+ }
+ break;
+ case OP_S390_BKCHAIN: {
+ s390_lgr (code, ins->dreg, ins->sreg1);
+ if (s390_is_imm16 (cfg->stack_offset)) {
+ s390_aghi (code, ins->dreg, cfg->stack_offset);
+ } else {
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, cfg->stack_offset);
+ s390_ag (code, ins->dreg, 0, s390_r13, 4);
+ }
+ }
+ break;
+ case OP_MEMORY_BARRIER: {
}
break;
default:
}
if ((cfg->opt & MONO_OPT_BRANCH) && ((code - cfg->native_code - offset) > max_len)) {
- g_warning ("wrong maximal instruction length of instruction %s (expected %d, got %d)",
+ g_warning ("wrong maximal instruction length of instruction %s (expected %d, got %ld)",
mono_inst_name (ins->opcode), max_len, code - cfg->native_code - offset);
-// g_assert_not_reached ();
+ g_assert_not_reached ();
}
cpos += max_len;
- last_ins = ins;
last_offset = offset;
-
- ins = ins->next;
}
cfg->code_len = code - cfg->native_code;
void
mono_arch_register_lowlevel_calls (void)
{
- mono_register_jit_icall (enter_method, "mono_enter_method", NULL, TRUE);
- mono_register_jit_icall (leave_method, "mono_leave_method", NULL, TRUE);
+ mono_register_jit_icall (mono_arch_get_lmf_addr, "mono_arch_get_lmf_addr", NULL, TRUE);
}
/*========================= End of Function ========================*/
/*------------------------------------------------------------------*/
void
-mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *ji, gboolean run_cctors)
+mono_arch_patch_code (MonoMethod *method, MonoDomain *domain,
+ guint8 *code, MonoJumpInfo *ji, gboolean run_cctors)
{
MonoJumpInfo *patch_info;
for (patch_info = ji; patch_info; patch_info = patch_info->next) {
unsigned char *ip = patch_info->ip.i + code;
- guint64 target = 0;
+ gconstpointer target = NULL;
+
+ target = mono_resolve_patch_target (method, domain, code,
+ patch_info, run_cctors);
switch (patch_info->type) {
- case MONO_PATCH_INFO_BB:
- target = S390_RELATIVE((patch_info->data.bb->native_offset+code),
- ip);
- ip += 2; /* Skip over op-code */
- break;
- case MONO_PATCH_INFO_ABS:
- *((gpointer *)(ip)) = patch_info->data.target;
- break;
- case MONO_PATCH_INFO_LABEL:
- target = S390_RELATIVE((patch_info->data.inst->inst_c0+code),ip);
- ip += 2; /* Skip over op-code */
- break;
- case MONO_PATCH_INFO_IP:
- target = ip;
- continue;
- case MONO_PATCH_INFO_METHOD_REL:
- g_assert_not_reached ();
- *((gpointer *)(ip)) = code + patch_info->data.offset;
- continue;
- case MONO_PATCH_INFO_INTERNAL_METHOD: {
- MonoJitICallInfo *mi = mono_find_jit_icall_by_name (patch_info->data.name);
- if (!mi) {
- g_warning ("unknown MONO_PATCH_INFO_INTERNAL_METHOD %s", patch_info->data.name);
+ case MONO_PATCH_INFO_IP:
+ case MONO_PATCH_INFO_EXC_NAME:
+ case MONO_PATCH_INFO_LDSTR:
+ case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
+ case MONO_PATCH_INFO_LDTOKEN:
+ case MONO_PATCH_INFO_EXC:
+ case MONO_PATCH_INFO_ABS:
+ case MONO_PATCH_INFO_METHOD:
+ case MONO_PATCH_INFO_INTERNAL_METHOD:
+ case MONO_PATCH_INFO_CLASS_INIT:
+ s390_patch_addr (ip, (guint64) target);
+ continue;
+ case MONO_PATCH_INFO_SWITCH:
+ /*----------------------------------*/
+ /* ip points at the basr r13,0/j +4 */
+ /* instruction the vtable value */
+ /* follows this (i.e. ip+6) */
+ /*----------------------------------*/
+ *((gconstpointer *)(ip+6)) = target;
+ continue;
+ case MONO_PATCH_INFO_METHODCONST:
+ case MONO_PATCH_INFO_CLASS:
+ case MONO_PATCH_INFO_IMAGE:
+ case MONO_PATCH_INFO_FIELD:
+ case MONO_PATCH_INFO_IID:
+ target = S390_RELATIVE(target, ip);
+ s390_patch_rel (ip, (guint64) target);
+ continue;
+ case MONO_PATCH_INFO_R4:
+ case MONO_PATCH_INFO_R8:
+ case MONO_PATCH_INFO_METHOD_REL:
g_assert_not_reached ();
- }
- *((gpointer *)(ip)) = mono_icall_get_wrapper (mi);
- break;
- }
- case MONO_PATCH_INFO_METHOD_JUMP: {
- GSList *list;
-
- /*------------------------------------------------------*/
- /* get the trampoline to the method from the domain */
- /*------------------------------------------------------*/
- *((gpointer *)(ip)) = mono_create_jump_trampoline (
- domain,
- patch_info->data.method,
- TRUE);
-
-
- list = g_hash_table_lookup (domain->jump_target_hash,
- patch_info->data.method);
- list = g_slist_prepend (list, ip);
- g_hash_table_insert (domain->jump_target_hash,
- patch_info->data.method, list);
- break;
- }
- case MONO_PATCH_INFO_METHOD:
- if (patch_info->data.method == method) {
- *((gpointer *)(ip)) = code;
- } else {
- /* get the trampoline to the method from the domain */
- *((gpointer *)(ip)) = mono_arch_create_jit_trampoline(patch_info->data.method);
- }
- break;
- case MONO_PATCH_INFO_SWITCH: {
- gpointer *table = (gpointer *)patch_info->data.target;
- int i;
- /*------------------------------------------------------*/
- /* ip is pointing at the basr r13,0/j +4 instruction */
- /* the vtable value follows this (i.e. ip+6) */
- /*------------------------------------------------------*/
- *((gconstpointer *)(ip+6)) = table;
-
- for (i = 0; i < patch_info->table_size; i++) {
- table [i] = (int)patch_info->data.table [i] + code;
- }
- continue;
- }
- case MONO_PATCH_INFO_METHODCONST:
- case MONO_PATCH_INFO_CLASS:
- case MONO_PATCH_INFO_IMAGE:
- case MONO_PATCH_INFO_FIELD:
- target = S390_RELATIVE(patch_info->data.target, ip);
- continue;
- case MONO_PATCH_INFO_R4:
- case MONO_PATCH_INFO_R8:
- g_assert_not_reached ();
- *((gconstpointer *)(ip + 2)) = patch_info->data.target;
- continue;
- case MONO_PATCH_INFO_IID:
- mono_class_init (patch_info->data.klass);
- target = S390_RELATIVE(patch_info->data.klass->interface_id, ip);
- continue;
- case MONO_PATCH_INFO_VTABLE:
- target = S390_RELATIVE(mono_class_vtable (domain, patch_info->data.klass),ip);
- ip += 2;
- continue;
- case MONO_PATCH_INFO_CLASS_INIT:
- target = S390_RELATIVE(mono_create_class_init_trampoline (mono_class_vtable (domain, patch_info->data.klass)), ip);
- ip += 2;
- break;
- case MONO_PATCH_INFO_SFLDA: {
- MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.field->parent);
- if (!vtable->initialized && !(vtable->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) && mono_class_needs_cctor_run (vtable->klass, method))
- /* Done by the generated code */
- ;
- else {
- if (run_cctors)
- mono_runtime_class_init (vtable);
- }
- target = S390_RELATIVE((char*)vtable->data + patch_info->data.field->offset, ip);
- ip += 2;
- continue;
- }
- case MONO_PATCH_INFO_EXC_NAME:
- *((gconstpointer *)(ip)) = patch_info->data.name;
- continue;
- case MONO_PATCH_INFO_LDSTR:
- target = mono_ldstr (domain, patch_info->data.token->image,
- mono_metadata_token_index (patch_info->data.token->token));
- continue;
- case MONO_PATCH_INFO_TYPE_FROM_HANDLE: {
- gpointer handle;
- MonoClass *handle_class;
-
- handle = mono_ldtoken (patch_info->data.token->image,
- patch_info->data.token->token,
- &handle_class, NULL);
- mono_class_init (handle_class);
- mono_class_init (mono_class_from_mono_type (handle));
-
- target = handle;
- continue;
- }
- case MONO_PATCH_INFO_LDTOKEN: {
- gpointer handle;
- MonoClass *handle_class;
-
- handle = mono_ldtoken (patch_info->data.token->image,
- patch_info->data.token->token,
- &handle_class, NULL);
- mono_class_init (handle_class);
-
- target = handle;
- continue;
- }
- case MONO_PATCH_INFO_EXC:
- /* everything is dealt with at epilog output time */
- continue;
- default:
- g_assert_not_reached ();
+ continue;
+ default:
+ target = S390_RELATIVE(target, ip);
+ ip += 2;
+ s390_patch_rel (ip, (guint64) target);
}
- s390_patch (ip, target);
}
}
/*------------------------------------------------------------------*/
/* */
-/* Name - mono_arch_max_epilog_size */
+/* Name - emit_load_volatile_arguments */
+/* */
+/* Function - Emit the instructions to reload parameter regist- */
+/* registers for use with "tail" operations. */
+/* */
+/* The register loading operations performed here */
+/* are the mirror of the store operations performed */
+/* in mono_arch_emit_prolog and need to be kept in */
+/* synchronization with it. */
/* */
-/* Function - Determine the maximum size of the epilog code. */
-/* */
/*------------------------------------------------------------------*/
-int
-mono_arch_max_epilog_size (MonoCompile *cfg)
+guint8 *
+emit_load_volatile_arguments (guint8 *code, MonoCompile *cfg)
{
- int max_epilog_size = 256;
- MonoJumpInfo *patch_info;
-
- if (cfg->method->save_lmf)
- max_epilog_size += 128;
-
- if (mono_jit_trace_calls != NULL)
- max_epilog_size += 128;
+ MonoInst *inst;
+ MonoMethod *method = cfg->method;
+ MonoMethodSignature *sig = mono_method_signature(method);
+ int pos = 0, i;
+ CallInfo *cinfo;
- if (cfg->prof_options & MONO_PROFILE_ENTER_LEAVE)
- max_epilog_size += 128;
+ cinfo = get_call_info (NULL, NULL, sig, sig->pinvoke);
- /* count the number of exception infos */
-
- for (patch_info = cfg->patch_info;
- patch_info;
- patch_info = patch_info->next) {
- if (patch_info->type == MONO_PATCH_INFO_EXC)
- max_epilog_size += 48;
+ if (cinfo->struct_ret) {
+ ArgInfo *ainfo = &cinfo->ret;
+ inst = cfg->vret_addr;
+ s390_lg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ }
+
+ for (i = 0; i < sig->param_count + sig->hasthis; ++i) {
+ ArgInfo *ainfo = cinfo->args + i;
+ inst = cfg->args [pos];
+
+ if (inst->opcode == OP_REGVAR) {
+ if (ainfo->regtype == RegTypeGeneral)
+ s390_lgr (code, ainfo->reg, inst->dreg);
+ else if (ainfo->regtype == RegTypeFP) {
+ if (inst->dreg != ainfo->reg) {
+ if (ainfo->size == 4) {
+ s390_ldebr (code, ainfo->reg, inst->dreg);
+ } else {
+ s390_ldr (code, ainfo->reg, inst->dreg);
+ }
+ }
+ }
+ else if (ainfo->regtype == RegTypeBase) {
+ } else
+ g_assert_not_reached ();
+ } else {
+ if (ainfo->regtype == RegTypeGeneral) {
+ if (!((ainfo->reg >= 2) && (ainfo->reg <= 6)))
+ g_assert_not_reached();
+ switch (ainfo->size) {
+ case 1:
+ s390_llgc (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 2:
+ s390_lgh (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 4:
+ s390_lgf (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 8:
+ s390_lg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ }
+ } else if (ainfo->regtype == RegTypeBase) {
+ } else if (ainfo->regtype == RegTypeFP) {
+ if (ainfo->size == 8)
+ s390_ld (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ else if (ainfo->size == 4)
+ s390_le (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ else
+ g_assert_not_reached ();
+ } else if (ainfo->regtype == RegTypeStructByVal) {
+ if (ainfo->reg != STK_BASE) {
+ switch (ainfo->size) {
+ case 1:
+ s390_llgc (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 2:
+ s390_lgh (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 4:
+ s390_lgf (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ case 8:
+ s390_lg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
+ }
+ }
+ } else if (ainfo->regtype == RegTypeStructByAddr) {
+ if (ainfo->reg != STK_BASE) {
+ s390_lg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ }
+ } else
+ g_assert_not_reached ();
+ }
+ pos++;
}
- return max_epilog_size;
+ return code;
}
/*========================= End of Function ========================*/
MonoBasicBlock *bb;
MonoMethodSignature *sig;
MonoInst *inst;
- int alloc_size, pos, max_offset, i, lmfOffset;
+ int alloc_size, pos, max_offset, i;
guint8 *code;
CallInfo *cinfo;
- size_data sz;
int tracing = 0;
+ int lmfOffset;
- if (mono_jit_trace_calls != NULL && mono_trace_eval (method))
- tracing = 1;
+ cfg->code_size = 512;
+
+ if (mono_jit_trace_calls != NULL && mono_trace_eval (method)) {
+ tracing = 1;
+ cfg->code_size += 256;
+ }
+
+ if (method->save_lmf)
+ cfg->code_size += 200;
- cfg->code_size = 384;
cfg->native_code = code = g_malloc (cfg->code_size);
- if (cfg->flags & MONO_CFG_HAS_TAIL) {
- s390_stmg (code, s390_r2, s390_r14, STK_BASE, S390_PARM_SAVE_OFFSET);
- for (pos = 0; pos < 4; pos++)
- s390_std (code, pos*2, 0, STK_BASE,
- S390_FLOAT_SAVE_OFFSET+pos*sizeof(double));
- } else {
- s390_stmg (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
- }
+ s390_stmg (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
+
+ if (cfg->arch.bkchain_reg != -1)
+ s390_lgr (code, cfg->arch.bkchain_reg, STK_BASE);
if (cfg->flags & MONO_CFG_HAS_ALLOCA) {
cfg->used_int_regs |= 1 << 11;
cfg->stack_usage = alloc_size;
s390_lgr (code, s390_r11, STK_BASE);
- if (s390_is_imm16 (-alloc_size)) {
+ if (s390_is_imm16 (alloc_size)) {
s390_aghi (code, STK_BASE, -alloc_size);
} else {
int stackSize = alloc_size;
*/
max_offset = 0;
for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
- MonoInst *ins = bb->code;
+ MonoInst *ins;
bb->max_offset = max_offset;
if (cfg->prof_options & MONO_PROFILE_COVERAGE)
max_offset += 6;
- while (ins) {
- max_offset += ((guint8 *)ins_spec [ins->opcode])[MONO_INST_LEN];
- ins = ins->next;
- }
+ MONO_BB_FOR_EACH_INS (bb, ins)
+ max_offset += ((guint8 *)ins_get_spec (ins->opcode))[MONO_INST_LEN];
}
/* load arguments allocated to register from the stack */
sig = mono_method_signature (method);
pos = 0;
- cinfo = calculate_sizes (sig, &sz, sig->pinvoke);
+ cinfo = get_call_info (cfg, cfg->mempool, sig, sig->pinvoke);
if (cinfo->struct_ret) {
ArgInfo *ainfo = &cinfo->ret;
- inst = cfg->ret;
- inst->unused = ainfo->vtsize;
+ inst = cfg->vret_addr;
+ inst->backend.size = ainfo->vtsize;
s390_stg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
}
for (i = 0; i < sig->param_count + sig->hasthis; ++i) {
ArgInfo *ainfo = cinfo->args + i;
- inst = cfg->varinfo [pos];
+ inst = cfg->args [pos];
+ if (inst->opcode == OP_VTARG_ADDR)
+ inst = inst->inst_left;
+
if (inst->opcode == OP_REGVAR) {
if (ainfo->regtype == RegTypeGeneral)
s390_lgr (code, inst->dreg, ainfo->reg);
}
}
else if (ainfo->regtype == RegTypeBase) {
- s390_lgr (code, s390_r13, STK_BASE);
- s390_aghi(code, s390_r13, alloc_size);
- s390_lg (code, inst->dreg, 0, s390_r13, ainfo->offset);
+ s390_lgr (code, s390_r13, STK_BASE);
+ s390_aghi (code, s390_r13, alloc_size);
+ s390_lg (code, inst->dreg, 0, s390_r13, ainfo->offset);
} else
g_assert_not_reached ();
case 2:
s390_sth (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
break;
+ case 4:
+ s390_st (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
+ break;
case 8:
- s390_stg (code, ainfo->reg, 0,
- inst->inst_basereg, inst->inst_offset);
+ s390_stg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
break;
- default:
- s390_st (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
}
} else if (ainfo->regtype == RegTypeBase) {
} else if (ainfo->regtype == RegTypeFP) {
reg = ainfo->reg;
else {
reg = s390_r0;
- s390_lgr (code, s390_r13, STK_BASE);
- s390_aghi(code, s390_r13, alloc_size);
+ s390_lgr (code, s390_r13, STK_BASE);
+ s390_aghi (code, s390_r13, alloc_size);
}
switch (ainfo->size) {
case 1:
if (ainfo->reg == STK_BASE)
- s390_ic (code, reg, 0, s390_r13, ainfo->offset+3);
+ s390_ic (code, reg, 0, s390_r13, ainfo->offset+7);
s390_stc (code, reg, 0, inst->inst_basereg, doffset);
break;
case 2:
if (ainfo->reg == STK_BASE)
- s390_lh (code, reg, 0, s390_r13, ainfo->offset+2);
+ s390_lh (code, reg, 0, s390_r13, ainfo->offset+6);
s390_sth (code, reg, 0, inst->inst_basereg, doffset);
break;
case 4:
if (ainfo->reg == STK_BASE)
- s390_l (code, reg, 0, s390_r13, ainfo->offset);
- s390_st (code, reg, 0, inst->inst_basereg, doffset);
+ s390_l (code, reg, 0, s390_r13, ainfo->offset+4);
+ s390_st (code, reg, 0, inst->inst_basereg, doffset);
break;
case 8:
if (ainfo->reg == STK_BASE)
- s390_lg (code, s390_r0, 0, s390_r13, ainfo->offset);
+ s390_lg (code, reg, 0, s390_r13, ainfo->offset);
s390_stg (code, reg, 0, inst->inst_basereg, doffset);
break;
}
} else if (ainfo->regtype == RegTypeStructByAddr) {
- if (ainfo->reg == STK_BASE) {
- s390_lgr (code, s390_r13, ainfo->reg);
- s390_aghi(code, s390_r13, alloc_size);
- s390_lg (code, s390_r13, 0, s390_r13,
- ainfo->offparm + S390_MINIMAL_STACK_SIZE);
- code = emit_memcpy (code, abs(ainfo->vtsize),
- inst->inst_basereg,
- inst->inst_offset, s390_r13, 0);
- } else {
- code = emit_memcpy (code, abs(ainfo->vtsize),
- inst->inst_basereg,
- inst->inst_offset,
- ainfo->reg, 0);
- }
+ s390_stg (code, ainfo->reg, 0, inst->inst_basereg, inst->inst_offset);
} else
g_assert_not_reached ();
}
}
if (method->save_lmf) {
+ /*---------------------------------------------------------------*/
+ /* we build the MonoLMF structure on the stack - see mini-s390.h */
+ /*---------------------------------------------------------------*/
+ lmfOffset = alloc_size - sizeof(MonoLMF);
+
+ s390_lgr (code, s390_r13, cfg->frame_reg);
+ s390_aghi (code, s390_r13, lmfOffset);
+
/*---------------------------------------------------------------*/
/* Preserve the parameter registers while we fix up the lmf */
/*---------------------------------------------------------------*/
- s390_lgr (code, s390_r7, s390_r2);
- s390_lgr (code, s390_r8, s390_r3);
- s390_lgr (code, s390_r9, s390_r4);
- s390_lgr (code, s390_r10, s390_r5);
+ s390_stmg (code, s390_r2, s390_r6, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, pregs[0]));
/*---------------------------------------------------------------*/
/* On return from this call r2 have the address of the &lmf */
/*---------------------------------------------------------------*/
- s390_basr(code, s390_r13, 0);
+ s390_basr(code, s390_r10, 0);
s390_j (code, 6);
mono_add_patch_info (cfg, code - cfg->native_code,
MONO_PATCH_INFO_INTERNAL_METHOD,
(gpointer)"mono_get_lmf_addr");
s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r13, 4);
+ s390_lg (code, s390_r1, 0, s390_r10, 4);
s390_basr (code, s390_r14, s390_r1);
- /*---------------------------------------------------------------*/
- /* we build the MonoLMF structure on the stack - see mini-s390.h */
- /*---------------------------------------------------------------*/
- lmfOffset = alloc_size - sizeof(MonoLMF);
-
- s390_lgr (code, s390_r13, cfg->frame_reg);
- s390_aghi (code, s390_r13, lmfOffset);
-
- /*---------------------------------------------------------------*/
- /* Set lmf.lmf_addr = jit_tls->lmf */
- /*---------------------------------------------------------------*/
- s390_stg (code, s390_r2, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, lmf_addr));
-
- /*---------------------------------------------------------------*/
- /* Get current lmf */
- /*---------------------------------------------------------------*/
- s390_lg (code, s390_r0, 0, s390_r2, 0);
-
- /*---------------------------------------------------------------*/
- /* Set our lmf as the current lmf */
- /*---------------------------------------------------------------*/
- s390_stg (code, s390_r13, 0, s390_r2, 0);
-
- /*---------------------------------------------------------------*/
- /* Have our lmf.previous_lmf point to the last lmf */
- /*---------------------------------------------------------------*/
- s390_stg (code, s390_r0, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, previous_lmf));
-
- /*---------------------------------------------------------------*/
- /* save method info */
- /*---------------------------------------------------------------*/
- s390_basr (code, s390_r1, 0);
+ /*---------------------------------------------------------------*/
+ /* Set lmf.lmf_addr = jit_tls->lmf */
+ /*---------------------------------------------------------------*/
+ s390_stg (code, s390_r2, 0, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, lmf_addr));
+
+ /*---------------------------------------------------------------*/
+ /* Get current lmf */
+ /*---------------------------------------------------------------*/
+ s390_lg (code, s390_r0, 0, s390_r2, 0);
+
+ /*---------------------------------------------------------------*/
+ /* Set our lmf as the current lmf */
+ /*---------------------------------------------------------------*/
+ s390_stg (code, s390_r13, 0, s390_r2, 0);
+
+ /*---------------------------------------------------------------*/
+ /* Have our lmf.previous_lmf point to the last lmf */
+ /*---------------------------------------------------------------*/
+ s390_stg (code, s390_r0, 0, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, previous_lmf));
+
+ /*---------------------------------------------------------------*/
+ /* save method info */
+ /*---------------------------------------------------------------*/
+ s390_basr (code, s390_r1, 0);
s390_j (code, 6);
- s390_llong (code, method);
- s390_lg (code, s390_r1, 0, s390_r1, 4);
- s390_stg (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, method));
-
- /*---------------------------------------------------------------*/
- /* save the current IP */
- /*---------------------------------------------------------------*/
- s390_lgr (code, s390_r1, cfg->frame_reg);
- s390_stg (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, ebp));
- s390_lg (code, s390_r1, 0, s390_r1, S390_RET_ADDR_OFFSET);
- s390_la (code, s390_r1, 0, s390_r1, 0);
- s390_stg (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, eip));
-
- /*---------------------------------------------------------------*/
- /* Save general and floating point registers */
- /*---------------------------------------------------------------*/
- s390_stmg (code, s390_r2, s390_r12, s390_r13, G_STRUCT_OFFSET(MonoLMF, gregs[2]));
- for (i = 0; i < 16; i++) {
- s390_std (code, i, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, fregs[i]));
- }
+ s390_llong (code, method);
+ s390_lg (code, s390_r1, 0, s390_r1, 4);
+ s390_stg (code, s390_r1, 0, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, method));
+
+ /*---------------------------------------------------------------*/
+ /* save the current IP */
+ /*---------------------------------------------------------------*/
+ s390_stg (code, STK_BASE, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, ebp));
+ s390_basr (code, s390_r1, 0);
+ s390_stg (code, s390_r1, 0, s390_r13, G_STRUCT_OFFSET(MonoLMF, eip));
+
+ /*---------------------------------------------------------------*/
+ /* Save general and floating point registers */
+ /*---------------------------------------------------------------*/
+ s390_stmg (code, s390_r2, s390_r12, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, gregs[2]));
+ for (i = 0; i < 16; i++) {
+ s390_std (code, i, 0, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, fregs[i]));
+ }
/*---------------------------------------------------------------*/
/* Restore the parameter registers now that we've set up the lmf */
/*---------------------------------------------------------------*/
- s390_lgr (code, s390_r2, s390_r7);
- s390_lgr (code, s390_r3, s390_r8);
- s390_lgr (code, s390_r4, s390_r9);
- s390_lgr (code, s390_r5, s390_r10);
+ s390_lmg (code, s390_r2, s390_r6, s390_r13,
+ G_STRUCT_OFFSET(MonoLMF, pregs[0]));
}
if (tracing)
- code = mono_arch_instrument_prolog (cfg, enter_method, code, TRUE);
+ code = mono_arch_instrument_prolog(cfg, enter_method, code, TRUE);
cfg->code_len = code - cfg->native_code;
-
- g_assert(cfg->code_len < cfg->code_size);
- g_free (cinfo);
+ g_assert (cfg->code_len < cfg->code_size);
return code;
}
void
mono_arch_emit_epilog (MonoCompile *cfg)
{
- MonoJumpInfo *patch_info;
MonoMethod *method = cfg->method;
- MonoMethodSignature *sig = mono_method_signature (method);
- MonoInst *inst;
- int i, tracing = 0;
+ int tracing = 0;
guint8 *code;
+ int max_epilog_size = 96;
+
+ if (cfg->method->save_lmf)
+ max_epilog_size += 128;
+
+ if (mono_jit_trace_calls != NULL)
+ max_epilog_size += 128;
+
+ if (cfg->prof_options & MONO_PROFILE_ENTER_LEAVE)
+ max_epilog_size += 128;
+
+ while ((cfg->code_len + max_epilog_size) > (cfg->code_size - 16)) {
+ cfg->code_size *= 2;
+ cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
+ mono_jit_stats.code_reallocs++;
+ }
code = cfg->native_code + cfg->code_len;
}
if (method->save_lmf)
- code = restoreLMF(cfg, code);
+ restoreLMF(code, cfg->frame_reg, cfg->stack_usage);
if (cfg->flags & MONO_CFG_HAS_ALLOCA)
- s390_lg (code, STK_BASE, 0, STK_BASE, 0);
+ s390_lg (code, STK_BASE, 0, STK_BASE, 0);
else
code = backUpStackPtr(cfg, code);
s390_lmg (code, s390_r6, s390_r14, STK_BASE, S390_REG_SAVE_OFFSET);
s390_br (code, s390_r14);
- /* add code to raise exceptions */
+ cfg->code_len = code - cfg->native_code;
+
+ g_assert (cfg->code_len < cfg->code_size);
+
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_emit_exceptions */
+/* */
+/* Function - Emit the blocks to handle exception conditions. */
+/* */
+/*------------------------------------------------------------------*/
+
+void
+mono_arch_emit_exceptions (MonoCompile *cfg)
+{
+ MonoJumpInfo *patch_info;
+ guint8 *code;
+ int nThrows = 0,
+ exc_count = 0,
+ iExc;
+ guint32 code_size;
+ MonoClass *exc_classes [MAX_EXC];
+ guint8 *exc_throw_start [MAX_EXC];
+
+ for (patch_info = cfg->patch_info;
+ patch_info;
+ patch_info = patch_info->next) {
+ if (patch_info->type == MONO_PATCH_INFO_EXC)
+ exc_count++;
+ }
+
+ code_size = exc_count * 48;
+
+ while ((cfg->code_len + code_size) > (cfg->code_size - 16)) {
+ cfg->code_size *= 2;
+ cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
+ mono_jit_stats.code_reallocs++;
+ }
+
+ code = cfg->native_code + cfg->code_len;
+
+ /*---------------------------------------------------------------------*/
+ /* Add code to raise exceptions */
+ /*---------------------------------------------------------------------*/
for (patch_info = cfg->patch_info; patch_info; patch_info = patch_info->next) {
switch (patch_info->type) {
case MONO_PATCH_INFO_EXC: {
- /*---------------------------------------------*/
- /* Patch the branch in epilog to come here */
- /*---------------------------------------------*/
- s390_patch (patch_info->ip.i+cfg->native_code+2,
- S390_RELATIVE(code,patch_info->ip.i+cfg->native_code));
- /*---------------------------------------------*/
- /* Patch the parameter passed to the handler */
- /*---------------------------------------------*/
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- mono_add_patch_info (cfg, code - cfg->native_code,
- MONO_PATCH_INFO_EXC_NAME,
- patch_info->data.target);
- s390_llong(code, 0);
- /*-----------------------------------------------------*/
- /* Load the return address and the parameter register */
- /*-----------------------------------------------------*/
- s390_larl (code, s390_r14, S390_RELATIVE((patch_info->ip.i +
- cfg->native_code + 8), code));
- s390_lg (code, s390_r2, 0, s390_r13, 4);
+ guint8 *ip = patch_info->ip.i + cfg->native_code;
+ MonoClass *exc_class;
+ guint64 throw_ip;
+
/*-----------------------------------------------------*/
- /* Reuse the current patch to set the jump */
+ /* Patch the branch in epilog to come here */
/*-----------------------------------------------------*/
- s390_basr (code, s390_r13, 0);
- s390_j (code, 6);
- patch_info->type = MONO_PATCH_INFO_INTERNAL_METHOD;
- patch_info->data.name = "mono_arch_throw_exception_by_name";
- patch_info->ip.i = code - cfg->native_code;
- s390_llong(code, 0);
- s390_lg (code, s390_r1, 0, s390_r13, 4);
- s390_br (code, s390_r1);
+ s390_patch_rel (ip + 2, (guint64) S390_RELATIVE(code,ip));
+
+ exc_class = mono_class_from_name (mono_defaults.corlib,
+ "System",
+ patch_info->data.name);
+ g_assert (exc_class);
+ throw_ip = patch_info->ip.i;
+
+ for (iExc = 0; iExc < nThrows; ++iExc)
+ if (exc_classes [iExc] == exc_class)
+ break;
+
+ if (iExc < nThrows) {
+ s390_jcl (code, S390_CC_UN,
+ (guint64) exc_throw_start [iExc]);
+ patch_info->type = MONO_PATCH_INFO_NONE;
+ } else {
+
+ if (nThrows < MAX_EXC) {
+ exc_classes [nThrows] = exc_class;
+ exc_throw_start [nThrows] = code;
+ }
+
+ /*---------------------------------------------*/
+ /* Patch the parameter passed to the handler */
+ /*---------------------------------------------*/
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ s390_llong(code, patch_info->data.target);
+ /*---------------------------------------------*/
+ /* Load return address & parameter register */
+ /*---------------------------------------------*/
+ s390_larl (code, s390_r14, (guint64)S390_RELATIVE((patch_info->ip.i +
+ cfg->native_code + 8), code));
+ s390_lg (code, s390_r2, 0, s390_r13, 4);
+ /*---------------------------------------------*/
+ /* Reuse the current patch to set the jump */
+ /*---------------------------------------------*/
+ s390_basr (code, s390_r13, 0);
+ s390_j (code, 6);
+ patch_info->type = MONO_PATCH_INFO_INTERNAL_METHOD;
+ patch_info->data.name = "mono_arch_throw_exception_by_name";
+ patch_info->ip.i = code - cfg->native_code;
+ s390_llong(code, 0);
+ s390_lg (code, s390_r1, 0, s390_r13, 4);
+ s390_br (code, s390_r1);
+ }
break;
}
default:
void
mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
{
+ if (!tls_offset_inited) {
+ tls_offset_inited = TRUE;
+
+#if HAVE_KW_THREAD
+# if 0
+ __asm__ ("\tear\t%r1,0\n"
+ "\tlr\t%0,%3\n"
+ "\tsr\t%0,%r1\n"
+ "\tlr\t%1,%4\n"
+ "\tsr\t%1,%r1\n"
+ "\tlr\t%2,%5\n"
+ "\tsr\t%2,%r1\n"
+ : "=r" (appdomain_tls_offset),
+ "=r" (thread_tls_offset),
+ "=r" (lmf_tls_offset)
+ : "r" (&tls_appdomain),
+ "r" (&tls_current_object),
+ "r" (&mono_lmf_addr)
+ : "1", "cc");
+# endif
+#endif
+ }
+
+ if (!lmf_addr_key_inited) {
+ lmf_addr_key_inited = TRUE;
+ pthread_key_create (&lmf_addr_key, NULL);
+ }
+ pthread_setspecific (lmf_addr_key, &tls->lmf);
+
}
/*========================= End of Function ========================*/
void
mono_arch_free_jit_tls_data (MonoJitTlsData *tls)
{
+
}
/*========================= End of Function ========================*/
/* add the this argument */
if (this_reg != -1) {
MonoInst *this;
- MONO_INST_NEW (cfg, this, OP_SETREG);
- this->type = this_type;
+ MONO_INST_NEW (cfg, this, OP_MOVE);
+ this->type = this_type;
this->sreg1 = this_reg;
- this->dreg = this_dreg;
+ this->dreg = mono_regstate_next_int (cfg->rs);
mono_bblock_add_inst (cfg->cbb, this);
+ mono_call_inst_add_outarg_reg (cfg, inst, this->dreg, this_dreg, FALSE);
}
if (vt_reg != -1) {
MonoInst *vtarg;
- MONO_INST_NEW (cfg, vtarg, OP_SETREG);
- vtarg->type = STACK_MP;
+ MONO_INST_NEW (cfg, vtarg, OP_MOVE);
+ vtarg->type = STACK_MP;
vtarg->sreg1 = vt_reg;
- vtarg->dreg = s390_r2;
+ vtarg->dreg = mono_regstate_next_int (cfg->rs);
mono_bblock_add_inst (cfg->cbb, vtarg);
+ mono_call_inst_add_outarg_reg (cfg, inst, vtarg->dreg, s390_r2, FALSE);
}
}
/*------------------------------------------------------------------*/
MonoInst*
-mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args)
+mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod,
+ MonoMethodSignature *fsig, MonoInst **args)
{
MonoInst *ins = NULL;
MONO_INST_NEW (cfg, ins, OP_SQRT);
ins->inst_i0 = args [0];
}
+// if (strcmp (cmethod->name, "Abs") == 0) {
+// MONO_INST_NEW (cfg, ins, OP_ABS);
+// ins->inst_i0 = args [0];
+// }
}
+
return ins;
}
/*========================= End of Function ========================*/
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_emit_inst_for_method */
+/* */
+/*------------------------------------------------------------------*/
+
+MonoInst*
+mono_arch_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args)
+{
+ return NULL;
+}
+
+/*========================= End of Function ========================*/
+
+void
+mono_arch_decompose_opts (MonoCompile *cfg, MonoInst *ins)
+{
+ /*
+ * Have to rename these to avoid being decomposed normally, since the normal
+ * decomposition does not work on S390.
+ */
+ switch (ins->opcode) {
+ case OP_ISUB_OVF:
+ ins->opcode = OP_S390_ISUB_OVF;
+ break;
+ case OP_ISUB_OVF_UN:
+ ins->opcode = OP_S390_ISUB_OVF_UN;
+ break;
+ case OP_IADD_OVF:
+ ins->opcode = OP_S390_IADD_OVF;
+ break;
+ case OP_IADD_OVF_UN:
+ ins->opcode = OP_S390_IADD_OVF_UN;
+ break;
+ case OP_LADD_OVF:
+ ins->opcode = OP_S390_LADD_OVF;
+ break;
+ case OP_LADD_OVF_UN:
+ ins->opcode = OP_S390_LADD_OVF_UN;
+ break;
+ case OP_LSUB_OVF:
+ ins->opcode = OP_S390_LSUB_OVF;
+ break;
+ case OP_LSUB_OVF_UN:
+ ins->opcode = OP_S390_LSUB_OVF_UN;
+ break;
+ default:
+ break;
+ }
+}
+
+/*========================= End of Function ========================*/
+
/*------------------------------------------------------------------*/
/* */
/* Name - mono_arch_print_tree */
switch (tree->opcode) {
case OP_S390_LOADARG:
+ case OP_S390_ARGREG:
case OP_S390_ARGPTR:
- case OP_S390_STKARG:
- printf ("[0x%x(%s)]", tree->inst_offset,
+ printf ("[0x%lx(%s)]", tree->inst_offset,
mono_arch_regname (tree->inst_basereg));
done = 1;
break;
+ case OP_S390_STKARG:
+ printf ("[0x%lx(previous_frame)]",
+ tree->inst_offset);
+ done = 1;
+ break;
case OP_S390_MOVE:
- printf ("[0x%x(%d,%s),0x%x(%s)]",
- tree->inst_offset, tree->unused,
- tree->dreg, tree->inst_imm,
- tree->sreg1);
+ printf ("[0x%lx(%d,%s),0x%lx(%s)]",
+ tree->inst_offset, tree->backend.size,
+ mono_arch_regname(tree->dreg),
+ tree->inst_imm,
+ mono_arch_regname(tree->sreg1));
done = 1;
break;
case OP_S390_SETF4RET:
- printf ("[f%d,f%d]",
+ printf ("[f%s,f%s]",
mono_arch_regname (tree->dreg),
mono_arch_regname (tree->sreg1));
+ done = 1;
+ break;
+ case OP_TLS_GET:
+ printf ("[0x%lx(0x%lx,%s)]", tree->inst_offset,
+ tree->inst_imm,
+ mono_arch_regname (tree->sreg1));
+ done = 1;
+ break;
+ case OP_S390_BKCHAIN:
+ printf ("[previous_frame(%s)]",
+ mono_arch_regname (tree->sreg1));
+ done = 1;
default:
done = 0;
}
mono_arch_regalloc_cost (MonoCompile *cfg, MonoMethodVar *vmv)
{
/* FIXME: */
- return 3;
+ return 2;
}
/*========================= End of Function ========================*/
-MonoInst* mono_arch_get_domain_intrinsic (MonoCompile* cfg)
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_get_domain_intrinsic */
+/* */
+/* Function - */
+/* */
+/* Returns - */
+/* */
+/*------------------------------------------------------------------*/
+
+MonoInst *
+mono_arch_get_domain_intrinsic (MonoCompile* cfg)
{
- return NULL;
+ MonoInst *ins;
+
+ if (appdomain_tls_offset == -1)
+ return NULL;
+
+ MONO_INST_NEW (cfg, ins, OP_TLS_GET);
+ ins->inst_offset = appdomain_tls_offset;
+ return (ins);
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_get_thread_intrinsic */
+/* */
+/* Function - */
+/* */
+/* Returns - */
+/* */
+/*------------------------------------------------------------------*/
+
+MonoInst *
+mono_arch_get_thread_intrinsic (MonoCompile* cfg)
+{
+ MonoInst *ins;
+
+ if (thread_tls_offset == -1)
+ return NULL;
+
+ MONO_INST_NEW (cfg, ins, OP_TLS_GET);
+ ins->inst_offset = thread_tls_offset;
+ return (ins);
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_flush_register_windows */
+/* */
+/* Function - */
+/* */
+/* Returns - */
+/* */
+/*------------------------------------------------------------------*/
+
+void
+mono_arch_flush_register_windows (void)
+{
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_get_lmf_addr */
+/* */
+/* Function - */
+/* */
+/* Returns - */
+/* */
+/*------------------------------------------------------------------*/
+
+gpointer
+mono_arch_get_lmf_addr (void)
+{
+ return pthread_getspecific (lmf_addr_key);
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_is_inst_imm */
+/* */
+/* Function - Determine if operand qualifies as an immediate */
+/* value. For s390 this is a value -32768-32768 */
+/* */
+/* Returns - True|False - is [not] immediate value. */
+/* */
+/*------------------------------------------------------------------*/
+
+gboolean
+mono_arch_is_inst_imm (gint64 imm)
+{
+ return s390_is_imm16 (imm);
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/* */
+/* Name - mono_arch_get_patch_offset */
+/* */
+/* Function - Dummy entry point until s390x supports aot. */
+/* */
+/* Returns - Offset for patch. */
+/* */
+/*------------------------------------------------------------------*/
+
+guint32
+mono_arch_get_patch_offset (guint8 *code)
+{
+ return 0;
}
-MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
+/*========================= End of Function ========================*/
+
+gpointer
+mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
{
+ /* FIXME: implement */
+ g_assert_not_reached ();
return NULL;
}
projects / mono.git / blobdiff