Merge from HEAD.

svn path=/branches/mono-1-0/mono/; revision=32059

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index bd12b2ad5e5c983d411c4384d351125af77a0e09..11963453f15d60ec65032b784b849c6944f95744 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,6 @@
+2004-08-09  Zoltan Varga  <vargaz@freemail.hu>
+
+       * inssel-x86.brg: Set dreg of LOCALLOC correctly.
 
 Tue Aug 3 11:20:09 CEST 2004 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/mini/inssel-x86.brg b/mono/mini/inssel-x86.brg
index b1f1cf67c77c49610fdc68c8ca4931fbace2a243..96419ccdff80ae200dc2da73eeeb4fce2f929b84 100644 (file)
--- a/mono/mini/inssel-x86.brg
+++ b/mono/mini/inssel-x86.brg
@@ -151,6 +151,7 @@ reg: OP_LOCALLOC (OP_ICONST) {
        if (tree->flags & MONO_INST_INIT) {
                /* microcoded in mini-x86.c */
                tree->sreg1 = mono_regstate_next_int (s->rs);
+               tree->dreg = state->reg1;
                MONO_EMIT_NEW_ICONST (s, tree->sreg1, state->left->tree->inst_c0);
                mono_bblock_add_inst (s->cbb, tree);
        } else {