adapt to latest libfirm

[r28025]

diff --git a/driver/firm_cmdline.c b/driver/firm_cmdline.c
index 0b8cc87..56f3ee0 100644 (file)
--- a/driver/firm_cmdline.c
+++ b/driver/firm_cmdline.c
@@ -27,7 +27,6 @@ struct a_firm_opt firm_opt = {
   /* debug_mode      = */ DBG_MODE_NONE,
   /* const_folding   = */ TRUE,
   /* cse             = */ TRUE,
-  /* control_flow    = */ TRUE,
   /* gcse            = */ TRUE,
   /* confirm         = */ TRUE,
   /* muls            = */ TRUE,
@@ -104,8 +103,6 @@ static const struct params {
   { X("no-cse"),                 &firm_opt.cse,              0, "firm: disable common subexpression elimination" },
   { X("const-fold"),             &firm_opt.const_folding,    1, "firm: enable constant folding" },
   { X("no-const-fold"),          &firm_opt.const_folding,    0, "firm: disable constant folding" },
-  { X("control_flow"),           &firm_opt.control_flow,     1, "firm: enable control flow optimization" },
-  { X("no-control-flow"),        &firm_opt.control_flow,     0, "firm: disable control flow optimization" },
   { X("gcse"),                   &firm_opt.gcse,             1, "firm: enable global common subexpression elimination" },
   { X("no-gcse"),                &firm_opt.gcse,             0, "firm: disable global common subexpression elimination" },
   { X("inline-max-size=<size>"), NULL,                       0, "firm: set maximum size for function inlining" },

diff --git a/driver/firm_cmdline.h b/driver/firm_cmdline.h
index c1cc4b1..47b9ba9 100644 (file)
--- a/driver/firm_cmdline.h
+++ b/driver/firm_cmdline.h
@@ -30,7 +30,6 @@ struct a_firm_opt {
   a_byte   debug_mode;      /**< debug mode: store all local variables */
   a_byte   const_folding;   /**< enable constant folding */
   a_byte   cse;             /**< enable common-subexpression elimination */
-  a_byte   control_flow;    /**< enable control flow optimizations */
   a_byte   gcse;            /**< enable global common-subexpression elimination */
   a_byte   confirm;         /**< enable Confirm optimization */
   a_byte   muls;            /**< enable architecture dependent mul optimization */

diff --git a/driver/firm_opt.c b/driver/firm_opt.c
index 0eec03b..65571a1 100644 (file)
--- a/driver/firm_opt.c
+++ b/driver/firm_opt.c
@@ -669,9 +669,6 @@ void gen_firm_init(void)
                set_opt_cse(firm_opt.cse);
                set_opt_global_cse(0);
                set_opt_unreachable_code(1);
-               set_opt_control_flow(firm_opt.control_flow);
-               set_opt_control_flow_weak_simplification(1);
-               set_opt_control_flow_strong_simplification(1);
        } else {
                set_optimize(0);
        }