Author: zoltan
Date: 2005-04-09 16:01:17 -0400 (Sat, 09 Apr 2005)
New Revision: 42742

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/cpu-amd64.md
   trunk/mono/mono/mini/exceptions-amd64.c
   trunk/mono/mono/mini/mini-amd64.c
Log:
2005-04-09  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-amd64.c (mono_arch_output_basic_block): Fix stack alignment
        and leakage in CKFINITE.

        * exceptions-amd64.c (mono_arch_get_throw_exception_by_name): Change
        this to a null op since it is called on amd64 too.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2005-04-09 19:38:42 UTC (rev 42741)
+++ trunk/mono/mono/mini/ChangeLog      2005-04-09 20:01:17 UTC (rev 42742)
@@ -1,5 +1,11 @@
 2005-04-09  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-amd64.c (mono_arch_output_basic_block): Fix stack alignment
+       and leakage in CKFINITE.
+
+       * exceptions-amd64.c (mono_arch_get_throw_exception_by_name): Change
+       this to a null op since it is called on amd64 too.
+
        * exceptions-amd64.c (get_throw_trampoline): Align stack.
 
        * exceptions-amd64.c (mono_arch_get_throw_exception_by_name): Remove

Modified: trunk/mono/mono/mini/cpu-amd64.md
===================================================================
--- trunk/mono/mono/mini/cpu-amd64.md   2005-04-09 19:38:42 UTC (rev 42741)
+++ trunk/mono/mono/mini/cpu-amd64.md   2005-04-09 20:01:17 UTC (rev 42742)
@@ -175,7 +175,7 @@
 conv.ovf.i8:
 conv.ovf.u8:
 refanyval:
-ckfinite: dest:f src1:f len:39
+ckfinite: dest:f src1:f len:43
 mkrefany:
 ldtoken:
 conv.u2: dest:i src1:i len:4

Modified: trunk/mono/mono/mini/exceptions-amd64.c
===================================================================
--- trunk/mono/mono/mini/exceptions-amd64.c     2005-04-09 19:38:42 UTC (rev 
42741)
+++ trunk/mono/mono/mini/exceptions-amd64.c     2005-04-09 20:01:17 UTC (rev 
42742)
@@ -357,10 +357,20 @@
 
 gpointer 
 mono_arch_get_throw_exception_by_name (void)
-{
-       g_assert_not_reached ();
+{      
+       static guint8* start;
+       static gboolean inited = FALSE;
+       guint8 *code;
 
-       return NULL;
+       if (inited)
+               return start;
+
+       start = code = mono_global_codeman_reserve (64);
+
+       /* Not used on amd64 */
+       amd64_breakpoint (code);
+
+       return start;
 }
 
 /**

Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c   2005-04-09 19:38:42 UTC (rev 42741)
+++ trunk/mono/mono/mini/mini-amd64.c   2005-04-09 20:01:17 UTC (rev 42742)
@@ -2950,7 +2950,7 @@
                amd64_sse_cvttsd2si_reg_reg (code, dreg, sreg);
        }
        else {
-               amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, 8);
+               amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, 16);
                x86_fnstcw_membase(code, AMD64_RSP, 0);
                amd64_mov_reg_membase (code, dreg, AMD64_RSP, 0, 2);
                amd64_alu_reg_imm (code, X86_OR, dreg, 0xc00);
@@ -2960,7 +2960,7 @@
                amd64_fist_pop_membase (code, AMD64_RSP, 0, size == 8);
                amd64_pop_reg (code, dreg);
                amd64_fldcw_membase (code, AMD64_RSP, 0);
-               amd64_alu_reg_imm (code, X86_ADD, AMD64_RSP, 8);
+               amd64_alu_reg_imm (code, X86_ADD, AMD64_RSP, 16);
        }
 
        if (size == 1)
@@ -4770,7 +4770,7 @@
                case CEE_CKFINITE: {
                        if (use_sse2) {
                                /* Transfer value to the fp stack */
-                               amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, 8);
+                               amd64_alu_reg_imm (code, X86_SUB, AMD64_RSP, 
16);
                                amd64_movsd_membase_reg (code, AMD64_RSP, 0, 
ins->sreg1);
                                amd64_fld_membase (code, AMD64_RSP, 0, TRUE);
                        }
@@ -4784,6 +4784,8 @@
                                amd64_fstp (code, 0);
                        }                               
                        EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, 
"ArithmeticException");
+                       if (use_sse2)
+                               amd64_alu_reg_imm (code, X86_ADD, AMD64_RSP, 
16);
                        break;
                }
                case OP_TLS_GET: {

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

Reply via email to