rework ASM node, it always has a memory input now

[libfirm] / ir / be / ia32 / ia32_nodes_attr.h

diff --git a/ir/be/ia32/ia32_nodes_attr.h b/ir/be/ia32/ia32_nodes_attr.h
index 4b4eb66..71dd0e1 100644 (file)
--- a/ir/be/ia32/ia32_nodes_attr.h
+++ b/ir/be/ia32/ia32_nodes_attr.h
@@ -21,14 +21,12 @@
  * @file
  * @brief       Type definitions for ia32 node attributes.
  * @author      Christian Wuerdig
- * @version     $Id$
  */
 #ifndef FIRM_BE_IA32_IA32_NODES_ATTR_H
 #define FIRM_BE_IA32_IA32_NODES_ATTR_H
 
 #include "firm_types.h"
-#include "../bearch.h"
-#include "../bemachine.h"
+#include "bearch.h"
 #include "irnode_t.h"
 
 /** ia32 condition codes (the numbers correspond to the real encoding order) */
@@ -145,7 +143,7 @@ ENUM_BITSET(match_flags_t)
 
 typedef struct ia32_op_attr_t ia32_op_attr_t;
 struct ia32_op_attr_t {
-       match_flags_t  flags;
+       //match_flags_t  flags;
        unsigned       latency;
 };
 
@@ -201,8 +199,6 @@ struct ia32_attr_t {
 
        ir_entity *frame_ent; /**< the frame entity attached to this node */
 
-       const be_execution_unit_t ***exec_units; /**< list of units this operation can be executed on */
-
        ir_label_t        exc_label;       /**< the exception label iff this instruction can throw an exception */
 
 #ifndef NDEBUG
@@ -235,9 +231,9 @@ struct ia32_condcode_attr_t {
  */
 typedef struct ia32_switch_attr_t ia32_switch_attr_t;
 struct ia32_switch_attr_t {
-       ia32_attr_t  attr;        /**< generic attribute */
-       long         default_pn;
-       ir_entity   *jump_table;
+       ia32_attr_t            attr;        /**< generic attribute */
+       const ir_switch_table *table;
+       ir_entity             *jump_table;
 };
 
 /**