Author: zoltan
Date: 2008-01-25 12:41:09 -0500 (Fri, 25 Jan 2008)
New Revision: 93929
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/Makefile.am
trunk/mono/mono/mini/mini-alpha.h
trunk/mono/mono/mini/mini-amd64.h
trunk/mono/mono/mini/mini-arm.h
trunk/mono/mono/mini/mini-ia64.h
trunk/mono/mono/mini/mini-ppc.h
trunk/mono/mono/mini/mini-s390.h
trunk/mono/mono/mini/mini-s390x.h
trunk/mono/mono/mini/mini-sparc.h
trunk/mono/mono/mini/mini-x86.h
trunk/mono/mono/mini/mini.c
Log:
2008-01-25 Zoltan Varga <[EMAIL PROTECTED]>
* Makefile.am: Move mini-trampolines.c to $(common_sources) since it is
now used
by all platforms.
* mini-<ARCH>.h mini.c: Get rid of the
MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
define.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/ChangeLog 2008-01-25 17:41:09 UTC (rev 93929)
@@ -1,5 +1,11 @@
2008-01-25 Zoltan Varga <[EMAIL PROTECTED]>
+ * Makefile.am: Move mini-trampolines.c to $(common_sources) since it is
now used
+ by all platforms.
+
+ * mini-<ARCH>.h mini.c: Get rid of the
MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
+ define.
+
* mini-s390x.h tramp-s390x.c Makefile.am: Rework the s390x trampoline
code to use
the arch independent trampoline code in mini-trampolines.c.
Modified: trunk/mono/mono/mini/Makefile.am
===================================================================
--- trunk/mono/mono/mini/Makefile.am 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/Makefile.am 2008-01-25 17:41:09 UTC (rev 93929)
@@ -122,28 +122,24 @@
mini-x86.c \
mini-x86.h \
exceptions-x86.c \
- tramp-x86.c \
- mini-trampolines.c
+ tramp-x86.c
amd64_sources = \
mini-amd64.c \
mini-amd64.h \
exceptions-amd64.c \
- tramp-amd64.c \
- mini-trampolines.c
+ tramp-amd64.c
ppc_sources = \
mini-ppc.c \
mini-ppc.h \
exceptions-ppc.c \
- mini-trampolines.c \
tramp-ppc.c
arm_sources = \
mini-arm.c \
mini-arm.h \
exceptions-arm.c \
- mini-trampolines.c \
tramp-arm.c
mips_sources = \
@@ -156,43 +152,37 @@
mini-sparc.c \
mini-sparc.h \
exceptions-sparc.c \
- tramp-sparc.c \
- mini-trampolines.c
+ tramp-sparc.c
s390_sources = \
mini-s390.c \
mini-s390.h \
exceptions-s390.c \
- tramp-s390.c \
- mini-trampolines.c
+ tramp-s390.c
s390x_sources = \
mini-s390x.c \
mini-s390x.h \
exceptions-s390x.c \
- tramp-s390x.c \
- mini-trampolines.c
+ tramp-s390x.c
ia64_sources = \
mini-ia64.c \
mini-ia64.h \
exceptions-ia64.c \
- tramp-ia64.c \
- mini-trampolines.c
+ tramp-ia64.c
alpha_sources = \
mini-alpha.c \
mini-alpha.h \
exceptions-alpha.c \
- tramp-alpha.c \
- mini-trampolines.c
+ tramp-alpha.c
hppa_sources = \
mini-hppa.c \
mini-hppa.h \
exceptions-hppa.c \
- tramp-hppa.c \
- mini-trampolines.c
+ tramp-hppa.c
common_sources = \
mini.c \
@@ -231,6 +221,7 @@
graph.c \
mini-exceptions.c \
mini-codegen.c \
+ mini-trampolines.c \
declsec.c \
declsec.h \
wapihandles.c \
Modified: trunk/mono/mono/mini/mini-alpha.h
===================================================================
--- trunk/mono/mono/mini/mini-alpha.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-alpha.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -118,9 +118,6 @@
#define MONO_ARCH_USE_SIGACTION 1
-/* Use prerefered create trampoline callback method */
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
-
//#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 'r') ? IA64_R8 : ((desc ==
'g') ? 8 : -1))
//#define MONO_ARCH_INST_IS_FLOAT(desc) ((desc == 'f') || (desc == 'g'))
#define MONO_ARCH_INST_SREG2_MASK(ins) (0)
Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-amd64.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -269,7 +269,6 @@
#define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_VARS 1
#define MONO_ARCH_HAVE_ATOMIC_ADD 1
Modified: trunk/mono/mono/mini/mini-arm.h
===================================================================
--- trunk/mono/mono/mini/mini-arm.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-arm.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -110,7 +110,6 @@
#define MONO_ARCH_USE_SIGACTION 1
#define MONO_ARCH_NEED_DIV_CHECK 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
#define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
Modified: trunk/mono/mono/mini/mini-ia64.h
===================================================================
--- trunk/mono/mono/mini/mini-ia64.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-ia64.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -179,7 +179,6 @@
#define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_HAVE_SAVE_UNWIND_INFO 1
#define MONO_ARCH_HAVE_CREATE_VARS 1
#define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1
Modified: trunk/mono/mono/mini/mini-ppc.h
===================================================================
--- trunk/mono/mono/mini/mini-ppc.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-ppc.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -107,7 +107,6 @@
#define MONO_ARCH_SIGNAL_STACK_SIZE (12 * 1024)
#endif /* HAVE_WORKING_SIGALTSTACK */
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
#define MONO_ARCH_HAVE_IMT 1
Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-s390.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -160,7 +160,6 @@
// #define MONO_ARCH_SIGSEGV_ON_ALTSTACK 1
// #define MONO_ARCH_SIGNAL_STACK_SIZE 65536
// #define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_USE_SIGACTION 1
// #define CUSTOM_STACK_WALK 1
Modified: trunk/mono/mono/mini/mini-s390x.h
===================================================================
--- trunk/mono/mono/mini/mini-s390x.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-s390x.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -177,7 +177,6 @@
#define MONO_ARCH_NEED_DIV_CHECK 1
#define MONO_ARCH_SIGNAL_STACK_SIZE 256*1024
// #define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_USE_SIGACTION 1
Modified: trunk/mono/mono/mini/mini-sparc.h
===================================================================
--- trunk/mono/mono/mini/mini-sparc.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-sparc.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -123,7 +123,6 @@
#define MONO_ARCH_ENABLE_EMIT_STATE_OPT 1
#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_HAVE_IMT 1
#define MONO_ARCH_IMT_REG sparc_g1
#define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
Modified: trunk/mono/mono/mini/mini-x86.h
===================================================================
--- trunk/mono/mono/mini/mini-x86.h 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini-x86.h 2008-01-25 17:41:09 UTC (rev 93929)
@@ -269,7 +269,6 @@
#define MONO_ARCH_ENABLE_EMIT_STATE_OPT 1
#define MONO_ARCH_ENABLE_MONO_LMF_VAR 1
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN 1
-#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_VARS 1
#define MONO_ARCH_HAVE_ATOMIC_ADD 1
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2008-01-25 17:31:33 UTC (rev 93928)
+++ trunk/mono/mono/mini/mini.c 2008-01-25 17:41:09 UTC (rev 93929)
@@ -8786,11 +8786,7 @@
if (ptr)
return ptr;
-#ifdef MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
code = mono_arch_create_specific_trampoline (vtable,
MONO_TRAMPOLINE_CLASS_INIT, vtable->domain, NULL);
-#else
- code = mono_arch_create_class_init_trampoline (vtable);
-#endif
ptr = mono_create_ftnptr (vtable->domain, code);
@@ -8815,9 +8811,7 @@
{
MonoJitInfo *ji;
gpointer code;
-#ifdef MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
guint32 code_size;
-#endif
if (add_sync_wrapper && method->iflags &
METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
return mono_create_jump_trampoline (domain,
mono_marshal_get_synchronized_wrapper (method), FALSE);
@@ -8832,7 +8826,6 @@
if (code)
return code;
-#ifdef MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
code = mono_arch_create_specific_trampoline (method,
MONO_TRAMPOLINE_JUMP, mono_domain_get (), &code_size);
mono_domain_lock (domain);
@@ -8841,9 +8834,6 @@
ji->code_start = code;
ji->code_size = code_size;
ji->method = method;
-#else
- ji = mono_arch_create_jump_trampoline (method);
-#endif
/*
* mono_delegate_ctor needs to find the method metadata from the
@@ -8873,11 +8863,7 @@
if (method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
return mono_create_jit_trampoline
(mono_marshal_get_synchronized_wrapper (method));
-#ifdef MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
- tramp = mono_arch_create_specific_trampoline (method,
MONO_TRAMPOLINE_GENERIC, domain, NULL);
-#else
- tramp = mono_arch_create_jit_trampoline (method);
-#endif
+ tramp = mono_arch_create_specific_trampoline (method,
MONO_TRAMPOLINE_GENERIC, domain, NULL);
mono_domain_lock (domain);
g_hash_table_insert (domain->jit_trampoline_hash, method, tramp);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
