Author: zoltan
Date: 2005-04-16 13:52:03 -0400 (Sat, 16 Apr 2005)
New Revision: 43098

Modified:
   branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog
   branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/cpu-sparc.md
   branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c
   branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.c
   branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.h
Log:
2005-04-16  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-codegen.c (mono_local_regalloc): Fix handling of non-fixed 
register pairs.

        * mini-sparc.h cpu-sparc.md mini-sparc.c: Handle the return values of 
calls using
        fixed registers.


Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-16 16:12:38 UTC (rev 43097)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-16 17:52:03 UTC (rev 43098)
@@ -1,5 +1,10 @@
 2005-04-16  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-codegen.c (mono_local_regalloc): Fix handling of non-fixed 
register pairs.
+
+       * mini-sparc.h cpu-sparc.md mini-sparc.c: Handle the return values of 
calls using
+       fixed registers.
+
        * mini-sparc.h (MONO_ARCH_INST_REGPAIR_REG2): Add macros needed by the 
new
        allocator.
 

Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/cpu-sparc.md
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/cpu-sparc.md  
2005-04-16 16:12:38 UTC (rev 43097)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/cpu-sparc.md  
2005-04-16 17:52:03 UTC (rev 43098)
@@ -15,7 +15,9 @@
 #      i  integer register
 #      b  base register (used in address references)
 #      f  floating point register
-#   l  register pair (same as 'i' on v9)
+#   L  register pair (same as 'i' on v9)
+#   l  %o0:%o1 register pair (same as 'i' on v9)
+#   o  %o0
 #
 # len:number         describe the maximun length in bytes of the instruction
 # number is a positive integer
@@ -84,7 +86,6 @@
 dup:
 pop:
 jmp: len:64
-call: dest:i clob:c len:40
 calli:
 ret:
 br.s:
@@ -305,13 +306,15 @@
 outarg_imm: len:5
 retarg:
 setret: dest:a src1:i len:4
-setlret: dest:l src1:i src2:i len:8
 setreg: dest:i src1:i len:4 clob:r
 setregimm: dest:i len:64 clob:r
 setfreg: dest:f src1:f len:4 clob:r
 sparc_setfreg_float: dest:f src1:f len:4 clob:r
 checkthis: src1:b len:4
 oparglist: src1:i len:64
+call: dest:o clob:c len:40
+call_reg: dest:o src1:i len:64 clob:c
+call_membase: dest:o src1:b len:64 clob:c
 voidcall: len:64 clob:c
 voidcall_reg: src1:i len:64 clob:c
 voidcall_membase: src1:b len:64 clob:c
@@ -324,8 +327,6 @@
 vcall: len:40 clob:c
 vcall_reg: src1:i len:64 clob:c
 vcall_membase: src1:b len:64 clob:c
-call_reg: dest:i src1:i len:64 clob:c
-call_membase: dest:i src1:b len:64 clob:c
 trap:
 iconst: dest:i len:64
 i8const: dest:i len:64
@@ -484,11 +485,11 @@
 float_conv_to_i1: dest:i src1:f len:40
 float_conv_to_i2: dest:i src1:f len:40
 float_conv_to_i4: dest:i src1:f len:40
-float_conv_to_i8: dest:l src1:f len:40
+float_conv_to_i8: dest:L src1:f len:40
 float_conv_to_r4: dest:f src1:f len:8
 float_conv_to_r8:
 float_conv_to_u4: dest:i src1:f len:40
-float_conv_to_u8: dest:l src1:f len:40
+float_conv_to_u8: dest:L src1:f len:40
 float_conv_to_u2: dest:i src1:f len:40
 float_conv_to_u1: dest:i src1:f len:40
 float_conv_to_i: dest:i src1:f len:40
@@ -534,8 +535,8 @@
 sbb: dest:i src1:i src2:i len:4
 sbb_imm: dest:i src1:i len:64
 br_reg: src1:i len:8
