2008-02-06 Zoltan Varga <vargaz@gmail.com>

	* mini-<ARCH>.c (mono_arch_get_inst_for_method): Remove the MemoryBarrier
	case since it is handled in mini.c.

svn path=/trunk/mono/; revision=95080

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 2928e3db6dae7973ed278e5b6b832593576c7f06..aa7081e6f729dc3a63c7f572c40df92b5b11c5ac 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-06  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini-<ARCH>.c (mono_arch_get_inst_for_method): Remove the MemoryBarrier
+       case since it is handled in mini.c.
+
        * cpu-sparc.md (sparc_setfreg_float): Fix the sparc build.
 
        * mini-ops.h: Add new opcodes OP_CALL/OP_CALLVIRT.

diff --git a/mono/mini/mini-alpha.c b/mono/mini/mini-alpha.c
index 8ecdbc77fd07ee01d425d73a0a3cbde04fa9b23d..af2ca02c706cd5e580e4dc7c49b31d8f4419d5ab 100644 (file)
--- a/mono/mini/mini-alpha.c
+++ b/mono/mini/mini-alpha.c
@@ -5204,11 +5204,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod,
    
    CFG_DEBUG(3) g_print("mono_arch_get_inst_for_method: %s\n", cmethod->name);
    
-   if (cmethod->klass == mono_defaults.thread_class &&
-       strcmp (cmethod->name, "MemoryBarrier") == 0) {
-     MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-   }
-   
    return ins;
 }
 

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index eb2d0d92a4e102c82dd2a4566b7ddade9ef4d720..72e5d5f30fcbb6b82e7f19b0d0b81fd03e2c1524 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -3633,12 +3633,7 @@ mono_arch_emit_this_vret_args (MonoCompile *cfg, MonoCallInst *inst, int this_re
 MonoInst*
 mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args)
 {
-       MonoInst *ins = NULL;
-       if (cmethod->klass == mono_defaults.thread_class &&
-                       strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
-       return ins;
+       return NULL;
 }
 
 gboolean

diff --git a/mono/mini/mini-hppa.c b/mono/mini/mini-hppa.c
index 634443526c94f210279c704627db984eba4e8bab..b6b2403a82b28ef334e56b14001967fefc9642ad 100644 (file)
--- a/mono/mini/mini-hppa.c
+++ b/mono/mini/mini-hppa.c
@@ -2867,14 +2867,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethod
        DEBUG_FUNC_ENTER();
        DEBUG_FUNC_EXIT();
 
-#if 0
-       if (cmethod->klass == mono_defaults.thread_class &&
-               strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               if (sparcv9)
-                       MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
-#endif
-
        return ins;
 }
 

diff --git a/mono/mini/mini-mips.c b/mono/mini/mini-mips.c
index a2e077bddfde5b79f7cb48c1249fed3a935ab157..eced70a31a98cd295f76c621729727e2c3a265c2 100644 (file)
--- a/mono/mini/mini-mips.c
+++ b/mono/mini/mini-mips.c
@@ -3890,18 +3890,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethod
 {
        MonoInst *ins = NULL;
 
-       if (cmethod->klass == mono_defaults.thread_class &&
-                       strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
-#if 0
-       if (cmethod->klass == mono_defaults.math_class) {
-               if (strcmp (cmethod->name, "Sqrt") == 0) {
-                       MONO_INST_NEW (cfg, ins, OP_SQRT);
-                       ins->inst_i0 = args [0];
-               }
-       }
-#endif
        return ins;
 }
 

diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
index bbbfbca0025ee600457f7ddefabd24c3543071ad..94ce063642f148d065128186790504f79806b9a2 100644 (file)
--- a/mono/mini/mini-ppc.c
+++ b/mono/mini/mini-ppc.c
@@ -4004,10 +4004,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethod
 {
        MonoInst *ins = NULL;
 
-       if (cmethod->klass == mono_defaults.thread_class &&
-                       strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
        /*if (cmethod->klass == mono_defaults.math_class) {
                if (strcmp (cmethod->name, "Sqrt") == 0) {
                        MONO_INST_NEW (cfg, ins, OP_SQRT);

diff --git a/mono/mini/mini-s390.c b/mono/mini/mini-s390.c
index 2d069cd54a68febcfa79928cbd57c0ca2f519e9e..580e1b863319e767aeb158b1cf8c668a58fbd969 100644 (file)
--- a/mono/mini/mini-s390.c
+++ b/mono/mini/mini-s390.c
@@ -4776,9 +4776,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod,
                        MONO_INST_NEW (cfg, ins, OP_SQRT);
                        ins->inst_i0 = args [0];
                }
-       } else if (cmethod->klass == mono_defaults.thread_class &&
-                          strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
        } else if(cmethod->klass->image == mono_defaults.corlib &&
                           (strcmp (cmethod->klass->name_space, "System.Threading") == 0) &&
                           (strcmp (cmethod->klass->name, "Interlocked") == 0)) {

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
index 5be408ef55a0061afd449ac1e8d5351f710a0c36..ba74d4cfe720389b9272842cc1856498d7b475d4 100644 (file)
--- a/mono/mini/mini-s390x.c
+++ b/mono/mini/mini-s390x.c
@@ -4947,9 +4947,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod,
 //                     MONO_INST_NEW (cfg, ins, OP_ABS);
 //                     ins->inst_i0 = args [0];
 //             }
-       } else if (cmethod->klass == mono_defaults.thread_class &&
-                          strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
        } else if(cmethod->klass->image == mono_defaults.corlib &&
                           (strcmp (cmethod->klass->name_space, "System.Threading") == 0) &&
                           (strcmp (cmethod->klass->name, "Interlocked") == 0)) {

diff --git a/mono/mini/mini-sparc.c b/mono/mini/mini-sparc.c
index b3b8c4fc68c1bf5879dde531458c004f4e125075..c91317d3f128db2e1f785e073e68b4004d81aa53 100644 (file)
--- a/mono/mini/mini-sparc.c
+++ b/mono/mini/mini-sparc.c
@@ -4354,12 +4354,6 @@ mono_arch_get_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethod
 {
        MonoInst *ins = NULL;
 
-       if (cmethod->klass == mono_defaults.thread_class &&
-               strcmp (cmethod->name, "MemoryBarrier") == 0) {
-               if (sparcv9)
-                       MONO_INST_NEW (cfg, ins, OP_MEMORY_BARRIER);
-       }
-
        return ins;
 }