made code C89 compliant (changed unnamed union in attributes)

[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 acfe063..e158fa8 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -185,9 +185,10 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) {
 
                case dump_node_nodeattr_txt:
                        if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
-                               char *pref = is_ia32_ImmSymConst(n) ? "SymC" : "";
+                               char       *pref = is_ia32_ImmSymConst(n) ? "SymC" : "";
+                               const char *cnst = get_ia32_cnst(n);
 
-                               fprintf(F, "[%s%s]", pref, get_ia32_cnst(n));
+                               fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
                        }
 
                        if (! is_ia32_Lea(n)) {
@@ -483,6 +484,7 @@ char *get_ia32_am_offs(const ir_node *node) {
                memcpy(&res[1], obstack_base(attr->am_offs), size);
                res[size + 1] = '\0';
        }
+
        return res;
 }
 
@@ -535,6 +537,46 @@ void sub_ia32_am_offs(ir_node *node, const char *offset) {
        extend_ia32_am_offs(node, (char *)offset, '-');
 }
 
+/**
+ * Returns the symconst ident associated to addrmode.
+ */
+ident *get_ia32_am_sc(const ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       return attr->am_sc;
+}
+
+/**
+ * Sets the symconst ident associated to addrmode.
+ */
+void set_ia32_am_sc(ir_node *node, ident *sc) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       attr->am_sc       = sc;
+}
+
+/**
+ * Sets the sign bit for address mode symconst.
+ */
+void set_ia32_am_sc_sign(ir_node *node) {
+       ia32_attr_t *attr     = get_ia32_attr(node);
+       attr->data.am_sc_sign = 1;
+}
+
+/**
+ * Clears the sign bit for address mode symconst.
+ */
+void clear_ia32_am_sc_sign(ir_node *node) {
+       ia32_attr_t *attr     = get_ia32_attr(node);
+       attr->data.am_sc_sign = 0;
+}
+
+/**
+ * Returns the sign bit for address mode symconst.
+ */
+int is_ia32_am_sc_sign(const ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       return attr->data.am_sc_sign;
+}
+
 /**
  * Gets the addr mode const.
  */
@@ -590,6 +632,8 @@ void set_ia32_sc(ir_node *node, ident *sc) {
  */
 const char *get_ia32_cnst(const ir_node *node) {
        ia32_attr_t *attr = get_ia32_attr(node);
+       if (! attr->cnst)
+               return NULL;
        return get_id_str(attr->cnst);
 }
 
@@ -665,6 +709,30 @@ int is_ia32_commutative(const ir_node *node) {
        return attr->data.is_commutative;
 }
 
+/**
+ * Sets node emit_cl.
+ */
+void set_ia32_emit_cl(ir_node *node) {
+       ia32_attr_t *attr  = get_ia32_attr(node);
+       attr->data.emit_cl = 1;
+}
+
+/**
+ * Clears node emit_cl.
+ */
+void clear_ia32_emit_cl(ir_node *node) {
+       ia32_attr_t *attr  = get_ia32_attr(node);
+       attr->data.emit_cl = 0;
+}
+
+/**
+ * Checks if node is commutative.
+ */
+int is_ia32_emit_cl(const ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       return attr->data.emit_cl;
+}
+
 /**
  * Gets the mode of the stored/loaded value (only set for Store/Load)
  */
@@ -1030,14 +1098,14 @@ int is_ia32_AddrModeD(const ir_node *node) {
  * Checks if node is a Load or fLoad/vfLoad.
  */
 int is_ia32_Ld(const ir_node *node) {
-       return is_ia32_Load(node) || is_ia32_fLoad(node) || is_ia32_vfld(node);
+       return is_ia32_Load(node) || is_ia32_fLoad(node) || is_ia32_vfld(node) || is_ia32_fld(node);
 }
 
 /**
  * Checks if node is a Store or fStore/vfStore.
  */
 int is_ia32_St(const ir_node *node) {
-       return is_ia32_Store(node) || is_ia32_fStore(node) || is_ia32_vfst(node);
+       return is_ia32_Store(node) || is_ia32_fStore(node) || is_ia32_vfst(node) || is_ia32_fst(node) || is_ia32_fstp(node);
 }
 
 /**
@@ -1093,7 +1161,7 @@ void alloc_ia32_reg_slots(ir_node *node, int num) {
        ia32_attr_t *attr = get_ia32_attr(node);
 
        if (num) {
-               attr->slots = NEW_ARR_D(arch_register_t *, get_irg_obstack(get_irn_irg(node)), num);
+               attr->slots = (const arch_register_t **)NEW_ARR_D(arch_register_t*, get_irg_obstack(get_irn_irg(node)), num);
                memset(attr->slots, 0, sizeof(attr->slots[0]) * num);
        }
        else {
@@ -1144,7 +1212,7 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
        memcpy(attr_new, attr_old, sizeof(*attr_new));
 
        /* copy the register slots */
-       attr_new->slots = NEW_ARR_D(arch_register_t *, get_irg_obstack(get_irn_irg(new_node)), n_res);
+       attr_new->slots = (const arch_register_t **)NEW_ARR_D(arch_register_t*, get_irg_obstack(get_irn_irg(new_node)), n_res);
        memcpy((void *)attr_new->slots, (void *)attr_old->slots, sizeof(attr_new->slots[0]) * n_res);
 }