-op_bigmul: len:2 dest:l src1:a src2:i
-op_bigmul_un: len:2 dest:l src1:a src2:i
+op_bigmul: len:2 dest:L src1:a src2:i
+op_bigmul_un: len:2 dest:L src1:a src2:i
 fmove: dest:f src1:f len:8
 
 # 32 bit opcodes

Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c        
2005-04-16 16:12:38 UTC (rev 43097)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c        
2005-04-16 17:52:03 UTC (rev 43098)
@@ -946,13 +946,14 @@
                        if (dest_dreg != -1) {
                                if (rs->iassign [ins->dreg] != dest_dreg)
                                        free_up_ireg (cfg, tmp, ins, dest_dreg);
+
+                               dreg2 = ins->dreg + 1;
+                               dest_dreg2 = MONO_ARCH_INST_REGPAIR_REG2 (spec 
[MONO_INST_DEST], dest_dreg);
+                               if (dest_dreg2 != -1) {
+                                       if (rs->iassign [dreg2] != dest_dreg2)
+                                               free_up_ireg (cfg, tmp, ins, 
dest_dreg2);
+                               }
                        }
-                       dreg2 = ins->dreg + 1;
-                       dest_dreg2 = MONO_ARCH_INST_REGPAIR_REG2 (spec 
[MONO_INST_DEST], dest_dreg);
-                       if (dest_dreg2 != -1) {
-                               if (rs->iassign [dreg2] != dest_dreg2)
-                                       free_up_ireg (cfg, tmp, ins, 
dest_dreg2);
-                       }
                }
 
                if ((!fp || (fp && !use_fpstack)) && (is_soft_reg (ins->dreg, 
fp))) {

Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.c
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.c  
2005-04-16 16:12:38 UTC (rev 43097)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.c  
2005-04-16 17:52:03 UTC (rev 43098)
@@ -1958,7 +1958,7 @@
 emit_move_return_value (MonoInst *ins, guint32 *code)
 {
        /* Move return value to the target register */
-       /* FIXME: do this in the local reg allocator */
+       /* FIXME: do more things in the local reg allocator */
        switch (ins->opcode) {
        case OP_VOIDCALL:
        case OP_VOIDCALL_REG:
@@ -1967,7 +1967,7 @@
        case CEE_CALL:
        case OP_CALL_REG:
        case OP_CALL_MEMBASE:
-               sparc_mov_reg_reg (code, sparc_o0, ins->dreg);
+               g_assert (ins->dreg == sparc_o0);
                break;
        case OP_LCALL:
        case OP_LCALL_REG:
@@ -1979,15 +1979,7 @@
 #ifdef SPARCV9
                sparc_mov_reg_reg (code, sparc_o0, ins->dreg);
 #else
-               if (ins->dreg + 1 == sparc_o1) {
-                       sparc_mov_reg_reg (code, sparc_o0, sparc_o7);
-                       sparc_mov_reg_reg (code, sparc_o1, ins->dreg);
-                       sparc_mov_reg_reg (code, sparc_o7, ins->dreg + 1);
-               }
-               else {
-                       sparc_mov_reg_reg (code, sparc_o0, ins->dreg + 1);
-                       sparc_mov_reg_reg (code, sparc_o1, ins->dreg);
-               }
+               g_assert (ins->dreg == sparc_o1);
 #endif
                break;
        case OP_FCALL:

Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.h
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.h  
2005-04-16 16:12:38 UTC (rev 43097)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.h  
2005-04-16 17:52:03 UTC (rev 43098)
@@ -33,16 +33,19 @@
 
 #define MONO_ARCH_USE_FPSTACK FALSE
 #define MONO_ARCH_FPSTACK_SIZE 0
-#define MONO_ARCH_INST_FIXED_REG(desc) (-1)
+#ifdef SPARCV9
+#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 'o') ? sparc_o0 : -1)
+#else
+#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 'o') ? sparc_o0 : ((desc == 
'l') ? sparc_o1 : -1))
+#endif
 #define MONO_ARCH_INST_SREG2_MASK(ins) (0)
 
 #ifdef SPARCV9
 #define MONO_ARCH_INST_IS_REGPAIR(desc) FALSE
 #define MONO_ARCH_INST_REGPAIR_REG2(desc,hreg1) (-1)
 #else
-/* FIXME: Define a separate register class for o0:o1 */
-#define MONO_ARCH_INST_IS_REGPAIR(desc) (desc == 'l')
-#define MONO_ARCH_INST_REGPAIR_REG2(desc,hreg1) (desc == 'l' ? (hreg1 + 1) : 
-1)
+#define MONO_ARCH_INST_IS_REGPAIR(desc) ((desc == 'l') || (desc == 'L'))
+#define MONO_ARCH_INST_REGPAIR_REG2(desc,hreg1) (((desc == 'l') ? sparc_o0 : 
(desc == 'L' ? (hreg1 + 1) : -1)))
 #endif
 
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to