X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Finssel-long.brg;h=d9d430987988f2f1a7aa2b811b427a868af95309;hb=ca030c24e1869ce323e8ed3d61e021c2d5c72811;hp=9f774f8ac07130dd1e5b9d712c1844c939469b14;hpb=38f320d19a29a3e7d6a92cdb0b3ebec149d7c1a7;p=mono.git

diff --git a/mono/mini/inssel-long.brg b/mono/mini/inssel-long.brg
index 9f774f8ac07..d9d43098798 100644
--- a/mono/mini/inssel-long.brg
+++ b/mono/mini/inssel-long.brg
@@ -228,103 +228,83 @@ reg: OP_LCONV_TO_U2 (reg) {
 }
 
 reg: OP_LCONV_TO_OVF_I1 (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 127);
-	MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, -128);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT, state->left->reg1, 127, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, -128, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, CEE_CONV_I1, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_I1_UN (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 127);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 127, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, CEE_CONV_I1, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_U1 (reg) {
 	/* probe value to be within 0 to 255 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 255);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 255, "OverflowException");
 	MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xff);
 }
 
 reg: OP_LCONV_TO_OVF_U1_UN (reg) {
 	/* probe value to be within 0 to 255 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 255);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 255, "OverflowException");
 	MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xff);
 }
 
 reg: OP_LCONV_TO_OVF_I2 (reg) {
 	/* Probe value to be within -32768 and 32767 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 32767);
-	MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, -32768);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT, state->left->reg1, 32767, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, -32768, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, CEE_CONV_I2, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_I2_UN (reg) {
 	/* Probe value to be within 0 and 32767 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 32767);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 32767, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, CEE_CONV_I2, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_U2 (reg) {
 	/* Probe value to be within 0 and 65535 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffff);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 0xffff, "OverflowException");
 	MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xffff);
 }
 
 reg: OP_LCONV_TO_OVF_U2_UN (reg) {
 	/* Probe value to be within 0 and 65535 */
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffff);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 0xffff, "OverflowException");
 	MONO_EMIT_BIALU_IMM (s, tree, OP_AND_IMM, state->reg1, state->left->reg1, 0xffff);
 }
 
 reg: OP_LCONV_TO_OVF_I4 (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0x7fffffff);
-	MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, -2147483648);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT, state->left->reg1, 0x7fffffff, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, -2147483648, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_I4_UN (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0x7fffffff);
-	MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 0x7fffffff, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_U4 (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffffffffUL);
-	MONO_EMIT_NEW_COND_EXC (s, GT, "OverflowException");
-	MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, state->left->reg1, 0);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT, state->left->reg1, 0xffffffffUL, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, 0, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_U4_UN (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0xffffffff);
-	MONO_EMIT_NEW_COND_EXC (s, GT_UN, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, GT_UN, state->left->reg1, 0xffffffff, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_I_UN (reg),
 reg: OP_LCONV_TO_OVF_I8_UN (reg) {
-	MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, state->left->reg1, 0);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
-
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, 0, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
 reg: OP_LCONV_TO_OVF_U8 (reg) {
-	MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, state->left->reg1, 0);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
-
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, 0, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }
 
@@ -346,19 +326,18 @@ freg: OP_LCONV_TO_R_UN (lreg) {
 
 reg: CEE_CONV_OVF_I8 (reg) {
 	/* Sign extend the value in the lower word into the upper word */
-	MONO_EMIT_BIALU_IMM (s, tree, OP_LSHR_IMM, state->reg1, state->left->reg1, 0);
+	MONO_EMIT_UNALU (s, tree, CEE_CONV_I8, state->reg1, state->left->reg1);
 }
 
 reg: CEE_CONV_OVF_I8_UN (reg),
 reg: CEE_CONV_OVF_U8_UN (reg) {
 	/* an unsigned 32 bit num always fits in an (un)signed 64 bit one */
 	/* Clean out the upper word */
-	MONO_EMIT_BIALU_IMM (s, tree, OP_ISHR_UN_IMM, state->reg1, state->left->reg1, 0);
+	MONO_EMIT_UNALU (s, tree, CEE_CONV_U8, state->reg1, state->left->reg1);
 }
 
 reg: CEE_CONV_OVF_U8 (reg) {
-	MONO_EMIT_NEW_COMPARE_IMM (s, state->left->reg1, 0);
-	MONO_EMIT_NEW_COND_EXC (s, LT, "OverflowException");
+	MONO_EMIT_NEW_COMPARE_IMM_EXC (s, LT, state->left->reg1, 0, "OverflowException");
 	MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, state->left->reg1);
 }