Author: mprobst
Date: 2007-12-07 10:28:17 -0500 (Fri, 07 Dec 2007)
New Revision: 90940

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-trampolines.c
Log:
2007-12-07  Mark Probst  <[EMAIL PROTECTED]>

        * mini-trampolines.c (mono_generic_class_init_trampoline): Fixed
        build for archs which don't have the vtable trampoline defined
        yet.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-12-07 15:26:29 UTC (rev 90939)
+++ trunk/mono/mono/mini/ChangeLog      2007-12-07 15:28:17 UTC (rev 90940)
@@ -1,3 +1,9 @@
+2007-12-07  Mark Probst  <[EMAIL PROTECTED]>
+
+       * mini-trampolines.c (mono_generic_class_init_trampoline): Fixed
+       build for archs which don't have the vtable trampoline defined
+       yet.
+
 2007-12-07  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * tramp-x86.c (mono_arch_create_trampoline_code): Fix the build.

Modified: trunk/mono/mono/mini/mini-trampolines.c
===================================================================
--- trunk/mono/mono/mini/mini-trampolines.c     2007-12-07 15:26:29 UTC (rev 
90939)
+++ trunk/mono/mono/mini/mini-trampolines.c     2007-12-07 15:28:17 UTC (rev 
90940)
@@ -301,6 +301,7 @@
 void
 mono_generic_class_init_trampoline (gssize *regs, guint8 *code, gpointer 
dummy, guint8 *tramp)
 {
+#ifdef MONO_ARCH_VTABLE_REG
        MonoVTable *vtable = mono_arch_find_vtable ((gpointer*)regs, code);
 
        //g_print ("generic class init for class %s.%s\n", 
vtable->klass->name_space, vtable->klass->name);
@@ -308,6 +309,9 @@
        mono_runtime_class_init (vtable);
 
        //g_print ("done initing generic\n");
+#else
+       g_assert_not_reached ();
+#endif
 }
 
 #ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE

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

Reply via email to