be_lower_for_target is now a simple function in the public API

[r28172]

diff --git a/include/libfirm/be.h b/include/libfirm/be.h
index 51f4b3e..086eedb 100644 (file)
--- a/include/libfirm/be.h
+++ b/include/libfirm/be.h
@@ -80,9 +80,6 @@ typedef struct backend_params {
        /** the backend uses big-endian byte ordering if set, else little endian */
        unsigned byte_order_big_endian:1;
 
-       /** callback that performs lowerings required for target architecture */
-       lower_for_target_func lower_for_target;
-
        /** Settings for architecture dependent optimizations. */
        const ir_settings_arch_dep_t *dep_param;
 
@@ -126,6 +123,17 @@ FIRM_API int be_parse_arg(const char *arg);
  */
 FIRM_API const backend_params *be_get_backend_param(void);
 
+/**
+ * Lowers current program for the target architecture.
+ * This must be run once before using be_main. The idea here is that the backend
+ * can perform lowerings like doubleword-lowering, ABI adjustments or
+ * implementation of boolean values, if-conversion, with target specific
+ * settings.
+ * The resulting graph is still a "normal" firm-graph on which you can and
+ * should perform further architecture-neutral optimisations before be_main.
+ */
+FIRM_API void be_lower_for_target(void);
+
 /**
  * Creates an ir_prog pass which performs lowerings necessary for the target
  * architecture. (Calling backend_params->lower_for_target)

diff --git a/ir/be/TEMPLATE/bearch_TEMPLATE.c b/ir/be/TEMPLATE/bearch_TEMPLATE.c
index 8ace938..0dcc1a0 100644 (file)
--- a/ir/be/TEMPLATE/bearch_TEMPLATE.c
+++ b/ir/be/TEMPLATE/bearch_TEMPLATE.c
@@ -358,7 +358,6 @@ static const backend_params *TEMPLATE_get_backend_params(void)
                0,     /* no inline assembly */
                0,     /* no support for Rotl nodes */
                0,     /* 0: little-endian, 1: big-endian */
-               TEMPLATE_lower_for_target,  /* lowering for target */
                NULL,  /* architecture dependent settings, will be set later */
                TEMPLATE_is_mux_allowed,  /* parameter for if conversion */
                NULL,  /* float arithmetic mode */
@@ -392,6 +391,7 @@ static int TEMPLATE_is_valid_clobber(const char *clobber)
 
 const arch_isa_if_t TEMPLATE_isa_if = {
        TEMPLATE_init,
+       TEMPLATE_lower_for_target,
        TEMPLATE_done,
        NULL,                /* handle intrinsics */
        TEMPLATE_get_reg_class_for_mode,

diff --git a/ir/be/amd64/bearch_amd64.c b/ir/be/amd64/bearch_amd64.c
index 8bd0459..eb44063 100644 (file)
--- a/ir/be/amd64/bearch_amd64.c
+++ b/ir/be/amd64/bearch_amd64.c
@@ -519,7 +519,6 @@ static const backend_params *amd64_get_backend_params(void) {
                0,     /* no inline assembly */
                1,     /* support Rotl nodes */
                0,     /* little endian */
-               amd64_lower_for_target,  /* lowering callback */
                NULL,  /* will be set later */
                amd64_is_mux_allowed,  /* parameter for if conversion */
                NULL,  /* float arithmetic mode */
@@ -553,6 +552,7 @@ static int amd64_is_valid_clobber(const char *clobber)
 
 const arch_isa_if_t amd64_isa_if = {
        amd64_init,
+       amd64_lower_for_target,
        amd64_done,
        NULL,                /* handle intrinsics */
        amd64_get_reg_class_for_mode,

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index 85d9b4a..2dd1046 100644 (file)
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -565,7 +565,6 @@ static const backend_params *arm_get_libfirm_params(void)
                0,     /* don't support inline assembler yet */
                1,     /* support Rotl nodes */
                1,     /* big endian */
-               arm_lower_for_target, /* lowering function */
                &ad,   /* will be set later */
                arm_is_mux_allowed, /* allow_ifconv function */
                NULL,  /* float arithmetic mode (TODO) */
@@ -600,6 +599,7 @@ static const lc_opt_table_entry_t arm_options[] = {
 
 const arch_isa_if_t arm_isa_if = {
        arm_init,
+       arm_lower_for_target,
        arm_done,
        NULL,  /* handle_intrinsics */
        arm_get_reg_class_for_mode,

diff --git a/ir/be/bearch.h b/ir/be/bearch.h
index 526f969..5490921 100644 (file)
--- a/ir/be/bearch.h
+++ b/ir/be/bearch.h
@@ -467,6 +467,12 @@ struct arch_isa_if_t {
         */
        arch_env_t *(*init)(FILE *file_handle);
 
+       /**
+        * lowers current program for target. See the documentation for
+        * be_lower_for_target() for details.
+        */
+       void (*lower_for_target)(void);
+
        /**
         * Free the isa instance.
         */

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 133f92f..1baca25 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -476,6 +476,19 @@ static const char *get_timer_name(be_timer_id_t id)
 }
 ir_timer_t *be_timers[T_LAST+1];
 
+void be_lower_for_target(void)
+{
+       int i;
+
+       isa_if->lower_for_target();
+       /* set the phase to low */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               set_irg_phase_state(irg, phase_low);
+       }
+       set_irp_phase_state(phase_low);
+}
+
 /**
  * The Firm backend main loop.
  * Do architecture specific lowering for all graphs
@@ -865,8 +878,7 @@ void be_main(FILE *file_handle, const char *cup_name)
 
 static int do_lower_for_target(ir_prog *irp, void *context)
 {
-       const backend_params *be_params = be_get_backend_param();
-       be_params->lower_for_target();
+       be_lower_for_target();
        (void) context;
        (void) irp;
        return 0;

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index 8a7cf97..4a70e2c 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -2114,7 +2114,6 @@ static const backend_params *ia32_get_libfirm_params(void)
                1,     /* support inline assembly */
                1,     /* support Rotl nodes */
                0,     /* little endian */
-               ia32_lower_for_target,
                NULL,  /* will be set later */
                ia32_is_mux_allowed,
                NULL,  /* float arithmetic mode, will be set below */
@@ -2172,6 +2171,7 @@ static const lc_opt_table_entry_t ia32_options[] = {
 
 const arch_isa_if_t ia32_isa_if = {
        ia32_init,
+       ia32_lower_for_target,
        ia32_done,
        ia32_handle_intrinsics,
        ia32_get_reg_class_for_mode,

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index abce062..a953b04 100644 (file)
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -586,7 +586,6 @@ static const backend_params *sparc_get_backend_params(void)
                0,     /* no inline assembly */
                0,     /* no support for RotL nodes */
                1,     /* big endian */
-               sparc_lower_for_target, /* lowering callback */
                &arch_dep,              /* will be set later */
                sparc_is_mux_allowed,   /* parameter for if conversion */
                NULL,  /* float arithmetic mode */
@@ -620,6 +619,7 @@ static int sparc_is_valid_clobber(const char *clobber)
 
 const arch_isa_if_t sparc_isa_if = {
        sparc_init,
+       sparc_lower_for_target,
        sparc_done,
        NULL,                /* handle intrinsics */
        sparc_get_reg_class_for_mode,