Author: lupus
Date: 2007-03-23 13:45:57 -0500 (Fri, 23 Mar 2007)
New Revision: 74898

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-ppc.c
Log:


Fri Mar 23 19:43:35 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>

        * mini-ppc.c: fixes for the fp_branch_nan test.



Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-03-23 18:41:37 UTC (rev 74897)
+++ trunk/mono/mono/mini/ChangeLog      2007-03-23 18:45:57 UTC (rev 74898)
@@ -1,14 +1,16 @@
+
+Fri Mar 23 19:43:35 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+       * mini-ppc.c: fixes for the fp_branch_nan test.
+
 2007-03-23  Zoltan Varga  <[EMAIL PROTECTED]>
 
-<<<<<<< .mine
        * basic.cs: Comment out new test which still fails on ia64.
 
-=======
 Fri Mar 23 15:54:23 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
 
        * mini.c: immediate shifted or fix (mono_metadata_user_string assert).
 
->>>>>>> .r74880
 Fri Mar 23 12:53:28 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
 
        * mini-ppc.c, mini-ppc.h: struct passing ABI fix (bug #77968).
@@ -9981,3 +9983,4 @@
 
 
 
+

Modified: trunk/mono/mono/mini/mini-ppc.c
===================================================================
--- trunk/mono/mono/mini/mini-ppc.c     2007-03-23 18:41:37 UTC (rev 74897)
+++ trunk/mono/mono/mini/mini-ppc.c     2007-03-23 18:45:57 UTC (rev 74898)
@@ -2884,7 +2884,7 @@
                        g_assert_not_reached ();
                        break;
                case OP_FCOMPARE:
-                       ppc_fcmpo (code, 0, ins->sreg1, ins->sreg2);
+                       ppc_fcmpu (code, 0, ins->sreg1, ins->sreg2);
                        break;
                case OP_FCEQ:
                        ppc_fcmpo (code, 0, ins->sreg1, ins->sreg2);
@@ -2925,6 +2925,7 @@
                        EMIT_COND_BRANCH (ins, CEE_BNE_UN - CEE_BEQ);
                        break;
                case OP_FBLT:
+                       ppc_bc (code, PPC_BR_TRUE, PPC_BR_SO, 2);
                        EMIT_COND_BRANCH (ins, CEE_BLT - CEE_BEQ);
                        break;
                case OP_FBLT_UN:
@@ -2932,6 +2933,7 @@
                        EMIT_COND_BRANCH (ins, CEE_BLT_UN - CEE_BEQ);
                        break;
                case OP_FBGT:
+                       ppc_bc (code, PPC_BR_TRUE, PPC_BR_SO, 2);
                        EMIT_COND_BRANCH (ins, CEE_BGT - CEE_BEQ);
                        break;
                case OP_FBGT_UN:
@@ -2939,12 +2941,14 @@
                        EMIT_COND_BRANCH (ins, CEE_BGT_UN - CEE_BEQ);
                        break;
                case OP_FBGE:
+                       ppc_bc (code, PPC_BR_TRUE, PPC_BR_SO, 2);
                        EMIT_COND_BRANCH (ins, CEE_BGE - CEE_BEQ);
                        break;
                case OP_FBGE_UN:
                        EMIT_COND_BRANCH (ins, CEE_BGE_UN - CEE_BEQ);
                        break;
                case OP_FBLE:
+                       ppc_bc (code, PPC_BR_TRUE, PPC_BR_SO, 2);
                        EMIT_COND_BRANCH (ins, CEE_BLE - CEE_BEQ);
                        break;
                case OP_FBLE_UN:

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

Reply via email to