Author: zoltan
Date: 2007-05-10 15:52:53 -0400 (Thu, 10 May 2007)
New Revision: 77159
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/linear-scan.c
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-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:
2007-05-10 Zoltan Varga <[EMAIL PROTECTED]>
* mini.h mini-<ARCH>.h: Get rid of MONO_ARCH_HAS_XP_LOCAL_REGALLOC.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/ChangeLog 2007-05-10 19:52:53 UTC (rev 77159)
@@ -1,5 +1,7 @@
2007-05-10 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini.h mini-<ARCH>.h: Get rid of MONO_ARCH_HAS_XP_LOCAL_REGALLOC.
+
* aot-compiler.c (compile_method): Fix a typo in a comment.
* aot-runtime.c (decode_cached_class_info): Skip generic types.
Modified: trunk/mono/mono/mini/linear-scan.c
===================================================================
--- trunk/mono/mono/mini/linear-scan.c 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/linear-scan.c 2007-05-10 19:52:53 UTC (rev 77159)
@@ -211,7 +211,6 @@
* basic blocks screw up the allocator' problem.
*/
#if 0
- //#ifdef MONO_ARCH_HAS_XP_LOCAL_REGALLOC
cfg->varinfo [vmv->idx]->opcode = OP_REGVAR;
cfg->varinfo [vmv->idx]->dreg =
mono_regstate_next_int (cfg->rs);
#endif
Modified: trunk/mono/mono/mini/mini-alpha.h
===================================================================
--- trunk/mono/mono/mini/mini-alpha.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-alpha.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -8,7 +8,6 @@
#define MONO_ARCH_CPU_SPEC alpha_desc
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
/* Max number of integer registers (all int regs). Required definition */
#define MONO_MAX_IREGS 31
Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-amd64.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -82,8 +82,6 @@
#define MONO_MAX_FREGS AMD64_XMM_NREG
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
/* xmm15 is reserved for use by some opcodes */
#define MONO_ARCH_CALLEE_FREGS 0xef
#define MONO_ARCH_CALLEE_SAVED_FREGS 0
Modified: trunk/mono/mono/mini/mini-arm.h
===================================================================
--- trunk/mono/mono/mini/mini-arm.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-arm.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -28,7 +28,6 @@
#define MONO_ARM_REGSAVE_MASK 0x5ff0
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
#define MONO_ARCH_CALLEE_REGS ((1<<ARMREG_R0) | (1<<ARMREG_R1) |
(1<<ARMREG_R2) | (1<<ARMREG_R3) | (1<<ARMREG_IP))
#define MONO_ARCH_CALLEE_SAVED_REGS ((1<<ARMREG_V1) | (1<<ARMREG_V2) |
(1<<ARMREG_V3) | (1<<ARMREG_V4) | (1<<ARMREG_V5) | (1<<ARMREG_V6) |
(1<<ARMREG_V7))
Modified: trunk/mono/mono/mini/mini-ia64.h
===================================================================
--- trunk/mono/mono/mini/mini-ia64.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-ia64.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -14,8 +14,6 @@
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
/* r8..r11, r14..r29 */
#define MONO_ARCH_CALLEE_REGS ((regmask_t)(0x700UL) |
(regmask_t)(0x3fffc000UL))
Modified: trunk/mono/mono/mini/mini-mips.h
===================================================================
--- trunk/mono/mono/mini/mini-mips.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-mips.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -80,7 +80,6 @@
#define MONO_ARCH_FPSTACK_SIZE 0
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
/* On Mips, for regpairs, the lower-numbered reg is most significant
* This is true in both big and little endian
Modified: trunk/mono/mono/mini/mini-ppc.h
===================================================================
--- trunk/mono/mono/mini/mini-ppc.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-ppc.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -55,8 +55,6 @@
//#define MONO_ARCH_ENABLE_EMIT_STATE_OPT 1
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
#define MONO_ARCH_CALLEE_REGS ((0xff << ppc_r3) | (1 << ppc_r12))
#define MONO_ARCH_CALLEE_SAVED_REGS (0xfffff << ppc_r13) /* ppc_13 - ppc_31 */
Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-s390.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -12,7 +12,6 @@
/*-------------------------------------------*/
/* Parameters used by the register allocator */
/*-------------------------------------------*/
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC 1
#define MONO_EMIT_NEW_MOVE(cfg,dest,offset,src,imm,size) do {
\
MonoInst *inst;
\
Modified: trunk/mono/mono/mini/mini-s390x.h
===================================================================
--- trunk/mono/mono/mini/mini-s390x.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-s390x.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -12,7 +12,6 @@
/*-------------------------------------------*/
/* Parameters used by the register allocator */
/*-------------------------------------------*/
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC 1
#define MONO_EMIT_NEW_MOVE(cfg,dest,offset,src,imm,size) do {
\
MonoInst *inst;
\
Modified: trunk/mono/mono/mini/mini-sparc.h
===================================================================
--- trunk/mono/mono/mini/mini-sparc.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-sparc.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -12,8 +12,6 @@
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
/*
* Use %o0..%o5 as local registers, plus %l7 since we need an extra register
for
* holding the sreg1 in call instructions.
Modified: trunk/mono/mono/mini/mini-x86.h
===================================================================
--- trunk/mono/mono/mini/mini-x86.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini-x86.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -67,8 +67,6 @@
#define MONO_MAX_FREGS 6
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
#define MONO_ARCH_CALLEE_REGS X86_CALLEE_REGS
#define MONO_ARCH_CALLEE_SAVED_REGS X86_CALLER_REGS
Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2007-05-10 19:41:04 UTC (rev 77158)
+++ trunk/mono/mono/mini/mini.h 2007-05-10 19:52:53 UTC (rev 77159)
@@ -139,9 +139,6 @@
};
struct MonoSpillInfo {
-#ifndef MONO_ARCH_HAS_XP_REGALLOC
- MonoSpillInfo *next;
-#endif
int offset;
};
@@ -325,10 +322,8 @@
gboolean virtual;
regmask_t used_iregs;
regmask_t used_fregs;
-#if defined(MONO_ARCH_HAS_XP_LOCAL_REGALLOC)
GSList *out_ireg_args;
GSList *out_freg_args;
-#endif
};
struct MonoCallArgParm {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
