X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_nodes_attr.h;h=4d5646955ae1a4193d3a023a1112ed3e356e0de7;hb=fa4ec191e159484f0fcbea2ef044deaa2ab2d293;hp=f557f06d3d67662c4829c38e33d95e704a5128bc;hpb=b0c542989cfbeab0b39bc96c5f6e9120c1325a9c;p=libfirm

diff --git a/ir/be/ia32/ia32_nodes_attr.h b/ir/be/ia32/ia32_nodes_attr.h
index f557f06d3..4d5646955 100644
--- a/ir/be/ia32/ia32_nodes_attr.h
+++ b/ir/be/ia32/ia32_nodes_attr.h
@@ -1,6 +1,8 @@
 #ifndef _IA32_NODES_ATTR_H_
 #define _IA32_NODES_ATTR_H_
 
+#include "firm_config.h"
+
 #include <obstack.h>
 
 #include "firm_types.h"
@@ -8,7 +10,21 @@
 
 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 {
+	ia32_Normal,
+	ia32_Const,
+	ia32_SymConst,
+	ia32_AddrModeD,
+	ia32_AddrModeS
+} ia32_op_type_t;
+
+typedef enum {
+	ia32_ImmNone,
+	ia32_ImmConst,
+	ia32_ImmSymConst
+} ia32_immop_type_t;
+
 typedef	enum {
 	ia32_am_None   = 0,   /**<< no addrmode support */
 	ia32_am_Dest   = 1,   /**<< addrmode for destination only */
@@ -37,6 +53,7 @@ typedef enum {
 	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,
@@ -45,36 +62,63 @@ typedef enum {
 
 typedef struct _ia32_register_req_t {
 	const arch_register_req_t req;
-	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 */
+	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 imm_tp:2;          /**< ia32 immop 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 am_sc_sign:1;      /**< sign bit of the address mode symconst */
+
+		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 emit_cl:1;         /**< indicates whether we must emit cl instead of ecx (needed for shifts) */
+
+		unsigned n_res:8;           /**< number of results produced by this node */
+	} data;
+
+	struct obstack *am_offs;    /**< offsets for AddrMode */
+	ident          *am_sc;      /**< SymConst for AddrMode */
+
+	union {
+		tarval *tv;     /**< tarval for immediate operations */
+		ident  *sc;     /**< the symconst ident */
+	} cnst_val;
 
-	struct obstack *am_offs;    /**<< offsets for AddrMode */
-	char            offs_sign;  /**<< the sign of the first offset */
-	int             am_scale;   /**<< addrmode scale for index register */
+	ident *cnst;        /**< points to the string representation of the constant value (either tv or sc) */
 
-	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 */
+	ir_mode *src_mode;  /**< source mode for conversion */
+	ir_mode *tgt_mode;  /**< target mode for conversion */
 
-	char use_frame;    /**<< indicates whether the operation uses the frame pointer or not */
+	entity *frame_ent;  /**< the frame entity attached to this node */
 
-	ir_mode *ls_mode;  /**<< the mode of the stored/loaded value */
+	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 */
+	const arch_register_t *x87[3];       /**< register slots for x87 register */
 } ia32_attr_t;
 
 #endif /* _IA32_NODES_ATTR_H_ */