Author: lupus
Date: 2007-01-19 11:24:44 -0500 (Fri, 19 Jan 2007)
New Revision: 71342
Modified:
trunk/mono/mono/mini/ChangeLog
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-codegen.c
trunk/mono/mono/mini/mini-ia64.h
trunk/mono/mono/mini/mini-mips.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.h
Log:
Fri Jan 19 17:23:32 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.h, mini-codegen.c, mini-$(arch).h: claenup references
to cpu spec data.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/ChangeLog 2007-01-19 16:24:44 UTC (rev 71342)
@@ -1,3 +1,9 @@
+
+Fri Jan 19 17:23:32 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * mini.h, mini-codegen.c, mini-$(arch).h: claenup references
+ to cpu spec data.
+
2007-01-19 Zoltan Varga <[EMAIL PROTECTED]>
* aot-compiler.c (encode_klass_info): Allow classes of the form
<Type>[][].
Modified: trunk/mono/mono/mini/mini-alpha.h
===================================================================
--- trunk/mono/mono/mini/mini-alpha.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-alpha.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -5,6 +5,8 @@
#include <mono/arch/alpha/alpha-codegen.h>
+#define MONO_ARCH_CPU_SPEC alpha_desc
+
/* Parameters used by the register allocator */
#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-amd64.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -75,6 +75,8 @@
#define MONO_ARCH_SIGNAL_STACK_SIZE (64 * 1024)
+#define MONO_ARCH_CPU_SPEC amd64_desc
+
#define MONO_MAX_IREGS 16
#define MONO_MAX_FREGS AMD64_XMM_NREG
Modified: trunk/mono/mono/mini/mini-arm.h
===================================================================
--- trunk/mono/mono/mini/mini-arm.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-arm.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -8,6 +8,8 @@
#define MONO_ARCH_SOFT_FLOAT 1
#endif
+#define MONO_ARCH_CPU_SPEC arm_cpu_desc
+
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define ARM_LSW_REG ARMREG_R0
#define ARM_MSW_REG ARMREG_R1
Modified: trunk/mono/mono/mini/mini-codegen.c
===================================================================
--- trunk/mono/mono/mini/mini-codegen.c 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-codegen.c 2007-01-19 16:24:44 UTC (rev 71342)
@@ -21,39 +21,7 @@
#define DEBUG(a) MINI_DEBUG(cfg->verbose_level, 2, a;)
-#if defined(__x86_64__)
-const char * const amd64_desc [OP_LAST];
-static const char*const * ins_spec = amd64_desc;
-#elif defined(__sparc__) || defined(sparc)
-const char * const sparc_desc [OP_LAST];
-static const char*const * ins_spec = sparc_desc;
-#elif defined(__mips__) || defined(mips)
-const char * const mips_desc [OP_LAST];
-static const char*const * ins_spec = mips_desc;
-#elif defined(__i386__)
-extern const char * const x86_desc [OP_LAST];
-static const char*const * ins_spec = x86_desc;
-#elif defined(__ia64__)
-const char * const ia64_desc [OP_LAST];
-static const char*const * ins_spec = ia64_desc;
-#elif defined(__arm__)
-const char * const arm_cpu_desc [OP_LAST];
-static const char*const * ins_spec = arm_cpu_desc;
-#elif defined(__s390x__)
-const char * const s390x_cpu_desc [OP_LAST];
-static const char*const * ins_spec = s390x_cpu_desc;
-#elif defined(__s390__)
-const char * const s390_cpu_desc [OP_LAST];
-static const char*const * ins_spec = s390_cpu_desc;
-#elif defined(__alpha__)
-const char * const alpha_desc [OP_LAST];
-static const char*const * ins_spec = alpha_desc;
-#elif defined(__ppc__) || defined(__powerpc__)
-extern const char * const ppcg4 [OP_LAST];
-static const char*const * ins_spec = ppcg4;
-#else
-#error "Not implemented"
-#endif
+static const char*const * ins_spec = MONO_ARCH_CPU_SPEC;
#define use_fpstack MONO_ARCH_USE_FPSTACK
Modified: trunk/mono/mono/mini/mini-ia64.h
===================================================================
--- trunk/mono/mono/mini/mini-ia64.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-ia64.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -5,6 +5,8 @@
#include <mono/arch/ia64/ia64-codegen.h>
+#define MONO_ARCH_CPU_SPEC ia64_desc
+
/* FIXME: regset -> 128 bits ! */
#define MONO_MAX_IREGS 128
Modified: trunk/mono/mono/mini/mini-mips.h
===================================================================
--- trunk/mono/mono/mini/mini-mips.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-mips.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -4,6 +4,8 @@
#include <mono/arch/mips/mips-codegen.h>
#include <glib.h>
+#define MONO_ARCH_CPU_SPEC mips_desc
+
#define MONO_MAX_IREGS 32
#define MONO_MAX_FREGS 32
Modified: trunk/mono/mono/mini/mini-ppc.h
===================================================================
--- trunk/mono/mono/mini/mini-ppc.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-ppc.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -4,6 +4,8 @@
#include <mono/arch/ppc/ppc-codegen.h>
#include <glib.h>
+#define MONO_ARCH_CPU_SPEC ppcg4
+
#define MONO_MAX_IREGS 32
#define MONO_MAX_FREGS 32
Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-s390.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -4,6 +4,8 @@
#include <mono/arch/s390/s390-codegen.h>
#include <signal.h>
+#define MONO_ARCH_CPU_SPEC s390_cpu_desc
+
#define MONO_MAX_IREGS 16
#define MONO_MAX_FREGS 16
Modified: trunk/mono/mono/mini/mini-s390x.h
===================================================================
--- trunk/mono/mono/mini/mini-s390x.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-s390x.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -4,6 +4,8 @@
#include <mono/arch/s390x/s390x-codegen.h>
#include <signal.h>
+#define MONO_ARCH_CPU_SPEC s390x_cpu_desc
+
#define MONO_MAX_IREGS 16
#define MONO_MAX_FREGS 16
Modified: trunk/mono/mono/mini/mini-sparc.h
===================================================================
--- trunk/mono/mono/mini/mini-sparc.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-sparc.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -5,6 +5,8 @@
#include <glib.h>
+#define MONO_ARCH_CPU_SPEC sparc_desc
+
#define MONO_MAX_IREGS 32
#define MONO_MAX_FREGS 32
Modified: trunk/mono/mono/mini/mini-x86.h
===================================================================
--- trunk/mono/mono/mini/mini-x86.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini-x86.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -61,6 +61,8 @@
/* Enables OP_LSHL, OP_LSHL_IMM, OP_LSHR, OP_LSHR_IMM, OP_LSHR_UN,
OP_LSHR_UN_IMM */
#define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
+#define MONO_ARCH_CPU_SPEC x86_desc
+
#define MONO_MAX_IREGS 8
#define MONO_MAX_FREGS 6
Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2007-01-19 16:11:41 UTC (rev 71341)
+++ trunk/mono/mono/mini/mini.h 2007-01-19 16:24:44 UTC (rev 71342)
@@ -734,6 +734,8 @@
extern guint8 mono_burg_arity [];
#endif
+extern const char * const MONO_ARCH_CPU_SPEC [OP_LAST];
+
enum {
MONO_COMP_DOM = 1,
MONO_COMP_IDOM = 2,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
