X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fbearch_sparc.c;h=9224f7242680b8291ddee8bad42bf3d8869ad644;hb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;hp=d4c4746b27dcbe61f8f7df8945f1e785f32b1727;hpb=cf7a9efa904172b57ac9bf422039638798998689;p=libfirm

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index d4c4746b2..9224f7242 100644
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -21,7 +21,6 @@
  * @file
  * @brief    The main sparc backend driver file.
  * @author   Hannes Rapp, Matthias Braun
- * @version  $Id$
  */
 #include "config.h"
 
@@ -37,11 +36,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 +51,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"
 
@@ -350,22 +351,24 @@ static void sparc_handle_intrinsics(void)
 /**
  * Initializes the backend ISA
  */
-static arch_env_t *sparc_init(FILE *outfile)
+static arch_env_t *sparc_init(const be_main_env_t *env)
 {
 	sparc_isa_t *isa = XMALLOC(sparc_isa_t);
 	*isa = sparc_isa_template;
 	isa->constants = pmap_create();
 
 	be_gas_elf_type_char      = '#';
-	be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF_SPARC;
-
-	be_emit_init(outfile);
+	be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF;
+	be_gas_elf_variant        = ELF_VARIANT_SPARC;
 
 	sparc_register_init();
 	sparc_create_opcodes(&sparc_irn_ops);
 	sparc_handle_intrinsics();
 	sparc_cconv_init();
 
+	be_emit_init(env->file_handle);
+	be_gas_begin_compilation_unit(env);
+
 	return &isa->base;
 }
 
@@ -377,7 +380,7 @@ static void sparc_done(void *self)
 	sparc_isa_t *isa = (sparc_isa_t*)self;
 
 	/* emit now all global declarations */
-	be_gas_emit_decls(isa->base.main_env);
+	be_gas_end_compilation_unit(isa->base.main_env);
 
 	pmap_destroy(isa->constants);
 	be_emit_exit();
@@ -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);
+		lower_alloc(irg, SPARC_STACK_ALIGNMENT, false, SPARC_MIN_STACKSIZE);
 	}
 }
 
 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);
 }
 
 /**
@@ -497,23 +479,26 @@ static const backend_params *sparc_get_backend_params(void)
 	};
 
 	ir_mode *mode_long_long
-		= new_ir_mode("long long", irms_int_number, 64, 1, irma_twos_complement,
-		              64);
+		= new_int_mode("long long", irma_twos_complement, 64, 1, 64);
 	ir_type *type_long_long = new_type_primitive(mode_long_long);
 	ir_mode *mode_unsigned_long_long
-		= new_ir_mode("unsigned long long", irms_int_number, 64, 0,
-		              irma_twos_complement, 64);
+		= new_int_mode("unsigned long long", irma_twos_complement, 64, 0, 64);
 	ir_type *type_unsigned_long_long
 		= new_type_primitive(mode_unsigned_long_long);
-	ir_mode *mode_long_double
-		= new_ir_mode("long double", irms_float_number, 128, 1,
-		              irma_ieee754, 0);
-	ir_type *type_long_double = new_type_primitive(mode_long_double);
 
-	set_type_alignment_bytes(type_long_double, 8);
-	p.type_long_double        = type_long_double;
 	p.type_long_long          = type_long_long;
 	p.type_unsigned_long_long = type_unsigned_long_long;
+
+	if (sparc_isa_template.fpu_arch == SPARC_FPU_ARCH_SOFTFLOAT) {
+		p.mode_float_arithmetic = NULL;
+		p.type_long_double      = NULL;
+	} else {
+		ir_type *type_long_double = new_type_primitive(mode_Q);
+
+		set_type_alignment_bytes(type_long_double, 8);
+		set_type_size_bytes(type_long_double, 16);
+		p.type_long_double = type_long_double;
+	}
 	return &p;
 }