Use separate JIT_REG_xxx flags for float32, float64, and nfloat

because some platforms need to put these values in different
types of registers (e.g. x86-64).

diff --git a/ChangeLog b/ChangeLog
index f350a765c3e6946dcbb3524087ba41f770f374e1..d97fd13f5938170e39f8fe2e748d5fcdfdf3ac1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 
+2004-06-24  Rhys Weatherley  <rweather@southern-storm.com.au>
+
+       * jit/jit-reg-alloc.c, jit/jit-rules-arm.h, jit/jit-rules-interp.c,
+       jit/jit-rules-interp.h, jit/jit-rules-x86.h, jit/jit-rules.h:
+       use separate JIT_REG_xxx flags for float32, float64, and nfloat
+       because some platforms need to put these values in different
+       types of registers (e.g. x86-64).
+
 2004-06-22  Rhys Weatherley  <rweather@southern-storm.com.au>
 
        * jit/jit-insn.c: properly set the "may_throw" flag for opcodes

diff --git a/jit/jit-reg-alloc.c b/jit/jit-reg-alloc.c
index 4348f5c5d613b1e8fef45eed0bc6c0ea6fa2bf4f..6b34c4db914fbfbdc2f1f2db4e1a1a32e194b7c8 100644 (file)
--- a/jit/jit-reg-alloc.c
+++ b/jit/jit-reg-alloc.c
@@ -955,10 +955,20 @@ static int free_register_for_value
                break;
 
                case JIT_TYPE_FLOAT32:
+               {
+                       type = JIT_REG_FLOAT32;
+               }
+               break;
+
                case JIT_TYPE_FLOAT64:
+               {
+                       type = JIT_REG_FLOAT64;
+               }
+               break;
+
                case JIT_TYPE_NFLOAT:
                {
-                       type = JIT_REG_FLOAT;
+                       type = JIT_REG_NFLOAT;
                }
                break;
 

