X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ffunccall.c;h=973b00e944f4050ee21ecfb26f3496db13aa262c;hb=6082146d47925a3dbbc78da30ca0a89276457dce;hp=21ac4daaa7a0e1a74c13f33d9ea7268c20d628de;hpb=c05412296e3c502434a0dbe37c0b8eb2be7d73d0;p=libfirm

diff --git a/ir/opt/funccall.c b/ir/opt/funccall.c
index 21ac4daaa..973b00e94 100644
--- a/ir/opt/funccall.c
+++ b/ir/opt/funccall.c
@@ -39,6 +39,7 @@
 #include "irloop_t.h"
 #include "ircons.h"
 #include "iredges_t.h"
+#include "irpass_t.h"
 #include "analyze_irg_args.h"
 #include "irhooks.h"
 #include "debug.h"
@@ -235,7 +236,7 @@ static void fix_const_call_lists(ir_graph *irg, env_t *ctx) {
 		case pn_Call_X_regular: {
 			ir_node *block = get_nodes_block(call);
 			exc_changed = 1;
-			exchange(proj, new_r_Jmp(irg, block));
+			exchange(proj, new_r_Jmp(block));
 			break;
 		}
 		default:
@@ -374,7 +375,7 @@ static void fix_nothrow_call_list(ir_graph *irg, ir_node *call_list, ir_node *pr
 		case pn_Call_X_regular: {
 			ir_node *block = get_nodes_block(call);
 			exc_changed = 1;
-			exchange(proj, new_r_Jmp(irg, block));
+			exchange(proj, new_r_Jmp(block));
 			break;
 		}
 		default:
@@ -1073,3 +1074,35 @@ void optimize_funccalls(int force_run, check_alloc_entity_func callback)
 void firm_init_funccalls(void) {
 	FIRM_DBG_REGISTER(dbg, "firm.opt.funccalls");
 }  /* firm_init_funccalls */
+
+struct pass_t {
+	ir_prog_pass_t          pass;
+	int                     force_run;
+	check_alloc_entity_func callback;
+};
+
+/**
+ * Wrapper for running optimize_funccalls() as an ir_prog pass.
+ */
+static int pass_wrapper(ir_prog *irp, void *context)
+{
+	struct pass_t *pass = context;
+
+	(void)irp;
+	optimize_funccalls(pass->force_run, pass->callback);
+	return 0;
+}  /* pass_wrapper */
+
+/* Creates an ir_prog pass for optimize_funccalls. */
+ir_prog_pass_t *optimize_funccalls_pass(
+	const char *name,
+	int force_run, check_alloc_entity_func callback)
+{
+	struct pass_t *pass = XMALLOCZ(struct pass_t);
+
+	pass->force_run = force_run;
+	pass->callback  = callback;
+
+	return def_prog_pass_constructor(
+		&pass->pass, name ? name : "funccall", pass_wrapper);
+}  /* optimize_funccalls_pass */