2009-02-18 Rodrigo Kumpera <rkumpera@novell.com>

[mono.git] / mono / mini / mini-sparc.c

diff --git a/mono/mini/mini-sparc.c b/mono/mini/mini-sparc.c
index 97e078cc6fcd8bdb7b42800ea7ae3e442e55cf9c..e44f8ffdb579bc89458cdd7e86df65b082c06225 100644 (file)
--- a/mono/mini/mini-sparc.c
+++ b/mono/mini/mini-sparc.c
@@ -34,6 +34,7 @@
 #include "trace.h"
 #include "cpu-sparc.h"
 #include "jit-icalls.h"
+#include "ir-emit.h"
 
 /*
  * Sparc V9 means two things:
@@ -1047,27 +1048,6 @@ mono_arch_create_vars (MonoCompile *cfg)
        }
 }
 
-/* FIXME: Remove these later */
-#define NEW_LOAD_MEMBASE(cfg,dest,op,dr,base,offset) do { \
-        MONO_INST_NEW ((cfg), (dest), (op)); \
-        (dest)->dreg = (dr); \
-        (dest)->inst_basereg = (base); \
-        (dest)->inst_offset = (offset); \
-        (dest)->type = STACK_I4; \
-       } while (0)
-
-#define EMIT_NEW_LOAD_MEMBASE(cfg,dest,op,dr,base,offset) do { NEW_LOAD_MEMBASE ((cfg), (dest), (op), (dr), (base), (offset)); MONO_ADD_INS ((cfg)->cbb, (dest)); } while (0)
-
-#undef MONO_EMIT_NEW_STORE_MEMBASE_IMM
-#define MONO_EMIT_NEW_STORE_MEMBASE_IMM(cfg,op,base,offset,imm) do { \
-        MonoInst *inst; \
-        MONO_INST_NEW ((cfg), (inst), (op)); \
-        inst->inst_destbasereg = base; \
-        inst->inst_offset = offset; \
-        inst->inst_p1 = (gpointer)(gssize)imm; \
-        MONO_ADD_INS ((cfg)->cbb, inst); \
-       } while (0)
-
 static void
 add_outarg_reg (MonoCompile *cfg, MonoCallInst *call, ArgStorage storage, int reg, guint32 sreg)
 {
@@ -2386,7 +2366,7 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
                }
                size += item->chunk_size;
        }
-       code = mono_code_manager_reserve (domain->code_mp, size * 4);
+       code = mono_domain_code_reserve (domain, size * 4);
        start = code;
 
        for (i = 0; i < count; ++i) {
@@ -3031,9 +3011,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 #endif
                        }
                        break;
-               case OP_OUTARG:
-                       g_assert_not_reached ();
-                       break;
                case OP_LOCALLOC: {
                        guint32 size_reg;
                        gint32 offset2;