Author: zoltan
Date: 2007-12-07 16:30:40 -0500 (Fri, 07 Dec 2007)
New Revision: 90962
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-amd64.c
Log:
2007-12-07 Zoltan Varga <[EMAIL PROTECTED]>
* mini-amd64.c (peephole_pass): Add a missing instruction check.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-12-07 21:22:22 UTC (rev 90961)
+++ trunk/mono/mono/mini/ChangeLog 2007-12-07 21:30:40 UTC (rev 90962)
@@ -1,11 +1,14 @@
+2007-12-07 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-amd64.c (peephole_pass): Add a missing instruction check.
+
Fri Dec 7 22:08:23 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.c: run type ctor before allocating an object, not only
when running it's constructor method (fixes at least part of bug
#342507).
2007-12-07 Zoltan Varga <[EMAIL PROTECTED]>
-
+
* mini-trampolines.c (mono_delegate_trampoline): Fix a warning.
* mini-trampolines.c (mono_generic_class_init_trampoline): Remove a
debug printf.
Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c 2007-12-07 21:22:22 UTC (rev 90961)
+++ trunk/mono/mono/mini/mini-amd64.c 2007-12-07 21:30:40 UTC (rev 90962)
@@ -1892,7 +1892,7 @@
if (((ins2->opcode ==
OP_STORE_MEMBASE_IMM) || (ins2->opcode == OP_STOREI4_MEMBASE_IMM) ||
(ins2->opcode == OP_STOREI8_MEMBASE_IMM) || (ins2->opcode ==
OP_STORE_MEMBASE_IMM)) && (ins2->inst_imm == 0)) {
ins2->opcode =
store_membase_imm_to_store_membase_reg (ins2->opcode);
ins2->sreg1 = ins->dreg;
- } else if ((ins2->opcode ==
OP_STOREI1_MEMBASE_IMM) || (ins2->opcode == OP_STOREI2_MEMBASE_IMM) ||
(ins2->opcode == OP_STOREI8_MEMBASE_REG) || (ins2->opcode ==
OP_STORE_MEMBASE_REG)) {
+ } else if ((ins2->opcode ==
OP_STOREI1_MEMBASE_IMM) || (ins2->opcode == OP_STOREI2_MEMBASE_IMM) ||
(ins2->opcode == OP_STOREI4_MEMBASE_REG) || (ins2->opcode ==
OP_STOREI8_MEMBASE_REG) || (ins2->opcode == OP_STORE_MEMBASE_REG)) {
/* Continue */
} else if (((ins2->opcode == OP_ICONST)
|| (ins2->opcode == OP_I8CONST)) && (ins2->dreg == ins->dreg) && (ins2->inst_c0
== 0)) {
NULLIFY_INS (ins2);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
