Author: neale
Date: 2005-12-13 14:12:20 -0500 (Tue, 13 Dec 2005)
New Revision: 54312
Modified:
trunk/mono/mono/arch/s390/ChangeLog
trunk/mono/mono/arch/s390/s390-codegen.h
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/cpu-s390.md
trunk/mono/mono/mini/inssel-s390.brg
trunk/mono/mono/mini/mini-s390.c
trunk/mono/mono/mini/mini-s390.h
trunk/mono/mono/mini/tramp-s390.c
Log:
Continuing to bring s390 up to current levels
Modified: trunk/mono/mono/arch/s390/ChangeLog
===================================================================
--- trunk/mono/mono/arch/s390/ChangeLog 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/arch/s390/ChangeLog 2005-12-13 19:12:20 UTC (rev 54312)
@@ -1,3 +1,7 @@
+2005-12-13 Neale Ferguson <[EMAIL PROTECTED]>
+
+ * s390-codegen.h: Add some new instructions (conditional jumps)
+
2004-12-15 Neale Ferguson <[EMAIL PROTECTED]>
* s390-codegen.h: Add some new instructions (CS, CDS)
Modified: trunk/mono/mono/arch/s390/s390-codegen.h
===================================================================
--- trunk/mono/mono/arch/s390/s390-codegen.h 2005-12-13 19:05:07 UTC (rev
54311)
+++ trunk/mono/mono/arch/s390/s390-codegen.h 2005-12-13 19:12:20 UTC (rev
54312)
@@ -155,6 +155,7 @@
#define S390_CC_LT 4
#define S390_CC_GT 2
#define S390_CC_GE 11
+#define S390_CC_NM 11
#define S390_CC_LE 13
#define S390_CC_OV 1
#define S390_CC_NO 14
@@ -575,6 +576,7 @@
#define s390_alr(c, r1, r2) S390_RR(c, 0x1e, r1, r2)
#define s390_ar(c, r1, r2) S390_RR(c, 0x1a, r1, r2)
#define s390_basr(c, r1, r2) S390_RR(c, 0x0d, r1, r2)
+#define s390_bctr(c, r1, r2) S390_RR(c, 0x06, r1, r2)
#define s390_bras(c, r, o) S390_RI(c, 0xa75, r, o)
#define s390_brasl(c, r, o) S390_RIL_1(c, 0xc05, r, o)
#define s390_brc(c, m, d) S390_RI(c, 0xa74, m, d)
@@ -615,8 +617,11 @@
#define s390_jnl(c, d) s390_brc(c, S390_CC_GE, d)
#define s390_jnz(c, d) s390_brc(c, S390_CC_NZ, d)
#define s390_jo(c, d) s390_brc(c, S390_CC_OV, d)
+#define s390_jno(c, d) s390_brc(c, S390_CC_NO, d)
#define s390_jp(c, d) s390_brc(c, S390_CC_GT, d)
#define s390_jz(c, d) s390_brc(c, S390_CC_ZR, d)
+#define s390_jcy(c, d) s390_brc(c, S390_CC_CY, d)
+#define s390_jnc(c, d) s390_brc(c, S390_CC_NC, d)
#define s390_la(c, r, x, b, d) S390_RX(c, 0x41, r, x, b, d)
#define s390_lam(c, r1, r2, b, d) S390_RS_1(c, 0x9a, r1, r2, b, d)
#define s390_larl(c, r, o) S390_RIL_1(c, 0xc00, r, o)
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/mini/ChangeLog 2005-12-13 19:12:20 UTC (rev 54312)
@@ -1,3 +1,8 @@
+2005-12-13 Neale Ferguson <[EMAIL PROTECTED]>
+
+ * inssel-s390.brg tramp-s390.c cpu-s390.md mini-s390.c mini-s390.h:
+ Bring s390 up to current level.
+
2005-12-12 Zoltan Varga <[EMAIL PROTECTED]>
* generics.2.cs: Disable the newly added tests as they do not work yet.
Modified: trunk/mono/mono/mini/cpu-s390.md
===================================================================
--- trunk/mono/mono/mini/cpu-s390.md 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/mini/cpu-s390.md 2005-12-13 19:12:20 UTC (rev 54312)
@@ -50,13 +50,13 @@
adc_imm: dest:i src1:i len:18
add.ovf.un: len: 10 dest:i src1:i src2:i
add.ovf: len: 24 dest:i src1:i src2:i
-add: dest:i src1:i src2:i len:6 clob:1
+add: dest:i src1:i src2:i len:6
add_imm: dest:i src1:i len:18
addcc_imm: dest:i src1:i len:18
add_ovf_carry: dest:i src1:1 src2:i len:28
add_ovf_un_carry: dest:i src1:1 src2:i len:28
addcc: dest:i src1:i src2:i len:6
-and: dest:i src1:i src2:i len:6 clob:1
+and: dest:i src1:i src2:i len:6
and_imm: dest:i src1:i len:16
aot_const: dest:i len:8
arg:
Modified: trunk/mono/mono/mini/inssel-s390.brg
===================================================================
--- trunk/mono/mono/mini/inssel-s390.brg 2005-12-13 19:05:07 UTC (rev
54311)
+++ trunk/mono/mono/mini/inssel-s390.brg 2005-12-13 19:12:20 UTC (rev
54312)
@@ -187,16 +187,15 @@
}
stmt: OP_OUTARG_MEMBASE (reg) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE,
- argParm->offset, state->left->reg1);
-
- g_free(argParm);
+ arg->offset, state->left->reg1);
}
stmt: OP_OUTARG (OP_REGVAR) {
MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+
tree->opcode = OP_SETREG;
tree->dreg = mono_regstate_next_int (s->rs);
tree->sreg1 = state->left->tree->dreg;
@@ -206,12 +205,10 @@
}
stmt: OP_OUTARG_MEMBASE (OP_REGVAR) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE,
- argParm->offset, state->left->tree->dreg);
-
- g_free(argParm);
+ arg->offset, state->left->tree->dreg);
}
#stmt: OP_OUTARG (reg) {
@@ -239,6 +236,7 @@
stmt: OP_OUTARG (lreg) {
MonoCallInst *call = (MonoCallInst*)tree->inst_right;
int tdreg;
+
tdreg = mono_regstate_next_int (s->rs);
MONO_EMIT_NEW_UNALU (s, OP_SETREG, tree->unused, state->left->reg2);
@@ -254,13 +252,12 @@
}
stmt: OP_OUTARG_MEMBASE (lreg) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
-
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE,
- argParm->offset, state->left->reg2);
+ arg->offset, state->left->reg2);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE,
- argParm->offset + 4, state->left->reg1);
- g_free(argParm);
+ arg->offset + 4, state->left->reg1);
}
#stmt: OP_OUTARG (lreg) {
@@ -278,6 +275,7 @@
stmt: OP_OUTARG (OP_ICONST) {
MonoCallInst *call = (MonoCallInst*)tree->inst_right;
+
tree->opcode = OP_ICONST;
tree->dreg = mono_regstate_next_int (s->rs);
tree->inst_c0 = state->left->tree->inst_c0;
@@ -287,16 +285,15 @@
}
stmt: OP_OUTARG_MEMBASE (OP_ICONST) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STORE_MEMBASE_IMM, STK_BASE,
- argParm->offset,
state->left->tree->inst_c0);
-
- g_free (argParm);
+ arg->offset,
state->left->tree->inst_c0);
}
stmt: OP_OUTARG (CEE_LDIND_REF (OP_REGVAR)) {
MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+
tree->opcode = OP_SETREG;
tree->sreg1 = state->left->left->tree->dreg;
tree->dreg = mono_regstate_next_int (s->rs);
@@ -306,12 +303,10 @@
}
stmt: OP_OUTARG_MEMBASE (CEE_LDIND_REF (OP_REGVAR)) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
MONO_EMIT_NEW_STORE_MEMBASE_IMM (s, OP_STORE_MEMBASE_IMM, STK_BASE,
- argParm->offset,
state->left->tree->inst_c0);
-
- g_free(argParm);
+ arg->offset,
state->left->tree->inst_c0);
}
#stmt: OP_OUTARG (OP_ICONST) {
@@ -343,12 +338,10 @@
}
stmt: OP_OUTARG_MEMBASE (OP_LDADDR (OP_S390_LOADARG)) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, STK_BASE,
- argParm->offset,
state->left->left->tree->dreg);
-
- g_free(argParm);
+ arg->offset,
state->left->left->tree->dreg);
}
#stmt: OP_OUTARG (OP_LDADDR (OP_S390_LOADARG)) {
@@ -385,22 +378,21 @@
}
stmt: OP_OUTARG_MEMBASE (freg) {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
-
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+
/*----------------------------------------------*/
/* The length stored in size tells us whether */
/* we need to store a float or a double */
/*----------------------------------------------*/
- if (argParm->size == 4) {
+ if (arg->size == 4) {
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG,
- STK_BASE, argParm->offset,
+ STK_BASE, arg->offset,
state->left->reg1);
} else {
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER8_MEMBASE_REG,
- STK_BASE, argParm->offset,
+ STK_BASE, arg->offset,
state->left->reg1);
}
- g_free(argParm);
}
#stmt: OP_OUTARG_R4 (freg) {
@@ -467,12 +459,12 @@
stmt: OP_OUTARG_VT (CEE_LDOBJ (base)) {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoInst *vt = state->left->left->tree;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+ MonoInst *vt = state->left->left->tree;
int start_reg = tree->sreg1;
- int size = argParm->size;
+ int size = arg->size;
int soffset = vt->inst_offset;
int treg;
@@ -480,37 +472,35 @@
size = -size;
treg = mono_regstate_next_int (s->rs);
if (start_reg != STK_BASE) {
- MONO_EMIT_NEW_MOVE(s, STK_BASE, argParm->offPrm,
+ MONO_EMIT_NEW_MOVE(s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
- STK_BASE, argParm->offPrm);
+ STK_BASE, arg->offPrm);
mono_call_inst_add_outarg_reg (call, treg, start_reg,
FALSE);
} else {
- MONO_EMIT_NEW_MOVE(s, STK_BASE,
argParm->offPrm+sizeof(gpointer),
+ MONO_EMIT_NEW_MOVE(s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
- MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
-
argParm->offPrm+sizeof(gpointer));
+ MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
arg->offPrm);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
- STK_BASE, argParm->offPrm,
treg);
+ STK_BASE, arg->offset,
treg);
}
} else {
if (start_reg != STK_BASE) {
MONO_OUTPUT_VTR (s, size, start_reg, vt->inst_basereg,
soffset);
} else {
- MONO_OUTPUT_VTS (s, size, STK_BASE, argParm->offset,
+ MONO_OUTPUT_VTS (s, size, STK_BASE, arg->offset,
vt->inst_basereg, soffset);
}
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_ARGPTR)) {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoInst *vt = state->left->left->tree;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+ MonoInst *vt = state->left->left->tree;
int start_reg = tree->sreg1;
- int size = argParm->size;
+ int size = arg->size;
int soffset = vt->inst_offset;
int treg;
@@ -519,38 +509,35 @@
size = -size;
treg = mono_regstate_next_int (s->rs);
if (start_reg != STK_BASE) {
- MONO_EMIT_NEW_MOVE (s, STK_BASE, argParm->offset,
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offset,
vt->inst_basereg, soffset, size);
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
- STK_BASE, argParm->offPrm);
+ STK_BASE, arg->offPrm);
mono_call_inst_add_outarg_reg (call, treg, start_reg,
FALSE);
} else {
- MONO_EMIT_NEW_MOVE (s, STK_BASE,
- argParm->offset+sizeof(gpointer),
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
- MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
-
argParm->offset+sizeof(gpointer));
+ MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
arg->offPrm);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
- STK_BASE, argParm->offset,
treg);
+ STK_BASE, arg->offset,
treg);
}
} else {
if (start_reg != STK_BASE) {
MONO_OUTPUT_VTR (s, size, start_reg, vt->inst_basereg,
soffset);
} else {
- MONO_OUTPUT_VTS (s, size, STK_BASE, argParm->offset,
+ MONO_OUTPUT_VTS (s, size, STK_BASE, arg->offset,
vt->inst_basereg, soffset);
}
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_REGOFFSET)) "0" {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoInst *vt = state->left->left->tree;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+ MonoInst *vt = state->left->left->tree;
int start_reg = tree->sreg1;
- int size = argParm->size;
+ int size = arg->size;
int soffset = vt->inst_offset;
int treg;
@@ -561,38 +548,35 @@
if (start_reg != STK_BASE) {
// MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
// STK_BASE, soffset);
- MONO_EMIT_NEW_MOVE (s, STK_BASE, argParm->offPrm,
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
- STK_BASE, argParm->offPrm);
+ STK_BASE, arg->offPrm);
mono_call_inst_add_outarg_reg (call, treg, start_reg,
FALSE);
} else {
- MONO_EMIT_NEW_MOVE (s, STK_BASE,
- argParm->offPrm+sizeof(gpointer),
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
- MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
-
argParm->offPrm+sizeof(gpointer));
+ MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
arg->offPrm);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
- STK_BASE, argParm->offPrm,
treg);
+ STK_BASE, arg->offset,
treg);
}
} else {
if (start_reg != STK_BASE) {
MONO_OUTPUT_VTR(s, size, start_reg, vt->inst_basereg,
soffset);
} else {
- MONO_OUTPUT_VTS(s, size, STK_BASE, argParm->offset,
+ MONO_OUTPUT_VTS(s, size, STK_BASE, arg->offset,
vt->inst_basereg, soffset);
}
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (CEE_LDOBJ (OP_S390_LOADARG)) {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoInst *vt = state->left->left->tree;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+ MonoInst *vt = state->left->left->tree;
int start_reg = tree->sreg1;
- int size = -argParm->size;
+ int size = -arg->size;
int soffset = vt->inst_offset;
int treg;
@@ -600,27 +584,25 @@
treg = mono_regstate_next_int (s->rs);
if (start_reg != STK_BASE) {
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
soffset);
- MONO_EMIT_NEW_MOVE (s, STK_BASE, argParm->offPrm, treg, 0,
size);
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm, treg, 0, size);
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
- STK_BASE, argParm->offPrm);
+ STK_BASE, arg->offPrm);
mono_call_inst_add_outarg_reg (call, treg, start_reg, FALSE);
} else {
- MONO_EMIT_NEW_MOVE (s, STK_BASE,
- argParm->offset+sizeof(gpointer),
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
vt->inst_basereg, soffset, size);
- MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
- argParm->offset+sizeof(gpointer));
+ MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
arg->offPrm);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
- STK_BASE, argParm->offset, treg);
+ STK_BASE, arg->offset, treg);
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (OP_ICONST) {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+
int start_reg = tree->sreg1;
- int size = argParm->size;
+ int size = arg->size;
int nregs = size / 4;
//printf("OP_OUTARG_VT(OP_ICONST)\n");
@@ -636,26 +618,25 @@
MONO_OUTPUT_VTS (s, size, STK_BASE, tree->inst_c0,
s->frame_reg, tree->inst_offset);
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (reg) {
- MonoCallInst *call = (MonoCallInst*) tree->inst_right;
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
- MonoInst *vt = state->left->left->tree;
- int start_reg = tree->sreg1;
- int size = argParm->size;
- int soffset = vt->inst_offset;
+ MonoCallInst *call = (MonoCallInst*) tree->inst_right;
+ MonoCallArgParm *arg = (MonoCallArgParm *) tree;
+ MonoInst *vt = state->left->left->tree;
+ int start_reg = tree->sreg1;
+ int size = arg->size;
+ int soffset = vt->inst_offset;
int treg;
if (size < 0) {
size = -size;
treg = mono_regstate_next_int (s->rs);
if (start_reg != STK_BASE) {
- MONO_EMIT_NEW_MOVE (s, STK_BASE, argParm->offPrm,
state->left->reg1,
+ MONO_EMIT_NEW_MOVE (s, STK_BASE, arg->offPrm,
state->left->reg1,
0, size);
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg,
- STK_BASE, argParm->offPrm);
+ STK_BASE, arg->offPrm);
mono_call_inst_add_outarg_reg (call, treg, start_reg,
FALSE);
} else {
MONO_EMIT_NEW_MOVE (s, STK_BASE, soffset+size,
state->left->reg1,
@@ -663,7 +644,7 @@
MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, treg, STK_BASE,
soffset+size);
MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG,
- STK_BASE, argParm->offset,
treg);
+ STK_BASE, arg->offset,
treg);
}
} else {
if (start_reg != STK_BASE) {
@@ -676,16 +657,12 @@
s->stack_offset);
}
}
- g_free(argParm);
}
stmt: OP_OUTARG_VT (OP_REFANYTYPE (reg)) "0" {
- MonoS390ArgParm *argParm = (MonoS390ArgParm *) tree->unused;
-
//printf("OP_OUTARG_VT (OP_REFANYTYPE (base))\n");
MONO_EMIT_NEW_LOAD_MEMBASE (s, state->tree->sreg1,
state->left->left->reg1,
G_STRUCT_OFFSET (MonoTypedRef, type));
- g_free(argParm);
}
stmt: CEE_STIND_R8 (OP_REGVAR, freg) {
@@ -799,8 +776,6 @@
reg: OP_LDADDR (OP_S390_ARGREG),
reg: CEE_LDOBJ (OP_S390_ARGREG) "0" {
- int treg;
-
MONO_EMIT_LOAD_MEMBASE (s, tree, state->reg1, s->frame_reg,
state->left->tree->inst_offset);
}
Modified: trunk/mono/mono/mini/mini-s390.c
===================================================================
--- trunk/mono/mono/mini/mini-s390.c 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/mini/mini-s390.c 2005-12-13 19:12:20 UTC (rev 54312)
@@ -27,7 +27,7 @@
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);
\
@@ -42,7 +42,7 @@
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);
\
@@ -61,7 +61,7 @@
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);
\
@@ -76,7 +76,7 @@
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);
\
@@ -1221,10 +1221,9 @@
sz->stack_size = S390_ALIGN(sz->stack_size, sizeof(long));
ainfo->offset = sz->stack_size;
ainfo->reg = STK_BASE;
-// sz->parm_size += sizeof(gpointer);
+ sz->parm_size += sizeof(gpointer);
} else {
ainfo->reg = *gr;
-// sz->parm_size += size;
}
(*gr) ++;
ainfo->offparm = sz->parm_size;
@@ -1794,9 +1793,9 @@
MonoCallInst*
mono_arch_call_opcode (MonoCompile *cfg, MonoBasicBlock* bb,
MonoCallInst *call, int is_virtual) {
- MonoInst *arg, *in;
+ MonoInst *in;
+ MonoCallArgParm *arg;
MonoMethodSignature *sig;
- MonoS390ArgParm *argParm;
int i, n, lParamArea;
CallInfo *cinfo;
ArgInfo *ainfo;
@@ -1829,17 +1828,14 @@
MONO_INST_NEW (cfg, sigArg, OP_ICONST);
sigArg->inst_p0 = call->signature;
- MONO_INST_NEW (cfg, arg, OP_OUTARG_MEMBASE);
- arg->inst_left = sigArg;
- arg->inst_right = (MonoInst *) call;
- argParm = g_malloc(sizeof(MonoS390ArgParm));
- argParm->size = ainfo->size;
- argParm->offset = cinfo->sigCookie.offset;
- arg->unused = (gint32) argParm;
- call->used_iregs |= 1 << ainfo->reg;
-
- arg->next = call->out_args;
- call->out_args = arg;
+ MONO_INST_NEW_CALL_ARG (cfg, arg, OP_OUTARG_MEMBASE);
+ arg->ins.inst_left = sigArg;
+ arg->ins.inst_right = (MonoInst *) call;
+ arg->size = ainfo->size;
+ arg->offset = cinfo->sigCookie.offset;
+ call->used_iregs |= 1 << ainfo->reg;
+ arg->ins.next = call->out_args;
+ call->out_args = (MonoInst *) arg;
}
if (is_virtual && i == 0) {
@@ -1847,29 +1843,27 @@
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->inst_right = (MonoInst *) call;
+ 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.unused = ainfo->reg;
call->used_iregs |= 1 << ainfo->reg;
- if (arg->type == STACK_I8)
+ if (arg->ins.type == STACK_I8)
call->used_iregs |= 1 << (ainfo->reg +
1);
} else if (ainfo->regtype == RegTypeStructByAddr) {
call->used_iregs |= 1 << ainfo->reg;
- arg->sreg1 = ainfo->reg;
- arg->opcode = OP_OUTARG_VT;
- argParm =
g_malloc(sizeof(MonoS390ArgParm));
- argParm->size = -ainfo->vtsize;
- argParm->offset = ainfo->offset;
- argParm->offPrm = ainfo->offparm +
cinfo->offStruct;
- arg->unused = (gint32) argParm;
+ arg->ins.sreg1 = ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_VT;
+ arg->size = -ainfo->vtsize;
+ arg->offset = ainfo->offset;
+ arg->offPrm = ainfo->offparm +
cinfo->offStruct;
} else if (ainfo->regtype == RegTypeStructByVal) {
if (ainfo->reg != STK_BASE) {
switch (ainfo->size) {
@@ -1887,28 +1881,24 @@
call->used_iregs |= 1 <<
ainfo->reg;
}
}
- arg->sreg1 = ainfo->reg;
- arg->opcode = OP_OUTARG_VT;
- argParm =
g_malloc(sizeof(MonoS390ArgParm));
- argParm->size = ainfo->size;
- argParm->offset = ainfo->offset;
- argParm->offPrm = ainfo->offparm +
cinfo->offStruct;
- arg->unused = (gint32) argParm;
+ arg->ins.sreg1 = ainfo->reg;
+ arg->ins.opcode = OP_OUTARG_VT;
+ arg->size = ainfo->size;
+ arg->offset = ainfo->offset;
+ arg->offPrm = ainfo->offparm +
cinfo->offStruct;
} else if (ainfo->regtype == RegTypeBase) {
- arg->opcode = OP_OUTARG_MEMBASE;
- arg->sreg1 = ainfo->reg;
- argParm =
g_malloc(sizeof(MonoS390ArgParm));
- argParm->size = ainfo->size;
- argParm->offset = ainfo->offset;
- arg->unused = (gint32) argParm;
+ 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.unused = ainfo->reg;
call->used_fregs |= 1 << ainfo->reg;
if (ainfo->size == 4)
- arg->opcode = OP_OUTARG_R4;
+ arg->ins.opcode = OP_OUTARG_R4;
else
- arg->opcode = OP_OUTARG_R8;
+ arg->ins.opcode = OP_OUTARG_R8;
} else {
g_assert_not_reached ();
}
@@ -2449,7 +2439,7 @@
break;
case OP_STORE_MEMBASE_IMM:
case OP_STOREI4_MEMBASE_IMM: {
- if (s390_is_uimm16(ins->inst_imm)) {
+ if (s390_is_imm16(ins->inst_imm)) {
s390_lhi (code, s390_r0, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
@@ -2524,7 +2514,7 @@
if (s390_is_uimm12(ins->inst_offset))
s390_l (code, ins->dreg, 0,
ins->inst_basereg, ins->inst_offset);
else {
- if (s390_is_uimm16(ins->inst_offset)) {
+ if (s390_is_imm16(ins->inst_offset)) {
s390_lhi (code, s390_r13,
ins->inst_offset);
s390_l (code, ins->dreg, s390_r13,
ins->inst_basereg, 0);
} else {
@@ -2644,27 +2634,27 @@
break;
case OP_COMPARE: {
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)))
+ (((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, ins->sreg2);
else
s390_cr (code, ins->sreg1, ins->sreg2);
}
break;
case OP_COMPARE_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
s390_lhi (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)))
+ (((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);
else
s390_cr (code, ins->sreg1, s390_r0);
@@ -2674,12 +2664,12 @@
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)))
+ (((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_cl (code, ins->sreg1, 0,
s390_r13, 4);
else
s390_c (code, ins->sreg1, 0,
s390_r13, 4);
@@ -2722,7 +2712,7 @@
}
s390_al (code, ins->dreg, 0, s390_r13, 4);
} else {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg,
ins->sreg1);
}
@@ -2740,7 +2730,7 @@
}
break;
case OP_ADC_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg, ins->sreg1);
}
@@ -2819,7 +2809,7 @@
}
break;
case OP_SUBCC_IMM: {
- if (s390_is_uimm16 (-ins->inst_imm)) {
+ if (s390_is_imm16 (-ins->inst_imm)) {
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg, ins->sreg1);
}
@@ -2836,7 +2826,7 @@
}
break;
case OP_SUB_IMM: {
- if (s390_is_uimm16 (-ins->inst_imm)) {
+ if (s390_is_imm16 (-ins->inst_imm)) {
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg, ins->sreg1);
}
@@ -2856,7 +2846,7 @@
if (ins->dreg != ins->sreg1) {
s390_lr (code, ins->dreg, ins->sreg1);
}
- if (s390_is_uimm16 (-ins->inst_imm)) {
+ if (s390_is_imm16 (-ins->inst_imm)) {
s390_lhi (code, s390_r0, ins->inst_imm);
s390_slbr (code, ins->dreg, s390_r0);
} else {
@@ -2932,7 +2922,7 @@
}
break;
case OP_AND_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ 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);
@@ -2964,7 +2954,7 @@
}
break;
case OP_DIV_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
s390_lhi (code, s390_r13, ins->inst_imm);
s390_lr (code, s390_r0, ins->sreg1);
} else {
@@ -2993,7 +2983,7 @@
}
break;
case OP_REM_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
s390_lhi (code, s390_r13, ins->inst_imm);
s390_lr (code, s390_r0, ins->sreg1);
} else {
@@ -3024,7 +3014,7 @@
}
break;
case OP_OR_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ 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);
@@ -3057,7 +3047,7 @@
}
break;
case OP_XOR_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ 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);
@@ -3138,7 +3128,7 @@
}
break;
case OP_MUL_IMM: {
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
s390_lhi (code, s390_r13, ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
@@ -3200,7 +3190,7 @@
break;
case OP_ICONST:
case OP_SETREGIMM: {
- if (s390_is_uimm16(ins->inst_c0)) {
+ if (s390_is_imm16(ins->inst_c0)) {
s390_lhi (code, ins->dreg, ins->inst_c0);
} else {
s390_basr (code, s390_r13, 0);
@@ -3252,7 +3242,7 @@
}
break;
case OP_TLS_GET: {
- if (s390_is_uimm16 (ins->inst_offset)) {
+ if (s390_is_imm16 (ins->inst_offset)) {
s390_lhi (code, s390_r13, ins->inst_offset);
} else {
s390_bras (code, s390_r13, 0);
@@ -3308,7 +3298,7 @@
case OP_ARGLIST: {
int offset = cfg->sig_cookie + cfg->stack_usage;
- if (s390_is_uimm16 (offset))
+ if (s390_is_imm16 (offset))
s390_lhi (code, s390_r0, offset);
else {
s390_basr (code, s390_r13, 0);
@@ -3861,7 +3851,7 @@
ins->inst_offset,
ins->sreg1, ins->inst_imm);
} else {
s390_lr (code, s390_r0, ins->dreg);
- if (s390_is_uimm16 (ins->inst_offset)) {
+ if (s390_is_imm16 (ins->inst_offset)) {
s390_ahi (code, s390_r0,
ins->inst_offset);
} else {
s390_basr (code, s390_r13, 0);
@@ -3871,12 +3861,12 @@
}
s390_lr (code, s390_r14, s390_r12);
s390_lr (code, s390_r12, ins->sreg1);
- if (s390_is_uimm16 (ins->inst_imm)) {
+ if (s390_is_imm16 (ins->inst_imm)) {
s390_ahi (code, s390_r12,
ins->inst_imm);
} else {
s390_basr (code, s390_r13, 0);
s390_j (code, 4);
- s390_word (code,
ins->inst_imm);
+ s390_word (code, ins->inst_imm);
s390_a (code, s390_r12, 0,
s390_r13, 4);
}
s390_lr (code, s390_r1, ins->sreg1);
@@ -4223,8 +4213,7 @@
if (ainfo->reg == STK_BASE) {
s390_lr (code, s390_r13, ainfo->reg);
s390_ahi (code, s390_r13, alloc_size);
- s390_l (code, s390_r13, 0, s390_r13,
- ainfo->offparm +
cinfo->offStruct);
+ s390_l (code, s390_r13, 0, s390_r13,
ainfo->offset);
code = emit_memcpy (code,
abs(ainfo->vtsize),
inst->inst_basereg,
inst->inst_offset,
s390_r13, 0);
Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/mini/mini-s390.h 2005-12-13 19:12:20 UTC (rev 54312)
@@ -92,14 +92,14 @@
MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU1_MEMBASE,
\
tmpr, sr, so);
\
MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG,
\
- tmpr, dr, dx);
\
+ dr, dx, tmpr);
\
break;
\
case 2:
\
tmpr = mono_regstate_next_int (cfg->rs);
\
MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU2_MEMBASE,
\
tmpr, sr, so);
\
MONO_EMIT_NEW_STORE_MEMBASE(cfg, OP_STORE_MEMBASE_REG,
\
- tmpr, dr, dx);
\
+ dr, dx, tmpr);
\
break;
\
case 4:
\
case 8:
\
Modified: trunk/mono/mono/mini/tramp-s390.c
===================================================================
--- trunk/mono/mono/mini/tramp-s390.c 2005-12-13 19:05:07 UTC (rev 54311)
+++ trunk/mono/mono/mini/tramp-s390.c 2005-12-13 19:12:20 UTC (rev 54312)
@@ -22,11 +22,11 @@
#define GR_SAVE_SIZE 4*sizeof(long)
#define FP_SAVE_SIZE 16*sizeof(double)
-#define CREATE_GR_OFFSET S390_MINIMAL_STACK_SIZE
+#define METHOD_SAVE_OFFSET S390_MINIMAL_STACK_SIZE
+#define CREATE_GR_OFFSET METHOD_SAVE_OFFSET+sizeof(gpointer)
#define CREATE_FP_OFFSET CREATE_GR_OFFSET+GR_SAVE_SIZE
#define CREATE_LMF_OFFSET CREATE_FP_OFFSET+FP_SAVE_SIZE
#define CREATE_STACK_SIZE
(CREATE_LMF_OFFSET+2*sizeof(long)+sizeof(MonoLMF))
-#define METHOD_SAVE_OFFSET S390_RET_ADDR_OFFSET-4
/*------------------------------------------------------------------*/
/* Method-specific trampoline code fragment sizes */
@@ -264,6 +264,7 @@
s390_lr (buf, s390_r11, s390_r15);
s390_ahi (buf, STK_BASE, -CREATE_STACK_SIZE);
s390_st (buf, s390_r11, 0, STK_BASE, 0);
+ s390_st (buf, s390_r1, 0, STK_BASE, METHOD_SAVE_OFFSET);
s390_stm (buf, s390_r2, s390_r5, STK_BASE, CREATE_GR_OFFSET);
/* Save the FP registers */
@@ -320,7 +321,7 @@
/*---------------------------------------------------------------*/
/* save method info
*/
/*---------------------------------------------------------------*/
- s390_l (buf, s390_r1, 0, s390_r11, METHOD_SAVE_OFFSET);
+ s390_l (buf, s390_r1, 0, STK_BASE, METHOD_SAVE_OFFSET);
s390_st (buf, s390_r1, 0, s390_r13,
G_STRUCT_OFFSET(MonoLMF, method));
@@ -358,10 +359,10 @@
/* Set arguments */
- /* Arg 1: MonoMethod *method. It was put in r11 by the
+ /* Arg 1: MonoMethod *method. It was put in r1 by the
method-specific trampoline code, and then saved before the call
- to mono_get_lmf_addr()'. Restore r13, by the way :-) */
- s390_l (buf, s390_r2, 0, s390_r11, METHOD_SAVE_OFFSET);
+ to mono_get_lmf_addr()'. */
+ s390_l (buf, s390_r2, 0, STK_BASE, METHOD_SAVE_OFFSET);
/* Arg 2: code (next address to the instruction that called us)
*/
if (tramp_type == MONO_TRAMPOLINE_JUMP) {
@@ -450,10 +451,10 @@
code = buf = mono_code_manager_reserve (domain->code_mp,
METHOD_TRAMPOLINE_SIZE);
mono_domain_unlock (domain);
- s390_basr (buf, s390_r13, 0);
+ s390_basr (buf, s390_r1, 0);
s390_j (buf, 4);
s390_word (buf, method);
- s390_l (buf, s390_r13, 0, s390_r13, 4);
+ s390_l (buf, s390_r1, 0, s390_r1, 4);
displace = (tramp - buf) / 2;
s390_jcl (buf, S390_CC_UN, displace);
@@ -510,17 +511,17 @@
vc = mono_get_trampoline_code (MONO_TRAMPOLINE_GENERIC);
- /* This is the method-specific part of the trampoline. Its purpose is
- to provide the generic part with the MonoMethod *method pointer. We'll
- use r13 to keep that value, for instance. However, the generic part of
- the trampoline relies on r11 having the same value it had before coming
- here, so we must save it before. */
+ /*----------------------------------------------------------*/
+ /* This is the method-specific part of the trampoline. Its */
+ /* purpose is to provide the generic part with the */
+ /* MonoMethod *method pointer. We'll use r1 to keep it. */
+ /*----------------------------------------------------------*/
code = buf = mono_global_codeman_reserve(METHOD_TRAMPOLINE_SIZE);
- s390_basr (buf, s390_r13, 0);
+ s390_basr (buf, s390_r1, 0);
s390_j (buf, 4);
s390_word (buf, method);
- s390_l (buf, s390_r13, 0, s390_r13, 4);
+ s390_l (buf, s390_r1, 0, s390_r1, 4);
displace = (vc - buf) / 2;
s390_jcl (buf, S390_CC_UN, displace);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches