Remove ia32_l_Setcc and remove set creation callback from ir_lower_mode_b().

[libfirm] / ir / be / sparc / bearch_sparc.c

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index be2d78f..a4c86ef 100644 (file)
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -37,11 +37,13 @@
 #include "iroptimize.h"
 #include "irtools.h"
 #include "irdump.h"
+#include "iropt_t.h"
 #include "lowering.h"
 #include "lower_dw.h"
 #include "lower_alloc.h"
 #include "lower_builtins.h"
 #include "lower_calls.h"
+#include "lower_mode_b.h"
 #include "lower_softfloat.h"
 
 #include "bitset.h"
@@ -50,18 +52,18 @@
 #include "error.h"
 #include "util.h"
 
-#include "../bearch.h"
-#include "../benode.h"
-#include "../belower.h"
-#include "../besched.h"
+#include "bearch.h"
+#include "benode.h"
+#include "belower.h"
+#include "besched.h"
 #include "be.h"
-#include "../bemachine.h"
-#include "../bemodule.h"
-#include "../beirg.h"
-#include "../begnuas.h"
-#include "../belistsched.h"
-#include "../beflags.h"
-#include "../beutil.h"
+#include "bemachine.h"
+#include "bemodule.h"
+#include "beirg.h"
+#include "begnuas.h"
+#include "belistsched.h"
+#include "beflags.h"
+#include "beutil.h"
 
 #include "bearch_sparc_t.h"
 
@@ -357,7 +359,8 @@ static arch_env_t *sparc_init(FILE *outfile)
        isa->constants = pmap_create();
 
        be_gas_elf_type_char      = '#';
-       be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF_SPARC;
+       be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF;
+       be_gas_elf_variant        = ELF_VARIANT_SPARC;
 
        be_emit_init(outfile);
 
@@ -408,22 +411,19 @@ static int sparc_get_reg_class_alignment(const arch_register_class_t *cls)
        return get_mode_size_bytes(mode);
 }
 
-static ir_node *sparc_create_set(ir_node *cond)
-{
-       return ir_create_cond_set(cond, mode_Iu);
-}
-
 static void sparc_lower_for_target(void)
 {
        size_t i, n_irgs = get_irp_n_irgs();
-       lower_mode_b_config_t lower_mode_b_config = {
-               mode_Iu,
-               sparc_create_set,
-               0,
-       };
 
        lower_calls_with_compounds(LF_RETURN_HIDDEN);
 
+       for (i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               /* Turn all small CopyBs into loads/stores and all bigger CopyBs into
+                * memcpy calls. */
+               lower_CopyB(irg, 31, 32, false);
+       }
+
        if (sparc_isa_template.fpu_arch == SPARC_FPU_ARCH_SOFTFLOAT)
                lower_floating_point();
 
@@ -433,34 +433,16 @@ static void sparc_lower_for_target(void)
 
        for (i = 0; i < n_irgs; ++i) {
                ir_graph *irg = get_irp_irg(i);
-               ir_lower_mode_b(irg, &lower_mode_b_config);
+               ir_lower_mode_b(irg, mode_Iu);
                lower_switch(irg, 4, 256, false);
                lower_alloc(irg, SPARC_STACK_ALIGNMENT, false, -SPARC_MIN_STACKSIZE);
        }
-
-       for (i = 0; i < n_irgs; ++i) {
-               ir_graph *irg = get_irp_irg(i);
-               /* Turn all small CopyBs into loads/stores and all bigger CopyBs into
-                * memcpy calls. */
-               lower_CopyB(irg, 31, 32);
-       }
 }
 
 static int sparc_is_mux_allowed(ir_node *sel, ir_node *mux_false,
                                 ir_node *mux_true)
 {
-       ir_graph *irg  = get_irn_irg(sel);
-       ir_mode  *mode = get_irn_mode(mux_true);
-
-       if (get_irg_phase_state(irg) == phase_low)
-               return false;
-
-       if (!mode_is_int(mode) && !mode_is_reference(mode) && mode != mode_b)
-               return false;
-       if (is_Const(mux_true) && is_Const_one(mux_true) &&
-                       is_Const(mux_false) && is_Const_null(mux_false))
-               return true;
-       return false;
+       return ir_is_optimizable_mux(sel, mux_false, mux_true);
 }
 
 /**