X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_emitter.c;h=49317a47042734bdb09a06687178c798188b9c01;hb=e147f751c8a77f40096fa59cba555669e9af688b;hp=18475c7e0e243498f253ba2db593ed785566858d;hpb=ea6ab29016f445f24e6ced97375d16be87513daa;p=libfirm

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 18475c7e0..49317a470 100644
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -987,7 +987,8 @@ static void emit_ia32_Jcc(const ir_node *node)
 
 	/* the second Proj might be a fallthrough */
 	if (can_be_fallthrough(proj_false)) {
-		ia32_emitf(proj_false, "\t/* fallthrough to %L */\n");
+		if (be_options.verbose_asm)
+			ia32_emitf(proj_false, "\t/* fallthrough to %L */\n");
 	} else {
 		ia32_emitf(proj_false, "\tjmp %L\n");
 	}
@@ -1081,7 +1082,8 @@ static void emit_ia32_Jmp(const ir_node *node)
 {
 	/* we have a block schedule */
 	if (can_be_fallthrough(node)) {
-		ia32_emitf(node, "\t/* fallthrough to %L */\n");
+		if (be_options.verbose_asm)
+			ia32_emitf(node, "\t/* fallthrough to %L */\n");
 	} else {
 		ia32_emitf(node, "\tjmp %L\n");
 	}
@@ -1748,8 +1750,6 @@ static void ia32_emit_block_header(ir_node *block)
 {
 	ir_graph     *irg        = current_ir_graph;
 	int           need_label = block_needs_label(block);
-	ir_exec_freq *exec_freq  = be_get_irg_exec_freq(irg);
-	int           arity;
 
 	if (block == get_irg_end_block(irg))
 		return;
@@ -1780,37 +1780,7 @@ static void ia32_emit_block_header(ir_node *block)
 		}
 	}
 
-	if (need_label) {
-		be_gas_emit_block_name(block);
-		be_emit_char(':');
-
-		be_emit_pad_comment();
-		be_emit_cstring("   /* ");
-	} else {
-		be_emit_cstring("\t/* ");
-		be_gas_emit_block_name(block);
-		be_emit_cstring(": ");
-	}
-
-	be_emit_cstring("preds:");
-
-	/* emit list of pred blocks in comment */
-	arity = get_irn_arity(block);
-	if (arity <= 0) {
-		be_emit_cstring(" none");
-	} else {
-		int i;
-		for (i = 0; i < arity; ++i) {
-			ir_node *predblock = get_Block_cfgpred_block(block, i);
-			be_emit_irprintf(" %d", get_irn_node_nr(predblock));
-		}
-	}
-	if (exec_freq != NULL) {
-		be_emit_irprintf(", freq: %f",
-		                 get_block_execfreq(exec_freq, block));
-	}
-	be_emit_cstring(" */\n");
-	be_emit_write_line();
+	be_gas_begin_block(block, need_label);
 }
 
 /**
@@ -1926,8 +1896,8 @@ void ia32_gen_routine(ir_graph *irg)
 	parameter_dbg_info_t *infos;
 	int i, n;
 
-	isa      = (ia32_isa_t*) arch_env;
-	do_pic   = be_get_irg_options(irg)->pic;
+	isa    = (ia32_isa_t*) arch_env;
+	do_pic = be_options.pic;
 
 	be_gas_elf_type_char = '@';