rewrite and improve Cond transformation

[libfirm] / ir / be / ia32 / ia32_emitter.c

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index b5c3ec4..ad6a9df 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -273,7 +273,7 @@ void ia32_emit_immediate(ia32_emit_env_t *env, const ir_node *node)
                return;
        case ia32_ImmSymConst:
                ent = get_ia32_Immop_symconst(node);
-               mark_entity_visited(ent);
+               set_entity_backend_marked(ent, 1);
                id = get_entity_ld_ident(ent);
                be_emit_ident(env, id);
                return;
@@ -395,6 +395,7 @@ void emit_ia32_Immediate(ia32_emit_env_t *env, const ir_node *node);
  * Emits registers and/or address mode of a binary operation.
  */
 void ia32_emit_binop(ia32_emit_env_t *env, const ir_node *node) {
+       int            right_pos;
        const ir_node *right_op;
 
        switch(get_ia32_op_type(node)) {
@@ -444,7 +445,8 @@ void ia32_emit_binop(ia32_emit_env_t *env, const ir_node *node) {
                }
                break;
        case ia32_AddrModeD:
-               right_op = get_irn_n(node, 3);
+               right_pos = get_irn_arity(node) == 5 ? 3 : 2;
+               right_op  = get_irn_n(node, right_pos);
                if(is_ia32_Immediate(right_op)) {
                        emit_ia32_Immediate(env, right_op);
                        be_emit_cstring(env, ", ");
@@ -455,8 +457,7 @@ void ia32_emit_binop(ia32_emit_env_t *env, const ir_node *node) {
                        be_emit_cstring(env, ", ");
                        ia32_emit_am(env, node);
                } else {
-                       const arch_register_t *in1 = get_in_reg(env, node,
-                                                                   get_irn_arity(node) == 5 ? 3 : 2);
+                       const arch_register_t *in1 = get_in_reg(env, node, right_pos);
                        ir_mode               *mode = get_ia32_ls_mode(node);
                        const char            *in_name;
 
@@ -566,7 +567,7 @@ void ia32_emit_am(ia32_emit_env_t *env, const ir_node *node) {
        if (ent != NULL) {
                ident *id;
 
-               mark_entity_visited(ent);
+               set_entity_backend_marked(ent, 1);
                id = get_entity_ld_ident(ent);
                if (is_ia32_am_sc_sign(node))
                        be_emit_char(env, '-');
@@ -701,6 +702,9 @@ ir_node *get_cfop_target_block(const ir_node *irn) {
        return get_irn_link(irn);
 }
 
+/**
+ * Emits a block label for the given block.
+ */
 static
 void ia32_emit_block_name(ia32_emit_env_t *env, const ir_node *block)
 {
@@ -709,7 +713,7 @@ void ia32_emit_block_name(ia32_emit_env_t *env, const ir_node *block)
 }
 
 /**
- * Returns the target label for a control flow node.
+ * Emits the target label for a control flow node.
  */
 static
 void ia32_emit_cfop_target(ia32_emit_env_t * env, const ir_node *node) {
@@ -832,19 +836,10 @@ void emit_ia32_CondJmp(ia32_emit_env_t *env, const ir_node *node) {
  */
 static
 void TestJmp_emitter(ia32_emit_env_t *env, const ir_node *node) {
-       if(is_ia32_ImmSymConst(node) || is_ia32_ImmConst(node)) {
-               be_emit_cstring(env, "\ttest ");
-               ia32_emit_immediate(env, node);
-               be_emit_cstring(env, ", ");
-               ia32_emit_source_register(env, node, 0);
-               be_emit_finish_line_gas(env, node);
-       } else {
-               be_emit_cstring(env, "\ttest ");
-               ia32_emit_source_register(env, node, 1);
-               be_emit_cstring(env, ", ");
-               ia32_emit_source_register(env, node, 0);
-               be_emit_finish_line_gas(env, node);
-       }
+       be_emit_cstring(env, "\ttest ");
+       ia32_emit_binop(env, node);
+       be_emit_finish_line_gas(env, node);
+
        finish_CondJmp(env, node, mode_Iu, get_ia32_pncode(node));
 }
 
@@ -947,12 +942,8 @@ static
 int is_ia32_Immediate_0(const ir_node *node)
 {
        const ia32_immediate_attr_t *attr = get_ia32_immediate_attr_const(node);
-       tarval                      *tv   = attr->offset;
-
-       if(tv == NULL || attr->symconst != NULL)
-               return 0;
 
-       return classify_tarval(tv) == CNST_NULL;
+       return attr->offset == 0 && attr->symconst == NULL;
 }
 
 static
@@ -1353,7 +1344,7 @@ void emit_ia32_Immediate(ia32_emit_env_t *env, const ir_node *node)
 {
        const ia32_immediate_attr_t *attr = get_ia32_immediate_attr_const(node);
 
-       assert(attr->symconst != NULL || attr->offset != NULL);
+       be_emit_char(env, '$');
        if(attr->symconst != NULL) {
                ident *id = get_entity_ld_ident(attr->symconst);
 
@@ -1361,12 +1352,10 @@ void emit_ia32_Immediate(ia32_emit_env_t *env, const ir_node *node)
                        be_emit_char(env, '-');
                be_emit_ident(env, id);
        }
-       if(attr->offset != NULL) {
+       if(attr->symconst == NULL || attr->offset != 0) {
                if(attr->symconst != NULL)
                        be_emit_char(env, '+');
-               else
-                       be_emit_char(env, '$');
-               be_emit_tarval(env, attr->offset);
+               be_emit_irprintf(env->emit, "%d", attr->offset);
        }
 }
 
@@ -1749,7 +1738,7 @@ void emit_be_Call(ia32_emit_env_t *env, const ir_node *node) {
 
        be_emit_cstring(env, "\tcall ");
        if (ent) {
-               mark_entity_visited(ent);
+               set_entity_backend_marked(ent, 1);
                be_emit_string(env, get_entity_ld_name(ent));
        } else {
                be_emit_char(env, '*');
@@ -2207,7 +2196,7 @@ void ia32_emit_block_header(ia32_emit_env_t *env, ir_node *block, ir_node *prev)
                ir_node *pred_block = get_nodes_block(pred);
 
                /* we don't need labels for fallthrough blocks, however switch-jmps
-                * are no fallthoughs */
+                * are no fallthroughs */
                if(pred_block == prev &&
                                !(is_Proj(pred) && is_ia32_SwitchJmp(get_Proj_pred(pred)))) {
                        need_label = 0;