Author: zoltan
Date: 2005-07-28 06:46:53 -0400 (Thu, 28 Jul 2005)
New Revision: 47799
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini.c
trunk/mono/mono/mini/mini.h
Log:
2005-07-28 Zoltan Varga <[EMAIL PROTECTED]>
* mini.h mini.c (mono_create_jit_trampoline_from_token): Remove some
dead code.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2005-07-28 10:37:00 UTC (rev 47798)
+++ trunk/mono/mono/mini/ChangeLog 2005-07-28 10:46:53 UTC (rev 47799)
@@ -1,5 +1,8 @@
2005-07-28 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini.h mini.c (mono_create_jit_trampoline_from_token): Remove some
+ dead code.
+
* aot.c: Save/load MonoCachedClassInfo->has_nested_classes.
* mini.h: Bump corlib version.
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2005-07-28 10:37:00 UTC (rev 47798)
+++ trunk/mono/mono/mini/mini.c 2005-07-28 10:46:53 UTC (rev 47799)
@@ -4075,6 +4075,10 @@
ins->inst_target_bb = tblock;
start_new_bblock = 1;
+ /*
+ * FIXME: This is incorrect since the
branch should be the
+ * last ins in the basic block.
+ */
if (!MONO_TYPE_IS_VOID (fsig->ret)) {
/* just create a dummy - the
value is never used */
ins = mono_compile_create_var
(cfg, fsig->ret, OP_LOCAL);
@@ -7049,7 +7053,6 @@
{
gpointer tramp;
-#ifdef MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
MonoDomain *domain = mono_domain_get ();
guint8 *buf, *start;
@@ -7062,9 +7065,6 @@
*(guint32*)buf = token;
tramp = mono_arch_create_specific_trampoline (start,
MONO_TRAMPOLINE_AOT, domain, NULL);
-#else
- tramp = mono_arch_create_jit_trampoline_from_token (image, token);
-#endif
mono_jit_stats.method_trampolines++;
Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2005-07-28 10:37:00 UTC (rev 47798)
+++ trunk/mono/mono/mini/mini.h 2005-07-28 10:46:53 UTC (rev 47799)
@@ -859,7 +859,6 @@
gpointer mono_arch_get_throw_corlib_exception (void);
guchar* mono_arch_create_trampoline_code (MonoTrampolineType
tramp_type);
gpointer mono_arch_create_jit_trampoline (MonoMethod *method);
-gpointer mono_arch_create_jit_trampoline_from_token (MonoImage *image,
guint32 token);
MonoJitInfo *mono_arch_create_jump_trampoline (MonoMethod *method);
gpointer mono_arch_create_class_init_trampoline(MonoVTable *vtable);
GList *mono_arch_get_allocatable_int_vars (MonoCompile *cfg);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