diff --git a/jit/jit-rules-arm.h b/jit/jit-rules-arm.h
index 0e9e6421fbb9040af4a49e51050a4b478f71d011..9b400f1e6cc4ddf2bfee0bb2b4e2eb8ff5e8a888 100644 (file)
--- a/jit/jit-rules-arm.h
+++ b/jit/jit-rules-arm.h
@@ -43,7 +43,8 @@ extern        "C" {
  * The floating-point registers are only present on some ARM cores.
  */
 #ifdef JIT_ARM_HAS_FLOAT_REGS
-       #define JIT_REG_ARM_FLOAT       JIT_REG_FLOAT | JIT_REG_CALL_USED
+       #define JIT_REG_ARM_FLOAT       \
+         (JIT_REG_FLOAT32 | JIT_REG_FLOAT64 | JIT_REG_NFLOAT | JIT_REG_CALL_USED)
 #else
        #define JIT_REG_ARM_FLOAT       JIT_REG_FIXED
 #endif

diff --git a/jit/jit-rules-interp.c b/jit/jit-rules-interp.c
index 183a2225ea6971290737b2fdb818518e56b4d579..62422478af154b47d304fa47ed4fc04e3712215b 100644 (file)
--- a/jit/jit-rules-interp.c
+++ b/jit/jit-rules-interp.c
@@ -83,7 +83,13 @@ This register can hold an integer word value.
 This register can hold a 64-bit long value without needing a
 second register.  Normally only used on 64-bit platforms.
 
-@item JIT_REG_FLOAT
+@item JIT_REG_FLOAT32
+This register can hold a 32-bit floating-point value.
+
+@item JIT_REG_FLOAT64
+This register can hold a 64-bit floating-point value.
+
+@item JIT_REG_NFLOAT
 This register can hold a native floating-point value.
 
 @item JIT_REG_FRAME

diff --git a/jit/jit-rules-interp.h b/jit/jit-rules-interp.h
index a6d0215adc9c3a06ac95c450a61c3466f7700b15..f46c71f5bd2e4f307f797eb8b3f29bce1bfb7feb 100644 (file)
--- a/jit/jit-rules-interp.h
+++ b/jit/jit-rules-interp.h
@@ -31,38 +31,24 @@ extern      "C" {
  * Information about all of the registers, in allocation order.
  */
 #define        JIT_REG_INFO    \
-       {"r0", 0, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_START_STACK | JIT_REG_IN_STACK}, \
-       {"r1", 1, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r2", 2, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r3", 3, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r4", 4, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r5", 5, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r6", 6, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r7", 7, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r8", 8, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r9", 9, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                             JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r10", 10, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r11", 11, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r12", 12, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r13", 13, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r14", 14, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"r15", 15, -1, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT | \
-                               JIT_REG_CALL_USED | JIT_REG_END_STACK | JIT_REG_IN_STACK},
+       {"r0", 0, -1, JIT_REG_ALL | JIT_REG_CALL_USED | \
+                                 JIT_REG_START_STACK | JIT_REG_IN_STACK}, \
+       {"r1", 1, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r2", 2, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r3", 3, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r4", 4, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r5", 5, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r6", 6, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r7", 7, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r8", 8, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r9", 9, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r10", 10, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r11", 11, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r12", 12, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r13", 13, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r14", 14, -1, JIT_REG_ALL | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"r15", 15, -1, JIT_REG_ALL | JIT_REG_CALL_USED | \
+                                       JIT_REG_END_STACK | JIT_REG_IN_STACK},
 #define        JIT_NUM_REGS            16
 #define        JIT_NUM_GLOBAL_REGS     0
 

diff --git a/jit/jit-rules-x86.h b/jit/jit-rules-x86.h
index 74a2100c498a16044ed007a3a6f7e0cb16b621a2..6d68a3b2a8e89900aa2c58403e4e039b3411a00d 100644 (file)
--- a/jit/jit-rules-x86.h
+++ b/jit/jit-rules-x86.h
@@ -28,6 +28,8 @@ extern        "C" {
 /*
  * Information about all of the registers, in allocation order.
  */
+#define        JIT_REG_X86_FLOAT       \
+       (JIT_REG_FLOAT32 | JIT_REG_FLOAT64 | JIT_REG_NFLOAT)
 #define        JIT_REG_INFO    \
        {"eax", 0, 2, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_CALL_USED}, \
        {"ecx", 1, 3, JIT_REG_WORD | JIT_REG_LONG | JIT_REG_CALL_USED}, \
@@ -37,16 +39,16 @@ extern      "C" {
        {"edi", 7, -1, JIT_REG_WORD | JIT_REG_GLOBAL}, \
        {"ebp", 4, -1, JIT_REG_FRAME | JIT_REG_FIXED}, \
        {"esp", 5, -1, JIT_REG_STACK_PTR | JIT_REG_FIXED | JIT_REG_CALL_USED}, \
-       {"st",  0, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_START_STACK | \
-                                  JIT_REG_IN_STACK}, \
-       {"st1", 1, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st2", 2, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st3", 3, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st4", 4, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st5", 5, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st6", 6, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
-       {"st7", 7, -1, JIT_REG_FLOAT | JIT_REG_CALL_USED | JIT_REG_END_STACK | \
-                                  JIT_REG_IN_STACK},
+       {"st",  0, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | \
+                                  JIT_REG_START_STACK | JIT_REG_IN_STACK}, \
+       {"st1", 1, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st2", 2, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st3", 3, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st4", 4, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st5", 5, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st6", 6, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | JIT_REG_IN_STACK}, \
+       {"st7", 7, -1, JIT_REG_X86_FLOAT | JIT_REG_CALL_USED | \
+                                  JIT_REG_END_STACK | JIT_REG_IN_STACK},
 #define        JIT_NUM_REGS            16
 #define        JIT_NUM_GLOBAL_REGS     3
 

diff --git a/jit/jit-rules.h b/jit/jit-rules.h
index 224830b3cd6a659c3b961b34c58451d80dfb3017..278daabbfa70496bcbbb2705b0d42cbf406a5574 100644 (file)
--- a/jit/jit-rules.h
+++ b/jit/jit-rules.h
@@ -60,15 +60,19 @@ typedef struct
  */
 #define        JIT_REG_WORD            (1 << 0)        /* Can be used for word values */
 #define        JIT_REG_LONG            (1 << 1)        /* Can be used for long values */
-#define        JIT_REG_FLOAT           (1 << 2)        /* Can be used for float values */
-#define        JIT_REG_FRAME           (1 << 3)        /* Contains frame pointer */
-#define        JIT_REG_STACK_PTR       (1 << 4)        /* Contains CPU stack pointer */
-#define        JIT_REG_FIXED           (1 << 5)        /* Fixed use; not for allocation */
-#define        JIT_REG_CALL_USED       (1 << 6)        /* Destroyed by a call */
-#define        JIT_REG_START_STACK     (1 << 7)        /* Stack of stack-like allocation */
-#define        JIT_REG_END_STACK       (1 << 8)        /* End of stack-like allocation */
-#define        JIT_REG_IN_STACK        (1 << 9)        /* Middle of stack-like allocation */
-#define        JIT_REG_GLOBAL          (1 << 10)       /* Candidate for global allocation */
+#define        JIT_REG_FLOAT32         (1 << 2)        /* Can be used for float32 values */
+#define        JIT_REG_FLOAT64         (1 << 3)        /* Can be used for float64 values */
+#define        JIT_REG_NFLOAT          (1 << 4)        /* Can be used for nfloat values */
+#define        JIT_REG_FRAME           (1 << 5)        /* Contains frame pointer */
+#define        JIT_REG_STACK_PTR       (1 << 6)        /* Contains CPU stack pointer */
+#define        JIT_REG_FIXED           (1 << 7)        /* Fixed use; not for allocation */
+#define        JIT_REG_CALL_USED       (1 << 8)        /* Destroyed by a call */
+#define        JIT_REG_START_STACK     (1 << 9)        /* Stack of stack-like allocation */
+#define        JIT_REG_END_STACK       (1 << 10)       /* End of stack-like allocation */
+#define        JIT_REG_IN_STACK        (1 << 11)       /* Middle of stack-like allocation */
+#define        JIT_REG_GLOBAL          (1 << 12)       /* Candidate for global allocation */
+#define        JIT_REG_ALL     (JIT_REG_WORD | JIT_REG_LONG | JIT_REG_FLOAT32 | \
+                                        JIT_REG_FLOAT64 | JIT_REG_NFLOAT)
 
 /*
  * Include definitions that are specific to the backend.