Handle new ia32_isa_t type

[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 8bc1471..294c5d3 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -9,9 +9,11 @@
 #include "config.h"
 #endif
 
-#ifdef _WIN32
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
-#else
+#endif
+
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
@@ -34,16 +36,6 @@
 #include "ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
 
-#ifdef obstack_chunk_alloc
-# undef obstack_chunk_alloc
-# define obstack_chunk_alloc xmalloc
-#else
-# define obstack_chunk_alloc xmalloc
-# define obstack_chunk_free free
-#endif
-
-extern int obstack_printf(struct obstack *obst, char *fmt, ...);
-
 /**
  * Returns the ident of a SymConst.
  * @param symc  The SymConst
@@ -184,8 +176,8 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) {
                        break;
 
                case dump_node_nodeattr_txt:
-                       if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
-                               char       *pref = is_ia32_ImmSymConst(n) ? "SymC" : "";
+                       if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n) || is_ia32_Cnst(n)) {
+                               char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC" : "";
                                const char *cnst = get_ia32_cnst(n);
 
                                fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
@@ -1240,6 +1232,15 @@ int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) {
        return !equ;
 }
 
+/* compare converts */
+int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
+       int equ = ! ia32_compare_immop_attr(a, b);
+
+       equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ;
+
+       return !equ;
+}
+
 /* copies the ia32 attributes */
 static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
        ia32_attr_t    *attr_old = get_ia32_attr(old_node);
@@ -1266,9 +1267,5 @@ void ia32_register_copy_attr_func(void) {
        }
 }
 
-static void ia32_register_additional_opcodes(int n) {
-       /* we don't need any additional opcodes */
-}
-
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"