Author: zoltan
Date: 2005-04-16 11:00:34 -0400 (Sat, 16 Apr 2005)
New Revision: 43091

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

        * mini-sparc.h (MONO_ARCH_INST_REGPAIR_REG2): Add macros needed by the 
new
        allocator.

        * mini-codegen.c (mono_local_regalloc): Fix warning.


Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-16 10:37:03 UTC (rev 43090)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-16 15:00:34 UTC (rev 43091)
@@ -1,5 +1,10 @@
 2005-04-16  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-sparc.h (MONO_ARCH_INST_REGPAIR_REG2): Add macros needed by the 
new
+       allocator.
+
+       * mini-codegen.c (mono_local_regalloc): Fix warning.
+
        * mini-codegen.c (alloc_int_reg): Fix bug in preferred register
        allocation.
 

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 10:37:03 UTC (rev 43090)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c        
2005-04-16 15:00:34 UTC (rev 43091)
@@ -675,6 +675,8 @@
                        ins->sreg2 = -1;
                }
                if (spec [MONO_INST_DEST]) {
+                       int dest_dreg;
+
                        if (spec [MONO_INST_DEST] == 'f')
                                reginfod = reginfof;
                        else
@@ -686,8 +688,9 @@
                        if (reginfod [ins->dreg].born_in == 0 || reginfod 
[ins->dreg].born_in > i)
                                reginfod [ins->dreg].born_in = i;
 
-                       if (MONO_ARCH_INST_FIXED_REG (spec [MONO_INST_DEST]) != 
-1)
-                               reginfod [ins->dreg].preferred_mask = (1 << 
MONO_ARCH_INST_FIXED_REG (spec [MONO_INST_DEST]));
+                       dest_dreg = MONO_ARCH_INST_FIXED_REG (spec 
[MONO_INST_DEST]);
+                       if (dest_dreg != -1)
+                               reginfod [ins->dreg].preferred_mask = (1 << 
dest_dreg);
 
                        if (MONO_ARCH_INST_IS_REGPAIR (spec [MONO_INST_DEST])) {
                                /* The virtual register is allocated 
sequentially */

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 10:37:03 UTC (rev 43090)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-sparc.h  
2005-04-16 15:00:34 UTC (rev 43091)
@@ -38,8 +38,11 @@
 
 #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)
 #endif
 
 

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

Reply via email to