Moved assertion into if clause

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

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index aaf4f87..3804dbf 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -289,7 +289,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                                fprintf(F, "pn_code = %ld\n", get_ia32_condcode(n));
                        } else if (is_ia32_CMov(n) || is_ia32_Set(n) || is_ia32_Jcc(n)) {
                                long pnc = get_ia32_condcode(n);
-                               fprintf(F, "pn_code = %ld (%s)\n", pnc, get_pnc_string(pnc));
+                               fprintf(F, "pn_code = 0x%lX (%s)\n", pnc, get_pnc_string(pnc & pn_Cmp_True));
                        }
                        else if (is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
                                fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
@@ -329,6 +329,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                                if (flags & arch_irn_flags_modify_sp) {
                                        fprintf(F, " modify_sp");
                                }
+                               if (flags & arch_irn_flags_modify_flags) {
+                                       fprintf(F, " modify_flags");
+                               }
                        }
                        fprintf(F, " (%d)\n", flags);
 
@@ -414,6 +417,13 @@ const ia32_asm_attr_t *get_ia32_asm_attr_const(const ir_node *node) {
        return asm_attr;
 }
 
+ia32_immediate_attr_t *get_ia32_immediate_attr(ir_node *node) {
+       ia32_attr_t           *attr      = get_ia32_attr(node);
+       ia32_immediate_attr_t *imm_attr  = CAST_IA32_ATTR(ia32_immediate_attr_t, attr);
+
+       return imm_attr;
+}
+
 const ia32_immediate_attr_t *get_ia32_immediate_attr_const(const ir_node *node)
 {
        const ia32_attr_t           *attr     = get_ia32_attr_const(node);
@@ -857,7 +867,7 @@ const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node) {
  */
 unsigned get_ia32_exc_label(const ir_node *node) {
        const ia32_attr_t *attr = get_ia32_attr_const(node);
-       return attr->data.except_label;
+       return attr->data.has_except_label;
 }
 
 /**
@@ -865,7 +875,27 @@ unsigned get_ia32_exc_label(const ir_node *node) {
  */
 void set_ia32_exc_label(ir_node *node, unsigned flag) {
        ia32_attr_t *attr = get_ia32_attr(node);
-       attr->data.except_label = flag;
+       attr->data.has_except_label = flag;
+}
+
+/**
+ * Return the exception label id.
+ */
+ir_label_t get_ia32_exc_label_id(const ir_node *node) {
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+
+       assert(attr->data.has_except_label);
+       return attr->exc_label;
+}
+
+/**
+ * Assign the exception label id.
+ */
+void set_ia32_exc_label_id(ir_node *node, ir_label_t id) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+
+       assert(attr->data.has_except_label);
+       attr->exc_label = id;
 }
 
 #ifndef NDEBUG
@@ -1123,7 +1153,7 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
        if (a->data.tp != b->data.tp)
                return 1;
 
-       if (a->data.except_label != b->data.except_label)
+       if (a->data.has_except_label != b->data.has_except_label)
                return 1;
 
        if (a->data.ins_permuted != b->data.ins_permuted
@@ -1201,6 +1231,15 @@ int ia32_compare_asm_attr(ir_node *a, ir_node *b)
        return 0;
 }
 
+/**
+ * Hash function for Immediates
+ */
+static unsigned ia32_hash_Immediate(const ir_node *irn) {
+       const ia32_immediate_attr_t *a = get_ia32_immediate_attr_const(irn);
+
+       return HASH_PTR(a->symconst) + (a->sc_sign << 16) + a->offset;
+}
+
 /** Compare node attributes for Immediates. */
 static
 int ia32_compare_immediate_attr(ir_node *a, ir_node *b)