Author: zoltan
Date: 2005-04-10 08:25:37 -0400 (Sun, 10 Apr 2005)
New Revision: 42755

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

        * mini-codegen.c (mono_local_regalloc): Move tracking of fp stack into
        one place inside the function.


Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-10 10:06:15 UTC (rev 42754)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-10 12:25:37 UTC (rev 42755)
@@ -1,3 +1,8 @@
+2005-04-10  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-codegen.c (mono_local_regalloc): Move tracking of fp stack into
+       one place inside the function.
+
 2005-04-09  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * cpu-amd64.md: Fix some comments.

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-10 10:06:15 UTC (rev 42754)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/mini-codegen.c        
2005-04-10 12:25:37 UTC (rev 42755)
@@ -547,21 +547,51 @@
                
                DEBUG (print_ins (i, ins));
 
-               if (spec [MONO_INST_SRC1]) {
+               /*
+                * TRACK FP STACK
+                */
+               if (use_fpstack) {
+                       GList *spill;
+
                        if (spec [MONO_INST_SRC1] == 'f') {
-                               reginfo1 = reginfof;
+                               spill = g_list_first (fspill_list);
+                               if (spill && fpcount < MONO_ARCH_FPSTACK_SIZE) {
+                                       reginfof [ins->sreg1].flags |= 
MONO_X86_FP_NEEDS_LOAD;
+                                       fspill_list = g_list_remove 
(fspill_list, spill->data);
+                               } else
+                                       fpcount--;
+                       }
 
-                               if (use_fpstack) {
-                                       GList *spill;
+                       if (spec [MONO_INST_SRC2] == 'f') {
+                               spill = g_list_first (fspill_list);
+                               if (spill) {
+                                       reginfof [ins->sreg2].flags |= 
MONO_X86_FP_NEEDS_LOAD;
+                                       fspill_list = g_list_remove 
(fspill_list, spill->data);
+                                       if (fpcount >= MONO_ARCH_FPSTACK_SIZE) {
+                                               fspill++;
+                                               fspill_list = g_list_prepend 
(fspill_list, GINT_TO_POINTER(fspill));
+                                               reginfof [ins->sreg2].flags |= 
MONO_X86_FP_NEEDS_LOAD_SPILL;
+                                       }
+                               } else
+                                       fpcount--;
+                       }
 
-                                       spill = g_list_first (fspill_list);
-                                       if (spill && fpcount < 
MONO_ARCH_FPSTACK_SIZE) {
-                                               reginfo1 [ins->sreg1].flags |= 
MONO_X86_FP_NEEDS_LOAD;
-                                               fspill_list = g_list_remove 
(fspill_list, spill->data);
-                                       } else
+                       if (spec [MONO_INST_DEST] == 'f') {
+                               if (use_fpstack && (spec [MONO_INST_CLOB] != 
'm')) {
+                                       if (fpcount >= MONO_ARCH_FPSTACK_SIZE) {
+                                               reginfof [ins->dreg].flags |= 
MONO_X86_FP_NEEDS_SPILL;
+                                               fspill++;
+                                               fspill_list = g_list_prepend 
(fspill_list, GINT_TO_POINTER(fspill));
                                                fpcount--;
+                                       }
+                                       fpcount++;
                                }
                        }
+               }
+
+               if (spec [MONO_INST_SRC1]) {
+                       if (spec [MONO_INST_SRC1] == 'f')
+                               reginfo1 = reginfof;
                        else
                                reginfo1 = reginfo;
                        reginfo1 [ins->sreg1].prev_use = reginfo1 
[ins->sreg1].last_use;
@@ -580,25 +610,8 @@
                        ins->sreg1 = -1;
                }
                if (spec [MONO_INST_SRC2]) {
-                       if (spec [MONO_INST_SRC2] == 'f') {
+                       if (spec [MONO_INST_SRC2] == 'f')
                                reginfo2 = reginfof;
-
-                               if (use_fpstack) {
-                                       GList *spill;
-
-                                       spill = g_list_first (fspill_list);
-                                       if (spill) {
-                                               reginfo2 [ins->sreg2].flags |= 
MONO_X86_FP_NEEDS_LOAD;
-                                               fspill_list = g_list_remove 
(fspill_list, spill->data);
-                                               if (fpcount >= 
MONO_ARCH_FPSTACK_SIZE) {
-                                                       fspill++;
-                                                       fspill_list = 
g_list_prepend (fspill_list, GINT_TO_POINTER(fspill));
-                                                       reginfo2 
[ins->sreg2].flags |= MONO_X86_FP_NEEDS_LOAD_SPILL;
-                                               }
-                                       } else
-                                               fpcount--;
-                               }
-                       }
                        else
                                reginfo2 = reginfo;
                        reginfo2 [ins->sreg2].prev_use = reginfo2 
[ins->sreg2].last_use;
@@ -618,18 +631,8 @@
                        ins->sreg2 = -1;
                }
                if (spec [MONO_INST_DEST]) {
-                       if (spec [MONO_INST_DEST] == 'f') {
+                       if (spec [MONO_INST_DEST] == 'f')
                                reginfod = reginfof;
-                               if (use_fpstack && (spec [MONO_INST_CLOB] != 
'm')) {
-                                       if (fpcount >= MONO_ARCH_FPSTACK_SIZE) {
-                                               reginfod [ins->dreg].flags |= 
MONO_X86_FP_NEEDS_SPILL;
-                                               fspill++;
-                                               fspill_list = g_list_prepend 
(fspill_list, GINT_TO_POINTER(fspill));
-                                               fpcount--;
-                                       }
-                                       fpcount++;
-                               }
-                       }
                        else
                                reginfod = reginfo;
                        if (spec [MONO_INST_DEST] != 'b') /* it's not just a 
base register */

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

Reply via email to