X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_emitter.c;h=9e9c57546d4fe71be16d78b86636a984220f0568;hb=fc2759fa267ba4b074c2ac570c1b9d47cc943612;hp=7a3affed7aa46bcca6a7ebb0ed75f1748152f8e0;hpb=379fd05b0fb269dd9b9105810de1ce565b18e446;p=libfirm diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c index 7a3affed7..9e9c57546 100644 --- a/ir/be/arm/arm_emitter.c +++ b/ir/be/arm/arm_emitter.c @@ -52,6 +52,7 @@ #include "../be_dbgout.h" #include "arm_emitter.h" +#include "arm_optimize.h" #include "gen_arm_emitter.h" #include "arm_nodes_attr.h" #include "arm_new_nodes.h" @@ -174,13 +175,11 @@ void arm_emit_dest_register(const ir_node *node, int pos) { */ void arm_emit_offset(const ir_node *node) { int offset = 0; - ir_op *irn_op = get_irn_op(node); + ir_opcode opc = get_irn_opcode(node); - if (irn_op == op_be_Reload || irn_op == op_be_Spill) { + if (opc == beo_Reload || opc == beo_Spill) { ir_entity *ent = be_get_frame_entity(node); offset = get_entity_offset(ent); - } else if (irn_op == op_be_IncSP) { - offset = - be_get_IncSP_offset(node); } else { assert(!"unimplemented arm_emit_offset for this node type"); panic("unimplemented arm_emit_offset for this node type"); @@ -193,12 +192,13 @@ void arm_emit_offset(const ir_node *node) { */ static void arm_emit_fpa_postfix(const ir_mode *mode) { int bits = get_mode_size_bits(mode); + char c = 'e'; + if (bits == 32) - be_emit_char('s'); + c = 's'; else if (bits == 64) - be_emit_char('d'); - else - be_emit_char('e'); + c = 'd'; + be_emit_char(c); } /** @@ -241,9 +241,9 @@ void arm_emit_shift(const ir_node *node) { mod = get_arm_shift_modifier(node); if (ARM_HAS_SHIFT(mod)) { - long v = get_arm_imm_value(node); + int v = get_arm_imm_value(node); - be_emit_irprintf(", %s #%l", arm_shf_mod_name(mod), v); + be_emit_irprintf(", %s #%d", arm_shf_mod_name(mod), v); } } @@ -338,7 +338,7 @@ static ir_node *get_cfop_target_block(const ir_node *irn) { */ static void arm_emit_block_name(const ir_node *block) { if (has_Block_label(block)) { - be_emit_string(be_gas_label_prefix()); + be_emit_string(be_gas_block_label_prefix()); be_emit_irprintf("%lu", get_Block_label(block)); } else { be_emit_cstring(BLOCK_PREFIX); @@ -453,6 +453,80 @@ static void emit_arm_CmpBra(const ir_node *irn) { } } + +/** + * Emit a Tst with conditional branch. + */ +static void emit_arm_TstBra(const ir_node *irn) +{ + const ir_edge_t *edge; + const ir_node *proj_true = NULL; + const ir_node *proj_false = NULL; + const ir_node *block; + const ir_node *next_block; + const char *suffix; + int proj_num = get_arm_CondJmp_proj_num(irn); + + foreach_out_edge(irn, edge) { + ir_node *proj = get_edge_src_irn(edge); + long nr = get_Proj_proj(proj); + if (nr == pn_Cond_true) { + proj_true = proj; + } else { + proj_false = proj; + } + } + + /* for now, the code works for scheduled and non-schedules blocks */ + block = get_nodes_block(irn); + + /* we have a block schedule */ + next_block = sched_next_block(block); + + assert(proj_num != pn_Cmp_False); + assert(proj_num != pn_Cmp_True); + + if (get_cfop_target_block(proj_true) == next_block) { + /* exchange both proj's so the second one can be omitted */ + const ir_node *t = proj_true; + + proj_true = proj_false; + proj_false = t; + proj_num = get_negated_pnc(proj_num, mode_Iu); + } + switch (proj_num) { + case pn_Cmp_Eq: suffix = "eq"; break; + case pn_Cmp_Lt: suffix = "lt"; break; + case pn_Cmp_Le: suffix = "le"; break; + case pn_Cmp_Gt: suffix = "gt"; break; + case pn_Cmp_Ge: suffix = "ge"; break; + case pn_Cmp_Lg: suffix = "ne"; break; + case pn_Cmp_Leg: suffix = "al"; break; + default: assert(!"Cmp unsupported"); suffix = "al"; + } + be_emit_cstring("\ttst "); + arm_emit_source_register(irn, 0); + be_emit_cstring(", "); + arm_emit_source_register(irn, 1); + be_emit_finish_line_gas(irn); + + /* emit the true proj */ + be_emit_irprintf("\tb%s ", suffix); + arm_emit_cfop_target(proj_true); + be_emit_finish_line_gas(proj_true); + + if (get_cfop_target_block(proj_false) == next_block) { + be_emit_cstring("\t/* fallthrough to "); + arm_emit_cfop_target(proj_false); + be_emit_cstring(" */"); + be_emit_finish_line_gas(proj_false); + } else { + be_emit_cstring("b "); + arm_emit_cfop_target(proj_false); + be_emit_finish_line_gas(proj_false); + } +} + /** * Emit a Compare with conditional branch. */ @@ -713,19 +787,22 @@ static void emit_be_Call(const ir_node *irn) { /** Emit an IncSP node */ static void emit_be_IncSP(const ir_node *irn) { - int offs = be_get_IncSP_offset(irn); + int offs = -be_get_IncSP_offset(irn); if (offs != 0) { - be_emit_cstring("\tadd "); + if (offs < 0) { + be_emit_cstring("\tsub "); + offs = -offs; + } else { + be_emit_cstring("\tadd "); + } arm_emit_dest_register(irn, 0); be_emit_cstring(", "); arm_emit_source_register(irn, 0); - be_emit_cstring(", #"); - arm_emit_offset(irn); + be_emit_irprintf(", #0x%X", offs); } else { - be_emit_cstring("\t/* omitted IncSP("); - arm_emit_offset(irn); - be_emit_cstring(") */"); + /* omitted IncSP(0) */ + return; } be_emit_finish_line_gas(irn); } @@ -734,11 +811,7 @@ static void emit_be_Copy(const ir_node *irn) { ir_mode *mode = get_irn_mode(irn); if (get_in_reg(irn, 0) == get_out_reg(irn, 0)) { - be_emit_cstring("\t/* omitted Copy: "); - arm_emit_source_register(irn, 0); - be_emit_cstring(" -> "); - arm_emit_dest_register(irn, 0); - be_emit_finish_line_gas(irn); + /* omitted Copy */ return; } @@ -896,7 +969,7 @@ static void emit_arm_fpaDbl2GP(const ir_node *irn) { static void emit_arm_LdTls(const ir_node *irn) { (void) irn; - panic("TLS not supported for this target\n"); + panic("TLS not supported for this target"); /* Er... our gcc does not support it... Install a newer toolchain. */ } @@ -946,6 +1019,7 @@ static void arm_register_emitters(void) { /* other emitter functions */ ARM_EMIT(CmpBra); + ARM_EMIT(TstBra); ARM_EMIT(fpaCmfBra); ARM_EMIT(fpaCmfeBra); ARM_EMIT(CopyB); @@ -1126,17 +1200,20 @@ static int cmp_sym_or_tv(const void *elt, const void *key, size_t size) { * Main driver. Emits the code for one routine. */ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg) { - ir_node **blk_sched; - int i, n; - ir_node *last_block = NULL; + ir_node **blk_sched; + int i, n; + ir_node *last_block = NULL; + ir_entity *entity = get_irg_entity(irg); cg = arm_cg; - isa = (const arm_isa_t *)cg->arch_env->isa; + isa = (const arm_isa_t *)cg->arch_env; arch_env = cg->arch_env; sym_or_tv = new_set(cmp_sym_or_tv, 8); arm_register_emitters(); + be_dbg_method_begin(entity, be_abi_get_stack_layout(cg->birg->abi)); + /* create the block schedule. For now, we don't need it earlier. */ blk_sched = be_create_block_schedule(cg->irg, cg->birg->exec_freq); @@ -1157,6 +1234,8 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg) { last_block = block; } + be_dbg_method_end(); + /* emit SymConst values */ if (set_count(sym_or_tv) > 0) { sym_or_tv_t *entry;