lowering: fix i_mapper for new exception attributes

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

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index 51606ba..fa424b5 100644 (file)
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -38,6 +38,7 @@
 #include "irtools.h"
 #include "irdump.h"
 #include "lowering.h"
+#include "lower_dw.h"
 
 #include "bitset.h"
 #include "debug.h"
@@ -117,13 +118,15 @@ static int sparc_get_sp_bias(const ir_node *node)
                 * calculates that! */
                assert(attr->immediate_value <= -SPARC_MIN_STACKSIZE);
                return attr->immediate_value + SPARC_MIN_STACKSIZE;
+       } else if (is_sparc_RestoreZero(node)) {
+               return SP_BIAS_RESET;
        }
        return 0;
 }
 
 /* fill register allocator interface */
 
-static const arch_irn_ops_t sparc_irn_ops = {
+const arch_irn_ops_t sparc_irn_ops = {
        sparc_classify,
        sparc_get_frame_entity,
        sparc_set_frame_offset,
@@ -169,8 +172,8 @@ static void transform_Reload(ir_node *node)
 {
        ir_node   *block  = get_nodes_block(node);
        dbg_info  *dbgi   = get_irn_dbg_info(node);
-       ir_node   *ptr    = get_irn_n(node, be_pos_Spill_frame);
-       ir_node   *mem    = get_irn_n(node, be_pos_Reload_mem);
+       ir_node   *ptr    = get_irn_n(node, n_be_Spill_frame);
+       ir_node   *mem    = get_irn_n(node, n_be_Reload_mem);
        ir_mode   *mode   = get_irn_mode(node);
        ir_entity *entity = be_get_frame_entity(node);
        const arch_register_t *reg;
@@ -198,10 +201,10 @@ static void transform_Spill(ir_node *node)
 {
        ir_node   *block  = get_nodes_block(node);
        dbg_info  *dbgi   = get_irn_dbg_info(node);
-       ir_node   *ptr    = get_irn_n(node, be_pos_Spill_frame);
+       ir_node   *ptr    = get_irn_n(node, n_be_Spill_frame);
        ir_graph  *irg    = get_irn_irg(node);
-       ir_node   *mem    = new_r_NoMem(irg);
-       ir_node   *val    = get_irn_n(node, be_pos_Spill_val);
+       ir_node   *mem    = get_irg_no_mem(irg);
+       ir_node   *val    = get_irn_n(node, n_be_Spill_val);
        ir_mode   *mode   = get_irn_mode(val);
        ir_entity *entity = be_get_frame_entity(node);
        ir_node   *sched_point;
@@ -290,6 +293,8 @@ static void sparc_after_ra(ir_graph *irg)
        be_free_frame_entity_coalescer(fec_env);
 
        irg_block_walk_graph(irg, NULL, sparc_after_ra_walker, NULL);
+
+       sparc_introduce_prolog_epilog(irg);
 }
 
 static void sparc_init_graph(ir_graph *irg)
@@ -308,7 +313,6 @@ static sparc_isa_t sparc_isa_template = {
                &sparc_registers[REG_SP],           /* stack pointer register */
                &sparc_registers[REG_FRAME_POINTER],/* base pointer register */
                &sparc_reg_classes[CLASS_sparc_gp], /* link pointer register class */
-               -1,                                 /* stack direction */
                3,                                  /* power of two stack alignment
                                                       for calls */
                NULL,                               /* main environment */
@@ -434,7 +438,6 @@ static void sparc_handle_intrinsics(void)
                rt_iMod.mem_proj_nr     = pn_Mod_M;
                rt_iMod.regular_proj_nr = pn_Mod_X_regular;
                rt_iMod.exc_proj_nr     = pn_Mod_X_except;
-               rt_iMod.exc_mem_proj_nr = pn_Mod_M;
                rt_iMod.res_proj_nr     = pn_Mod_res;
 
                set_entity_visibility(rt_iMod.ent, ir_visibility_external);
@@ -460,7 +463,6 @@ static void sparc_handle_intrinsics(void)
                rt_uMod.mem_proj_nr     = pn_Mod_M;
                rt_uMod.regular_proj_nr = pn_Mod_X_regular;
                rt_uMod.exc_proj_nr     = pn_Mod_X_except;
-               rt_uMod.exc_mem_proj_nr = pn_Mod_M;
                rt_uMod.res_proj_nr     = pn_Mod_res;
 
                set_entity_visibility(rt_uMod.ent, ir_visibility_external);
@@ -481,7 +483,7 @@ static void sparc_handle_intrinsics(void)
 static arch_env_t *sparc_init(FILE *outfile)
 {
        sparc_isa_t *isa = XMALLOC(sparc_isa_t);
-       memcpy(isa, &sparc_isa_template, sizeof(*isa));
+       *isa = sparc_isa_template;
        isa->constants = pmap_create();
 
        be_emit_init(outfile);
@@ -552,13 +554,14 @@ static void sparc_lower_for_target(void)
                NULL,                                  /* find pointer type */
                NULL,                                  /* ret_compound_in_regs */
        };
-
        lower_calls_with_compounds(&params);
 
+       sparc_lower_64bit();
+
        for (i = 0; i < n_irgs; ++i) {
                ir_graph *irg = get_irp_irg(i);
                ir_lower_mode_b(irg, &lower_mode_b_config);
-               lower_switch(irg, 256, false);
+               lower_switch(irg, 4, 256, false);
        }
 }
 
@@ -599,7 +602,9 @@ static const backend_params *sparc_get_backend_params(void)
                1,     /* big endian */
                &arch_dep,              /* will be set later */
                sparc_is_mux_allowed,   /* parameter for if conversion */
+               32,    /* machine size */
                NULL,  /* float arithmetic mode */
+               128,   /* size of long double */
                0,     /* no trampoline support: size 0 */
                0,     /* no trampoline support: align 0 */
                NULL,  /* no trampoline support: no trampoline builder */
@@ -650,9 +655,10 @@ const arch_isa_if_t sparc_isa_if = {
        sparc_after_ra,
        sparc_finish,
        sparc_emit_routine,
+       NULL, /* register_saved_by */
 };
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_sparc);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_sparc)
 void be_init_arch_sparc(void)
 {
        be_register_isa_if("sparc", &sparc_isa_if);