Author: zoltan
Date: 2006-06-08 15:12:53 -0400 (Thu, 08 Jun 2006)
New Revision: 61582

Modified:
   branches/mono-1-1-13/mono/mono/mini/ChangeLog
   branches/mono-1-1-13/mono/mono/mini/mini-amd64.c
Log:
Merge from HEAD.


Modified: branches/mono-1-1-13/mono/mono/mini/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/ChangeLog       2006-06-08 19:10:41 UTC 
(rev 61581)
+++ branches/mono-1-1-13/mono/mono/mini/ChangeLog       2006-06-08 19:12:53 UTC 
(rev 61582)
@@ -1,3 +1,8 @@
+2006-06-08  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-amd64.c (mono_arch_output_basic_block): Fix a wrong reg-reg move 
+       in OP_ATOMIC_EXCHANGE_I4.
+
 2006-05-18  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini-sparc.c (mono_arch_output_basic_block): Add support for large 
stack offets

Modified: branches/mono-1-1-13/mono/mono/mini/mini-amd64.c
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/mini-amd64.c    2006-06-08 19:10:41 UTC 
(rev 61581)
+++ branches/mono-1-1-13/mono/mono/mini/mini-amd64.c    2006-06-08 19:12:53 UTC 
(rev 61582)
@@ -3866,7 +3866,7 @@
                        }
 
                        if (breg == AMD64_RAX) {
-                               amd64_mov_reg_reg (code, AMD64_R11, AMD64_RAX, 
size);
+                               amd64_mov_reg_reg (code, AMD64_R11, AMD64_RAX, 
8);
                                breg = AMD64_R11;
                        }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to