X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_nodes_attr.h;h=6e7a5025e1eb34f11680a11411c5eccbfc2195fb;hb=0010f7194f0b4a77d4fc18c55ae15e97617ee301;hp=96c9e979819024d3cdcee05c669f3557e7f74c85;hpb=691de77e1607bb2e860338389466a0f9b7b90b16;p=libfirm

diff --git a/ir/be/ia32/ia32_nodes_attr.h b/ir/be/ia32/ia32_nodes_attr.h
index 96c9e9798..6e7a5025e 100644
--- a/ir/be/ia32/ia32_nodes_attr.h
+++ b/ir/be/ia32/ia32_nodes_attr.h
@@ -1,12 +1,14 @@
 #ifndef _IA32_NODES_ATTR_H_
 #define _IA32_NODES_ATTR_H_
 
+#include "firm_config.h"
+
 #include <obstack.h>
 
 #include "firm_types.h"
 #include "../bearch.h"
 
-typedef enum { flavour_Div = 1, flavour_Mod, flavour_DivMod, flavour_Mul, flavour_Mulh } ia32_op_flavour_t;
+typedef enum { flavour_Div = 1, flavour_Mod, flavour_DivMod } ia32_op_flavour_t;
 typedef enum { pn_EAX, pn_EDX } pn_ia32_Register;
 typedef enum { ia32_Normal, ia32_Const, ia32_SymConst, ia32_AddrModeD, ia32_AddrModeS } ia32_op_type_t;
 typedef	enum {
@@ -23,36 +25,75 @@ typedef	enum {
  * I - Index is set
  * S - Scale is set
  */
+
+enum {
+	ia32_O = (1 << 0),
+	ia32_B = (1 << 1),
+	ia32_I = (1 << 2),
+	ia32_S = (1 << 3)
+};
+
 typedef enum {
-	ia32_am_N = 0, ia32_am_O, ia32_am_B, ia32_am_I, ia32_am_IS, ia32_am_OB, ia32_am_OI, ia32_am_OIS, ia32_am_OBIS
+	ia32_am_N    = 0,
+	ia32_am_O    = ia32_O,
+	ia32_am_B    = ia32_B,
+	ia32_am_I    = ia32_I,
+	ia32_am_IS   = ia32_I | ia32_S,
+	ia32_am_BI   = ia32_B | ia32_I,
+	ia32_am_OB   = ia32_O | ia32_B,
+	ia32_am_OI   = ia32_O | ia32_I,
+	ia32_am_OIS  = ia32_O | ia32_I | ia32_S,
+	ia32_am_OBIS = ia32_O | ia32_B | ia32_I | ia32_S
 } ia32_am_flavour_t;
 
 typedef struct _ia32_register_req_t {
 	const arch_register_req_t req;
-	int pos;   /**<< in case of "should be same/different" we need to remember the pos to get the irn */
+	int same_pos;        /**< in case of "should be same" we need to remember the pos to get the irn */
+	int different_pos;   /**< in case of "should be different" we need to remember the pos to get the irn */
 } ia32_register_req_t;
 
 typedef struct _ia32_attr_t {
-	ia32_op_type_t    tp;           /**<< ia32 node type */
-	ia32_am_type_t    am_support;   /**<< indicates addrmode type supported by this node */
-	ia32_am_flavour_t am_flavour;   /**<< the concrete addrmode characteristics */
+	struct {
+		unsigned tp:3;              /**< ia32 node type */
+
+		unsigned am_support:2;      /**< indicates addrmode type supported by this node */
+		unsigned am_flavour:4;      /**< the concrete addrmode characteristics */
+		unsigned am_scale:2;        /**< addrmode scale for index register */
+
+		unsigned offs_sign:1;       /**< sign bit of the first offset */
+
+		unsigned use_frame:1;       /**< indicates whether the operation uses the frame pointer or not */
+
+		unsigned op_flav:2;         /**< flavour of an op (flavour_Div/Mod/DivMod) */
+
+		unsigned flags:4;           /**< indicating if spillable and/or rematerializeable */
+
+		unsigned is_commutative:1;  /**< indicates whether op is commutative or not */
+
+		unsigned n_res:10;          /**< number of results produced by this node */
+	} data;
+
+	struct obstack *am_offs;    /**< offsets for AddrMode */
+
+	tarval *tv;   /**< tarval for immediate operations */
+	char   *sc;   /**< symconst name */
+	char   *cnst; /**< points to the string representation of the constant value (either tv or sc) */
+
+	ir_mode *ls_mode;  /**< the mode of the stored/loaded value */
+	ir_mode *res_mode; /**< the mode of the result */
 
-	struct obstack *am_offs;  /**<< offsets for AddrMode */
-	int             am_scale; /**<< addrmode scale for index register */
+	entity *frame_ent; /**< the frame entity attached to this node */
 
-	tarval *tv;   /**<< tarval for immediate operations */
-	char   *sc;   /**<< symconst name */
-	char   *cnst; /**<< points to the string representation of the constant value (either tv or sc) */
+	long pn_code;      /**< projnum "types" (e.g. indicate compare operators and argument numbers) */
 
-	ia32_op_flavour_t op_flav;   /**<< flavour of an op (flavour_Div/Mod/DivMod/Mul/Mulh) */
-	long              pn_code;   /**<< projnum "types" (e.g. indicate compare operators and argument numbers) */
-	long              n_res;     /**<< number of results */
-	arch_irn_flags_t  flags;     /**<< indicating if spillable and/or rematerializeable */
+#ifndef NDEBUG
+	const char *orig_node;      /**< holds the name of the original ir node for debugging purposes */
+#endif /* NDEBUG */
 
-	const ia32_register_req_t **in_req;  /**<< register requirements for arguments */
-	const ia32_register_req_t **out_req; /**<< register requirements for results */
+	const ia32_register_req_t **in_req;  /**< register requirements for arguments */
+	const ia32_register_req_t **out_req; /**< register requirements for results */
 
-	const arch_register_t **slots;          /**<< register slots for assigned registers */
+	const arch_register_t **slots;       /**< register slots for assigned registers */
 } ia32_attr_t;
 
 #endif /* _IA32_NODES_ATTR_H_ */