X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_emitter.c;h=14b3fd5280c817cfcc50b574bc729cfe9da9b7b5;hb=703ab08b283d8b052f96b1b065359139b504bbeb;hp=5294070466e8aa920866465e9ac04f9cb69aa5a3;hpb=75ee2fcd7c5bfb5ff2c680b7086cf796fa9ff66a;p=libfirm

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 529407046..14b3fd528 100644
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -49,8 +49,10 @@
 #include "../beblocksched.h"
 #include "../beirg_t.h"
 #include "../begnuas.h"
+#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"
@@ -173,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");
@@ -192,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);
 }
 
 /**
@@ -712,19 +713,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(", #%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);
 }
@@ -733,11 +737,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;
 	}
 
@@ -985,40 +985,6 @@ static void arm_register_emitters(void) {
 #undef SILENCE
 }
 
-static const char *last_name = NULL;
-static unsigned last_line = -1;
-static unsigned num = -1;
-
-/**
- * Emit the debug support for node node.
- */
-static void arm_emit_dbg(const ir_node *irn) {
-	dbg_info *db = get_irn_dbg_info(irn);
-	unsigned lineno;
-	const char *fname = ir_retrieve_dbg_info(db, &lineno);
-
-	if (! cg->birg->main_env->options->stabs_debug_support)
-		return;
-
-	if (fname) {
-		if (last_name != fname) {
-			last_line = -1;
-			be_dbg_include_begin(cg->birg->main_env->db_handle, fname);
-			last_name = fname;
-		}
-		if (last_line != lineno) {
-			char name[64];
-
-			snprintf(name, sizeof(name), ".LM%u", ++num);
-			last_line = lineno;
-			be_dbg_line(cg->birg->main_env->db_handle, lineno, name);
-			be_emit_string(name);
-			be_emit_cstring(":\n");
-			be_emit_write_line();
-		}
-	}
-}
-
 /**
  * Emits code for a node.
  */
@@ -1027,7 +993,7 @@ static void arm_emit_node(const ir_node *irn) {
 
 	if (op->ops.generic) {
 		emit_func *emit = (emit_func *)op->ops.generic;
-		arm_emit_dbg(irn);
+		be_dbg_set_dbg_info(get_irn_dbg_info(irn));
 		(*emit)(irn);
 	} else {
 		be_emit_cstring("\t/* TODO */");
@@ -1097,7 +1063,7 @@ static void arm_gen_block(ir_node *block, ir_node *prev_block) {
 	ir_node *irn;
 
 	arm_emit_block_header(block, prev_block);
-	arm_emit_dbg(block);
+	be_dbg_set_dbg_info(get_irn_dbg_info(block));
 	sched_foreach(block, irn) {
 		arm_emit_node(irn);
 	}
@@ -1164,7 +1130,7 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg) {
 	ir_node *last_block = NULL;
 
 	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);