2008-10-05 Zoltan Varga <vargaz@gmail.com>

	* mini-<ARCH>.h mini-x86.c: Remove some unused defines.

svn path=/trunk/mono/; revision=114854

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index f90a5709b17b0abf63141fba0fbf602f1d5ecb10..30382eae8cdbccd92c664008a65b109c74109839 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-05  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-<ARCH>.h mini-x86.c: Remove some unused defines.
+
 2008-10-04  Andreas Färber  <andreas.faerber@web.de>
 
        * Makefile.am: Add build rules for ppc64.

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 1de905642865c66b5760b7330702f0976d0d8262..7cb928700050738b572f4e2f82c6502a5d896ce5 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -110,19 +110,9 @@ struct sigcontext {
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_BASEREG X86_EBP
 #define MONO_ARCH_RETREG1 X86_EAX
 #define MONO_ARCH_RETREG2 X86_EDX
 
-#define MONO_ARCH_ENCODE_LREG(r1,r2) (r1 | (r2<<3))
-
-#define inst_dreg_low dreg&7 
-#define inst_dreg_high dreg>>3
-#define inst_sreg1_low sreg1&7 
-#define inst_sreg1_high sreg1>>3
-#define inst_sreg2_low sreg2&7 
-#define inst_sreg2_high sreg2>>3
-
 struct MonoLMF {
        /* 
         * If the lowest bit is set to 1, then this LMF has the rip field set. Otherwise,

diff --git a/mono/mini/mini-s390.h b/mono/mini/mini-s390.h
index 8dc7e17cae1a13b174d9c998eef5af8e43ae737a..b98624e7dc3e1c6ce4851804ea9d57511f4c4798 100644 (file)
--- a/mono/mini/mini-s390.h
+++ b/mono/mini/mini-s390.h
@@ -222,7 +222,6 @@ typedef struct
 #define MONO_ARCH_FRAME_ALIGNMENT 4
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_BASEREG s390_r15
 #define MONO_ARCH_RETREG1 s390_r2
 
 /*-----------------------------------------------*/

diff --git a/mono/mini/mini-s390x.h b/mono/mini/mini-s390x.h
index 5274d34536662f94fda060fbf5b03a7bf2e7e29a..d15d162e5154655becef0341c3ba10405a5f7285 100644 (file)
--- a/mono/mini/mini-s390x.h
+++ b/mono/mini/mini-s390x.h
@@ -236,7 +236,6 @@ typedef struct
 #define MONO_ARCH_FRAME_ALIGNMENT 8
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_BASEREG s390_r15
 #define MONO_ARCH_RETREG1 s390_r2
 
 /*-----------------------------------------------*/

diff --git a/mono/mini/mini-sparc.h b/mono/mini/mini-sparc.h
index 7866c547703a63da0082f114df91f1d251865d3e..3a60f254e6cef1323fa1793c3096329967acac01 100644 (file)
--- a/mono/mini/mini-sparc.h
+++ b/mono/mini/mini-sparc.h
@@ -56,7 +56,6 @@
 
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_BASEREG sparc_fp
 #define MONO_ARCH_RETREG1 sparc_i0
 
 #ifdef SPARCV9

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index 5e856ada4bd0cf7b1f3051096d72e2dbc4009c56..793bf3c66c4c38246d9df05d6849b07d72746dcd 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -825,7 +825,7 @@ mono_arch_allocate_vars (MonoCompile *cfg)
 
        cinfo = get_call_info (cfg->generic_sharing_context, cfg->mempool, sig, FALSE);
 
-       cfg->frame_reg = MONO_ARCH_BASEREG;
+       cfg->frame_reg = X86_EBP;
        offset = 0;
 
        /* Reserve space to save LMF and caller saved registers */

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index 4c2dc4ff78a5704600e42216f437e88755bd95f7..434758e3aab86d4b0c5bd1840ab2c5d5266fb0cf 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -122,19 +122,9 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_BASEREG X86_EBP
 #define MONO_ARCH_RETREG1 X86_EAX
 #define MONO_ARCH_RETREG2 X86_EDX
 
-#define MONO_ARCH_ENCODE_LREG(r1,r2) (r1 | (r2<<3))
-
-#define inst_dreg_low dreg&7 
-#define inst_dreg_high dreg>>3
-#define inst_sreg1_low sreg1&7 
-#define inst_sreg1_high sreg1>>3
-#define inst_sreg2_low sreg2&7 
-#define inst_sreg2_high sreg2>>3
-
 struct MonoLMF {
        /* Offset by 1 if this is a trampoline LMF frame */
        guint32    previous_lmf;