fixed wrong variable usage

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

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 50beb08..f801f66 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -42,6 +42,7 @@
 #include "execfreq.h"
 #include "error.h"
 #include "raw_bitset.h"
+#include "dbginfo.h"
 
 #include "../besched_t.h"
 #include "../benode_t.h"
@@ -350,6 +351,8 @@ void ia32_emit_function_object(const char *name)
                be_emit_cstring(";\t.scl\t2;\t.type\t32;\t.endef\n");
                be_emit_write_line();
                break;
+       case GAS_FLAVOUR_YASM:
+               break;
        default:
                break;
        }
@@ -367,6 +370,9 @@ void ia32_emit_function_size(const char *name)
                be_emit_char('\n');
                be_emit_write_line();
                break;
+       case GAS_FLAVOUR_MINGW:
+       case GAS_FLAVOUR_YASM:
+               break;
        default:
                break;
        }
@@ -494,6 +500,23 @@ void ia32_emit_unop(const ir_node *node, int pos) {
        }
 }
 
+static void ia32_emit_entity(ir_entity *entity)
+{
+       ident *id;
+
+       set_entity_backend_marked(entity, 1);
+       id = get_entity_ld_ident(entity);
+       be_emit_ident(id);
+
+       if(get_entity_owner(entity) == get_tls_type()) {
+               if (get_entity_visibility(entity) == visibility_external_allocated) {
+                       be_emit_cstring("@INDNTPOFF");
+               } else {
+                       be_emit_cstring("@NTPOFF");
+               }
+       }
+}
+
 /**
  * Emits address mode.
  */
@@ -510,21 +533,9 @@ void ia32_emit_am(const ir_node *node) {
 
        /* emit offset */
        if (ent != NULL) {
-               ident *id;
-
-               set_entity_backend_marked(ent, 1);
-               id = get_entity_ld_ident(ent);
                if (is_ia32_am_sc_sign(node))
                        be_emit_char('-');
-               be_emit_ident(id);
-
-               if(get_entity_owner(ent) == get_tls_type()) {
-                       if (get_entity_visibility(ent) == visibility_external_allocated) {
-                               be_emit_cstring("@INDNTPOFF");
-                       } else {
-                               be_emit_cstring("@NTPOFF");
-                       }
-               }
+               ia32_emit_entity(ent);
        }
 
        if(offs != 0) {
@@ -710,8 +721,10 @@ static int determine_final_pnc(const ir_node *node, int flags_pos,
                        pnc = get_mirrored_pnc(pnc);
                pnc |= ia32_pn_Cmp_float;
        } else {
+#if 0
                assert(is_ia32_Cmp(flags) || is_ia32_Test(flags)
                                || is_ia32_Cmp8Bit(flags) || is_ia32_Test8Bit(flags));
+#endif
                flags_attr = get_ia32_attr_const(flags);
 
                if(flags_attr->data.ins_permuted)
@@ -1020,11 +1033,12 @@ int ia32_cmp_branch_t(const void *a, const void *b) {
  * possible otherwise a cmp-jmp cascade). Port from
  * cggg ia32 backend
  */
-static
-void emit_ia32_SwitchJmp(const ir_node *node) {
+static void emit_ia32_SwitchJmp(const ir_node *node)
+{
        unsigned long       interval;
        int                 last_value, i;
        long                pnc;
+       long                default_pn;
        jmp_tbl_t           tbl;
        ir_node            *proj;
        const ir_edge_t    *edge;
@@ -1033,11 +1047,12 @@ void emit_ia32_SwitchJmp(const ir_node *node) {
        tbl.label        = xmalloc(SNPRINTF_BUF_LEN);
        tbl.label        = get_unique_label(tbl.label, SNPRINTF_BUF_LEN, ".TBL_");
        tbl.defProj      = NULL;
-       tbl.num_branches = get_irn_n_edges(node);
+       tbl.num_branches = get_irn_n_edges(node) - 1;
        tbl.branches     = xcalloc(tbl.num_branches, sizeof(tbl.branches[0]));
        tbl.min_value    = INT_MAX;
        tbl.max_value    = INT_MIN;
 
+       default_pn = get_ia32_condcode(node);
        i = 0;
        /* go over all proj's and collect them */
        foreach_out_edge(node, edge) {
@@ -1046,21 +1061,22 @@ void emit_ia32_SwitchJmp(const ir_node *node) {
 
                pnc = get_Proj_proj(proj);
 
-               /* create branch entry */
-               tbl.branches[i].target = proj;
-               tbl.branches[i].value  = pnc;
-
-               tbl.min_value = pnc < tbl.min_value ? pnc : tbl.min_value;
-               tbl.max_value = pnc > tbl.max_value ? pnc : tbl.max_value;
-
                /* check for default proj */
-               if (pnc == get_ia32_condcode(node)) {
-                       assert(tbl.defProj == NULL && "found two defProjs at SwitchJmp");
+               if (pnc == default_pn) {
+                       assert(tbl.defProj == NULL && "found two default Projs at SwitchJmp");
                        tbl.defProj = proj;
+               } else {
+                       tbl.min_value = pnc < tbl.min_value ? pnc : tbl.min_value;
+                       tbl.max_value = pnc > tbl.max_value ? pnc : tbl.max_value;
+
+                       /* create branch entry */
+                       tbl.branches[i].target = proj;
+                       tbl.branches[i].value  = pnc;
+                       ++i;
                }
 
-               i++;
        }
+       assert(i == tbl.num_branches);
 
        /* sort the branches by their number */
        qsort(tbl.branches, tbl.num_branches, sizeof(tbl.branches[0]), ia32_cmp_branch_t);
@@ -1153,11 +1169,9 @@ static void emit_ia32_Immediate(const ir_node *node)
 
        be_emit_char('$');
        if(attr->symconst != NULL) {
-               ident *id = get_entity_ld_ident(attr->symconst);
-
                if(attr->sc_sign)
                        be_emit_char('-');
-               be_emit_ident(id);
+               ia32_emit_entity(attr->symconst);
        }
        if(attr->symconst == NULL || attr->offset != 0) {
                if(attr->symconst != NULL) {
@@ -1551,8 +1565,7 @@ static void emit_be_Call(const ir_node *node)
 
        be_emit_cstring("\tcall ");
        if (ent) {
-               set_entity_backend_marked(ent, 1);
-               be_emit_string(get_entity_ld_name(ent));
+               ia32_emit_entity(ent);
        } else {
                const arch_register_t *reg = get_in_reg(node, be_pos_Call_ptr);
                be_emit_char('*');
@@ -1910,7 +1923,7 @@ static void ia32_emit_dbg(const ir_node *node)
 {
        dbg_info *db = get_irn_dbg_info(node);
        unsigned lineno;
-       const char *fname = be_retrieve_dbg_info(db, &lineno);
+       const char *fname = ir_retrieve_dbg_info(db, &lineno);
 
        if (! cg->birg->main_env->options->stabs_debug_support)
                return;