Corrected setting register classes of Return and Barrier nodes

[libfirm] / ir / be / besched.c

diff --git a/ir/be/besched.c b/ir/be/besched.c
index d23330b..4a14efc 100644 (file)
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,18 +1,22 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 
 #include "impl.h"
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "irnode_t.h"
+#include "irgraph_t.h"
 #include "iredges_t.h"
 #include "debug.h"
 
+#include "bearch.h"
 #include "besched_t.h"
-#include "besched.h"
+#include "beutil.h"
 #include "belistsched.h"
 
 FIRM_IMPL1(sched_get_time_step, int, const ir_node *)
@@ -24,6 +28,7 @@ FIRM_IMPL1(sched_first, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_last, ir_node *, const ir_node *)
 FIRM_IMPL2(sched_add_after, ir_node *, ir_node *, ir_node *)
 FIRM_IMPL2(sched_add_before, ir_node *, ir_node *, ir_node *)
+FIRM_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *)
 FIRM_IMPL1_VOID(sched_remove, ir_node *)
 
 size_t sched_irn_data_offset = 0;
@@ -40,32 +45,16 @@ static void block_sched_dumper(ir_node *block, void *env)
        }
 }
 
-void be_sched_dump(FILE *f, const ir_graph *irg)
+void be_sched_dump(FILE *f, ir_graph *irg)
 {
-       irg_block_walk_graph((ir_graph *) irg, block_sched_dumper, NULL, f);
+       irg_block_walk_graph(irg, block_sched_dumper, NULL, f);
 }
 
+/* Init the scheduling stuff. */
 void be_sched_init(void)
 {
        sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t));
-  firm_dbg_register("be.sched");
-}
-
-void be_sched_test(void)
-{
-       int i, n;
-       struct obstack obst;
-
-       obstack_init(&obst);
-
-       for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
-               ir_graph *irg = get_irp_irg(i);
-
-               list_sched(irg, trivial_selector);
-               be_sched_dump(stdout, irg);
-       }
-
-       obstack_free(&obst, NULL);
+       firm_dbg_register("be.sched");
 }
 
 void sched_renumber(const ir_node *block)
@@ -81,7 +70,7 @@ void sched_renumber(const ir_node *block)
   }
 }
 
-
+/* Verify a schedule. */
 int sched_verify(const ir_node *block)
 {
   firm_dbg_module_t *dbg_sched = firm_dbg_register("be.sched");
@@ -103,14 +92,14 @@ int sched_verify(const ir_node *block)
   if(n <= 0)
     return 1;
 
-  save_time_step = malloc(n * sizeof(save_time_step[0]));
-  save_nodes = malloc(n * sizeof(save_nodes[0]));
+  save_time_step = xmalloc(n * sizeof(save_time_step[0]));
+  save_nodes = xmalloc(n * sizeof(save_nodes[0]));
 
   i = 0;
   sched_foreach(block, irn) {
     sched_info_t *info = get_irn_sched_info(irn);
     save_time_step[i] = info->time_step;
-    save_nodes[i] = irn;
+    save_nodes[i] = (ir_node *)irn;
     info->time_step = i;
     pset_insert_ptr(scheduled_nodes, irn);
 
@@ -168,16 +157,20 @@ int sched_verify(const ir_node *block)
 
   del_pset(scheduled_nodes);
   free(save_time_step);
-  free(save_nodes);
+  free((void *) save_nodes);
   return res;
 }
 
-static void sched_verify_walker(ir_node *irn, void *data)
+/**
+ * Block-Walker: verify the current block and update the status
+ */
+static void sched_verify_walker(ir_node *block, void *data)
 {
   int *res = data;
-  *res &= sched_verify(irn);
+  *res &= sched_verify(block);
 }
 
+/* Verify the schedules in all blocks of the irg. */
 int sched_verify_irg(ir_graph *irg)
 {
   int res = 1;
@@ -185,3 +178,25 @@ int sched_verify_irg(ir_graph *irg)
 
   return res;
 }
+
+int sched_skip_cf_predicator(const ir_node *irn, void *data) {
+  arch_env_t *ae = data;
+  return arch_irn_classify(ae, irn) == arch_irn_class_branch;
+}
+
+int sched_skip_phi_predicator(const ir_node *irn, void *data) {
+       return is_Phi(irn);
+}
+
+ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator, void *data)
+{
+       const ir_node *bl = get_block(from);
+       ir_node *curr;
+
+       if (is_Block(from))
+               from = forward ? sched_next(from) : sched_prev(from);
+
+       for(curr = from; curr != bl && predicator(curr, data); curr = forward ? sched_next(curr) : sched_prev(curr));
+
+       return curr;
+}