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

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 498dffd81..14b3fd528 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);
 }
 
 /**
@@ -713,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);
 }
@@ -734,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;
 	}