2009-05-02 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / exceptions-x86.c

diff --git a/mono/mini/exceptions-x86.c b/mono/mini/exceptions-x86.c
index 5a4ea014e5a4ccfbcea0cfc69518db14125d4467..46b8e62ad11364d527e7da04b37e103a41f1a53a 100644 (file)
--- a/mono/mini/exceptions-x86.c
+++ b/mono/mini/exceptions-x86.c
@@ -503,26 +503,15 @@ mono_arch_get_rethrow_exception (void)
 gpointer 
 mono_arch_get_throw_exception_by_name (void)
 {
-       static guint8* start;
-       static int inited = 0;
+       guint8* start;
        guint8 *code;
 
-       if (inited)
-               return start;
+       start = code = mono_global_codeman_reserve (32);
 
-       inited = 1;
-       code = start = mono_global_codeman_reserve (32);
-
-       x86_push_membase (code, X86_ESP, 4); /* exception name */
-       x86_push_imm (code, "System");
-       x86_push_imm (code, mono_defaults.exception_class->image);
-       x86_call_code (code, mono_exception_from_name);
-       x86_alu_reg_imm (code, X86_ADD, X86_ESP, 12);
-       /* save the newly create object (overwrite exception name)*/
-       x86_mov_membase_reg (code, X86_ESP, 4, X86_EAX, 4);
-       x86_jump_code (code, mono_arch_get_throw_exception ());
+       /* Not used */
+       x86_breakpoint (code);
 
-       g_assert ((code - start) < 32);
+       mono_arch_flush_icache (start, code - start);
 
        return start;
 }