X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_emitter.c;h=9e9c57546d4fe71be16d78b86636a984220f0568;hb=fc2759fa267ba4b074c2ac570c1b9d47cc943612;hp=7c7b809f98c083e99b2c29d0c42bc18e56cd11f1;hpb=4f2f28dd10711dce5b639a96f7a577f6e7868a9d;p=libfirm

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 7c7b809f9..9e9c57546 100644
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -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.
  */
@@ -895,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. */
 }
 
@@ -945,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);
@@ -1125,9 +1200,10 @@ 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;
@@ -1136,6 +1212,8 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg) {
 
 	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);
 
@@ -1156,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;