Author: zoltan
Date: 2005-04-09 09:45:46 -0400 (Sat, 09 Apr 2005)
New Revision: 42729

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

        * liveness.c: Merge from HEAD.


Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-09 13:44:31 UTC (rev 42728)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/ChangeLog     
2005-04-09 13:45:46 UTC (rev 42729)
@@ -1,5 +1,7 @@
 2005-04-09  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * liveness.c: Merge from HEAD.
+
        * genmdesc.c: Make the generated machine description non-static.
 
        * mini-codegen.c: New file containing the arch independent local

Modified: branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/liveness.c
===================================================================
--- branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/liveness.c    
2005-04-09 13:44:31 UTC (rev 42728)
+++ branches/vargaz/mini-xp-local-regalloc/mono/mono/mini/liveness.c    
2005-04-09 13:45:46 UTC (rev 42729)
@@ -10,7 +10,7 @@
 #include "mini.h"
 #include "inssel.h"
 
-// #define DEBUG_LIVENESS
+//#define DEBUG_LIVENESS
 
 extern guint8 mono_burg_arity [];
 
@@ -94,9 +94,6 @@
                        /*
                         * Variables used in exception regions can't be 
allocated to 
                         * registers.
-                        * In theory, only variables written need to be made 
volatile, but
-                        * bblocks in exception regions are missing some 
control flow
-                        * edges, so variables used in them have incomplete 
liveness info.
                         */
                        cfg->varinfo [vi->idx]->flags |= MONO_INST_VOLATILE;
                }
@@ -142,17 +139,13 @@
 
        *visited = g_slist_append (*visited, bb);
 
-#ifndef MONO_ARCH_ENABLE_REGALLOC_IN_EH_BLOCKS
        /* 
         * Need to visit all bblocks reachable from this one since they can be
-        * reached during exception handling. This is not neccessary when
-        * the back ends could guarantee that the variables are in the
-        * correct registers when a handler is called.
+        * reached during exception handling.
         */
        for (i = 0; i < bb->out_count; ++i) {
                visit_bb (cfg, bb->out_bb [i], visited);
        }
-#endif
 }
 
 static void
@@ -162,8 +155,12 @@
        GSList *visited = NULL;
 
        /*
-        * Variables in exception handler regions cannot be allocated to 
registers
-        * so make them volatile. See bug #42136. 
+        * Variables in exception handler register cannot be allocated to 
registers
+        * so make them volatile. See bug #42136. This will not be neccessary 
when
+        * the back ends could guarantee that the variables will be in the
+        * correct registers when a handler is called.
+        * This includes try blocks too, since a variable in a try block might 
be
+        * accessed after an exception handler has been run.
         */
        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
 

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

Reply via email to