avoid unnecessary macros in public headers
[libfirm] / ir / ir / irpass.c
index ab655dc..36c007a 100644 (file)
@@ -21,7 +21,7 @@
  * @file
  * @brief     Manager for optimization passes.
  * @author    Michael Beck
- * @version   $Id$
+ * @version   $Id$
  */
 #include "config.h"
 
@@ -37,7 +37,7 @@
 /*Add a graph pass to a graph pass manager. */
 void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
 {
-       list_add(&pass->list, &mgr->passes);
+       list_add_tail(&pass->list, &mgr->passes);
        ++mgr->n_passes;
        if (pass->add_to_mgr)
                pass->add_to_mgr(pass->context);
@@ -46,7 +46,7 @@ void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
 /* Add an irprog pass to an irprog pass manager. */
 void ir_prog_pass_mgr_add(ir_prog_pass_manager_t *mgr, ir_prog_pass_t *pass)
 {
-       list_add(&pass->list, &mgr->passes);
+       list_add_tail(&pass->list, &mgr->passes);
        ++mgr->n_passes;
        if (pass->add_to_mgr)
                pass->add_to_mgr(pass->context);
@@ -64,30 +64,37 @@ static int run_wrapper(ir_prog *prog, void *ctx)
        return ir_graph_pass_mgr_run(mgr);
 }
 
-/**
- * Ensure that no verifier is run from the wrapper.
- */
-static int no_verify(ir_prog *prog, void *ctx)
+/* Ensure that no verifier is run an ir_prog pass. */
+int ir_prog_no_verify(ir_prog *prog, void *ctx)
 {
        (void)prog;
        (void)ctx;
        return 0;
 }
 
-/**
- * Ensure that no dumper is run from the wrapper.
- */
-static void no_dump(ir_prog *prog, void *ctx, unsigned idx)
+/* Ensure that no dumper is run from an ir_prog pass. */
+void ir_prog_no_dump(ir_prog *prog, void *ctx, unsigned idx)
 {
        (void)prog;
        (void)ctx;
        (void)idx;
 }
 
-/* Add an ir_graph_pass_manager as a pass to an irprog pass manager. */
-void ir_prog_pass_mgr_add_graph_mgr(
-       ir_prog_pass_manager_t *mgr, ir_graph_pass_manager_t *graph_mgr)
+/**
+ * Term wrapper for a wrapped ir_graph pass manager.
+ */
+static void term_wrapper(void *context)
 {
+       ir_graph_pass_manager_t *mgr = context;
+       term_graph_pass_mgr(mgr);
+}
+
+/**
+ * Create a wrapper ir_prog pass for an ir_graph manager.
+ */
+static ir_prog_pass_t *create_wrapper_pass(ir_graph_pass_manager_t *graph_mgr)
+{
+       /* create a wrapper pass */
        ir_prog_pass_t *pass = XMALLOCZ(ir_prog_pass_t);
 
        pass->run_on_irprog = run_wrapper;
@@ -95,13 +102,51 @@ void ir_prog_pass_mgr_add_graph_mgr(
        pass->name          = graph_mgr->name;
 
        /* do not verify nor dump: this is handled by the graph manager */
-       pass->verify_irprog = no_verify;
-       pass->dump_irprog   = no_dump;
-       pass->dump          = 0;
-       pass->verify        = 0;
+       pass->verify_irprog = ir_prog_no_verify;
+       pass->dump_irprog   = ir_prog_no_dump;
+       pass->is_wrapper    = 1;
 
        pass->add_to_mgr   = NULL;
-       pass->rem_from_mgr = NULL;
+       pass->rem_from_mgr = term_wrapper;
+
+       return pass;
+}
+
+/* Add an ir_graph_pass as a pass to an ir_prog pass manager. */
+void ir_prog_pass_mgr_add_graph_pass(
+       ir_prog_pass_manager_t *mgr, ir_graph_pass_t *pass)
+{
+       ir_graph_pass_manager_t *graph_mgr;
+       ir_prog_pass_t          *wrapper;
+
+       /* check if the last pass is a graph_pass wrapper */
+       if (! list_empty(&mgr->passes)) {
+               wrapper = list_entry(mgr->passes.prev, ir_prog_pass_t, list);
+               if (wrapper->is_wrapper) {
+                       graph_mgr = wrapper->context;
+
+                       ir_graph_pass_mgr_add(graph_mgr, pass);
+                       ++mgr->n_passes;
+                       return;
+               }
+       }
+
+       /* not found, create a new wrapper */
+       graph_mgr = new_graph_pass_mgr(
+               "graph_pass_wrapper", mgr->verify_all, mgr->dump_all);
+       graph_mgr->run_idx = mgr->run_idx + mgr->n_passes;
+
+       ir_graph_pass_mgr_add(graph_mgr, pass);
+
+       wrapper = create_wrapper_pass(graph_mgr);
+       ir_prog_pass_mgr_add(mgr, wrapper);
+}
+
+/* Add an ir_graph_pass_manager as a pass to an ir_prog pass manager. */
+void ir_prog_pass_mgr_add_graph_mgr(
+       ir_prog_pass_manager_t *mgr, ir_graph_pass_manager_t *graph_mgr)
+{
+       ir_prog_pass_t *pass = create_wrapper_pass(graph_mgr);
 
        if (mgr->dump_all)
                graph_mgr->dump_all = 1;
@@ -115,7 +160,8 @@ void ir_prog_pass_mgr_add_graph_mgr(
 /**
  * Create a suffix for dumping.
  */
-void create_suffix(char *suffix, size_t n, const char *pass_name, unsigned index)
+static void create_suffix(char *suffix, size_t n, const char *pass_name,
+                          unsigned index)
 {
        snprintf(suffix, n, "-%02u_%s", index, pass_name);
 }
@@ -137,7 +183,7 @@ int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
                        if (pass_res != 0)
                                res = 1;
                        /* verify is necessary */
-                       if (mgr->verify_all || pass->verify) {
+                       if (mgr->verify_all) {
                                if (pass->verify_irg) {
                                        pass->verify_irg(irg, pass->context);
                                } else {
@@ -145,7 +191,7 @@ int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
                                }
                        }
                        /* dump */
-                       if (mgr->dump_all || pass->dump) {
+                       if (mgr->dump_all) {
                                if (pass->dump_irg) {
                                        pass->dump_irg(irg, pass->context, idx);
                                } else {
@@ -164,15 +210,16 @@ int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
 /**
  * Verify all graphs on the given ir_prog.
  */
-static int irp_verify_irgs(ir_prog *irp, int flags) {
+static int irp_verify_irgs(void)
+{
        int i, res = 1;
 
        for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-               res &= irg_verify(get_irp_irg(i), flags);
+               res &= irg_verify(get_irp_irg(i), 0);
        return res;
 }
 
-/* Run all passes of an irprog pass manager. */
+/* Run all passes of an ir_prog pass manager. */
 int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
 {
        ir_prog_pass_t *pass;
@@ -185,15 +232,15 @@ int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
                if (pass_res != 0)
                        res = 1;
                /* verify is necessary */
-               if (mgr->verify_all || pass->verify) {
+               if (mgr->verify_all) {
                        if (pass->verify_irprog) {
                                pass->verify_irprog(irp, pass->context);
                        } else {
-                               irp_verify_irgs(irp, 0);
+                               irp_verify_irgs();
                        }
                }
                /* dump */
-               if (mgr->dump_all || pass->dump) {
+               if (mgr->dump_all) {
                        if (pass->dump_irprog) {
                                pass->dump_irprog(irp, pass->context, idx);
                        } else {
@@ -202,7 +249,11 @@ int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
                                dump_all_ir_graphs(dump_ir_block_graph, suffix);
                        }
                }
-               ++idx;
+               if (pass->is_wrapper) {
+                       ir_graph_pass_manager_t *graph_mgr = pass->context;
+                       idx += graph_mgr->n_passes;
+               } else
+                       ++idx;
        }
        return res;
 }
@@ -211,9 +262,10 @@ int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
 ir_graph_pass_manager_t *new_graph_pass_mgr(
        const char *name, int verify_all, int dump_all)
 {
-       ir_graph_pass_manager_t *res = xmalloc(sizeof(res));
+       ir_graph_pass_manager_t *res = XMALLOCZ(ir_graph_pass_manager_t);
 
        INIT_LIST_HEAD(&res->passes);
+       res->kind       = k_ir_graph_pass_mgr;
        res->name       = name;
        res->run_idx    = 0;
        res->verify_all = verify_all != 0;
@@ -226,9 +278,10 @@ ir_graph_pass_manager_t *new_graph_pass_mgr(
 ir_prog_pass_manager_t *new_prog_pass_mgr(
        const char *name, int verify_all, int dump_all)
 {
-       ir_prog_pass_manager_t *res = xmalloc(sizeof(res));
+       ir_prog_pass_manager_t *res = XMALLOCZ(ir_prog_pass_manager_t);
 
        INIT_LIST_HEAD(&res->passes);
+       res->kind       = k_ir_prog_pass_mgr;
        res->name       = name;
        res->run_idx    = 0;
        res->verify_all = verify_all != 0;
@@ -237,7 +290,7 @@ ir_prog_pass_manager_t *new_prog_pass_mgr(
        return res;
 }
 
-/* Terminate a graph pass manager and all owned passes. */
+/* Terminate an ir_graph pass manager and all owned passes. */
 void term_graph_pass_mgr(ir_graph_pass_manager_t *mgr)
 {
        ir_graph_pass_t *pass, *next;
@@ -273,7 +326,7 @@ void term_prog_pass_mgr(ir_prog_pass_manager_t *mgr)
  * @param mgr      the manager
  * @param run_idx  the index for the first pass of this manager
  */
-void ir_graph_pass_manager_set_run_idx(
+void ir_graph_pass_mgr_set_run_idx(
        ir_graph_pass_manager_t *mgr, unsigned run_idx)
 {
        mgr->run_idx = run_idx;
@@ -285,8 +338,168 @@ void ir_graph_pass_manager_set_run_idx(
  * @param mgr      the manager
  * @param run_idx  the index for the first pass of this manager
  */
-void ir_prog_pass_manager_set_run_idx(
+void ir_prog_pass_mgr_set_run_idx(
        ir_prog_pass_manager_t *mgr, unsigned run_idx)
 {
        mgr->run_idx = run_idx;
 }
+
+/**
+ * Wrapper for running void function(ir_graph *irg) as an ir_graph pass.
+ */
+static int void_graph_wrapper(ir_graph *irg, void *context)
+{
+       void (*function)(ir_graph *irg) = context;
+       function(irg);
+       return 0;
+}  /* void_graph_wrapper */
+
+/* Creates an ir_graph pass for running void function(ir_graph *irg). */
+ir_graph_pass_t *def_graph_pass(
+       const char *name, void (*function)(ir_graph *irg))
+{
+       struct ir_graph_pass_t *pass = XMALLOCZ(ir_graph_pass_t);
+
+       pass->kind       = k_ir_graph_pass;
+       pass->run_on_irg = void_graph_wrapper;
+       pass->context    = function;
+       pass->name       = name;
+
+       INIT_LIST_HEAD(&pass->list);
+
+       return pass;
+}  /* def_graph_pass */
+
+/**
+ * Wrapper for running void function(ir_graph *irg) as an ir_graph pass.
+ */
+static int int_graph_wrapper(ir_graph *irg, void *context)
+{
+       int (*function)(ir_graph *irg) = context;
+       return function(irg);
+}  /* int_graph_wrapper */
+
+/* Creates an ir_graph pass for running void function(ir_graph *irg). */
+ir_graph_pass_t *def_graph_pass_ret(
+               const char *name, int (*function)(ir_graph *irg))
+{
+       struct ir_graph_pass_t *pass = XMALLOCZ(ir_graph_pass_t);
+
+       pass->kind       = k_ir_graph_pass;
+       pass->run_on_irg = int_graph_wrapper;
+       pass->context    = function;
+       pass->name       = name;
+
+       INIT_LIST_HEAD(&pass->list);
+
+       return pass;
+}  /* def_graph_pass_ret */
+
+/* constructor for a default graph pass */
+ir_graph_pass_t *def_graph_pass_constructor(
+       ir_graph_pass_t *pass,
+       const char *name, int (*function)(ir_graph *irg, void *context)) {
+       if (pass == NULL)
+               pass = XMALLOCZ(ir_graph_pass_t);
+       else
+               memset(pass, 0, sizeof(ir_graph_pass_t));
+       pass->kind       = k_ir_graph_pass;
+       pass->run_on_irg = function;
+       pass->context    = pass;
+       pass->name       = name;
+
+       INIT_LIST_HEAD(&pass->list);
+
+       return pass;
+}  /* def_graph_pass_constructor */
+
+/* set the run parallel property */
+void ir_graph_pass_set_parallel(ir_graph_pass_t *pass, int flag)
+{
+       pass->run_parallel = flag != 0;
+}  /* ir_graph_pass_set_parallel */
+
+/**
+ * Wrapper for running void function(void) as an ir_prog pass.
+ */
+static int void_prog_wrapper(ir_prog *irp, void *context)
+{
+       void (*function)(void) = context;
+
+       (void)irp;
+       function();
+       return 0;
+}  /* void_graph_wrapper */
+
+/* Creates an ir_prog pass for running void function(void). */
+ir_prog_pass_t *def_prog_pass(
+       const char *name,
+       void (*function)(void))
+{
+       struct ir_prog_pass_t *pass = XMALLOCZ(ir_prog_pass_t);
+
+       pass->kind          = k_ir_prog_pass;
+       pass->run_on_irprog = void_prog_wrapper;
+       pass->context       = function;
+       pass->name          = name;
+
+       INIT_LIST_HEAD(&pass->list);
+
+       return pass;
+}  /* def_prog_pass */
+
+/* Creates an ir_prog pass for running void function(void). */
+ir_prog_pass_t *def_prog_pass_constructor(
+       ir_prog_pass_t *pass,
+       const char *name,
+       int (*function)(ir_prog *irp, void *context))
+{
+       if (pass == NULL)
+               pass = XMALLOCZ(ir_prog_pass_t);
+       else
+               memset(pass, 0, sizeof(ir_prog_pass_t));
+
+       pass->kind          = k_ir_prog_pass;
+       pass->run_on_irprog = function;
+       pass->context       = pass;
+       pass->name          = name;
+
+       INIT_LIST_HEAD(&pass->list);
+
+       return pass;
+}  /* def_prog_pass_constructor */
+
+struct pass_t {
+       ir_prog_pass_t pass;
+       void           *context;
+       void (*function)(void *context);
+};
+
+/**
+ * Wrapper for the call_function pass.
+ */
+static int call_function_wrapper(ir_prog *irp, void *context)
+{
+       struct pass_t *pass = context;
+
+       (void)irp;
+       pass->function(pass->context);
+       return 0;
+}  /* call_function_wrapper */
+
+ir_prog_pass_t *call_function_pass(
+       const char *name, void (*function)(void *context), void *context) {
+       struct pass_t *pass = XMALLOCZ(struct pass_t);
+
+       def_prog_pass_constructor(
+               &pass->pass, name ? name : "set_function", call_function_wrapper);
+
+       pass->pass.verify_irprog = ir_prog_no_verify;
+       pass->pass.dump_irprog   = ir_prog_no_dump;
+       pass->pass.context       = pass;
+
+       pass->function = function;
+       pass->context  = context;
+
+       return &pass->pass;
+}  /* call_function_pass */