fix fehler69

[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 37ad310..a4a2361 100644 (file)
--- a/ir/be/ia32/ia32_nodes_attr.h
+++ b/ir/be/ia32/ia32_nodes_attr.h
@@ -31,6 +31,7 @@
 #include "firm_types.h"
 #include "../bearch_t.h"
 #include "../bemachine.h"
+#include "irnode_t.h"
 
 typedef enum { flavour_Div = 1, flavour_Mod, flavour_DivMod } ia32_op_flavour_t;
 typedef enum { pn_EAX, pn_EDX } pn_ia32_Register;
@@ -51,9 +52,15 @@ typedef      enum {
        ia32_am_None   = 0,   /**<< no addrmode support */
        ia32_am_Dest   = 1,   /**<< addrmode for destination only */
        ia32_am_Source = 2,   /**<< addrmode for source only */
-       ia32_am_Full   = 3    /**<< full addmode support */
+       ia32_am_Full   = 3,   /**<< full addmode support */
 } ia32_am_type_t;
 
+typedef enum {
+       ia32_am_arity_none   = 0,
+       ia32_am_unary  = 1,
+       ia32_am_binary = 2,
+} ia32_am_arity_t;
+
 /**
  * Different Address Mode properties:
  * O - Offset is set
@@ -87,25 +94,28 @@ enum {
 
 #ifndef NDEBUG
 typedef enum {
-       IA32_ATTR_INVALID         = 0,
-       IA32_ATTR_ia32_attr_t     = 1 << 0,
-       IA32_ATTR_ia32_x87_attr_t = 1 << 1,
-       IA32_ATTR_ia32_asm_attr_t = 1 << 2,
+       IA32_ATTR_INVALID               = 0,
+       IA32_ATTR_ia32_attr_t           = 1 << 0,
+       IA32_ATTR_ia32_x87_attr_t       = 1 << 1,
+       IA32_ATTR_ia32_asm_attr_t       = 1 << 2,
+       IA32_ATTR_ia32_immediate_attr_t = 1 << 3,
 } ia32_attr_type_t;
 #endif
 
 typedef struct ia32_attr_t ia32_attr_t;
 struct ia32_attr_t {
-       struct {
+       except_attr  exc;               /**< the exception attribute. MUST be the first one. */
+       struct ia32_attr_data_bitfield {
                unsigned tp:3;              /**< ia32 node type. */
                unsigned imm_tp:2;          /**< ia32 immop type. */
                unsigned am_support:2;      /**< Indicates the address mode type supported by this node. */
+               unsigned am_arity  : 2;
                unsigned am_flavour:4;      /**< The concrete address mode characteristics. */
                unsigned am_scale:2;        /**< The address mode scale for index register. */
                unsigned am_sc_sign:1;      /**< The sign bit of the address mode symconst. */
 
                unsigned use_frame:1;       /**< Indicates whether the operation uses the frame pointer or not. */
-               unsigned except_label:1;    /**< Set if this node needs a label because of posiible exception. */
+               unsigned except_label:1;    /**< Set if this node needs a label because of possible exception. */
 
                ia32_op_flavour_t op_flav:2;/**< Flavour of an op (flavour_Div/Mod/DivMod). */
 
@@ -118,6 +128,8 @@ struct ia32_attr_t {
                unsigned got_lea:1;         /**< Indicates whether or not this node already consumed a LEA. */
 
                unsigned need_stackent:1;   /**< Set to 1 if node need space on stack. */
+               unsigned need_64bit_stackent:1; /**< needs a 64bit stack entity (see double->unsigned int conv) */
+               unsigned need_32bit_stackent:1; /**< needs a 32bit stack entity */
        } data;
 
        int       *out_flags;     /**< flags for each produced value */
@@ -130,8 +142,8 @@ struct ia32_attr_t {
                ir_entity *sc;        /**< the symconst ident */
        } cnst_val;
 
-       ir_mode *ls_mode;     /**< Load/Store mode: This is the mode of the value
-                                  that is manipulated by this node. */
+       ir_mode   *ls_mode;       /**< Load/Store mode: This is the mode of the
+                                      value that is manipulated by this node. */
 
        ir_entity *frame_ent; /**< the frame entity attached to this node */
 
@@ -151,6 +163,14 @@ struct ia32_attr_t {
 
        const arch_register_t **slots;     /**< register slots for assigned registers */
 };
+COMPILETIME_ASSERT(sizeof(struct ia32_attr_data_bitfield) <= 4, attr_bitfield);
+
+typedef struct ia32_immediate_attr_t ia32_immediate_attr_t;
+struct ia32_immediate_attr_t {
+       ia32_attr_t  attr;
+       ir_entity   *symconst;
+       long         offset;
+};
 
 typedef struct ia32_x87_attr_t ia32_x87_attr_t;
 struct ia32_x87_attr_t {
@@ -167,9 +187,10 @@ struct ia32_asm_attr_t {
 /* the following union is necessary to indicate to the compiler that we might want to cast
  * the structs (we use them to simulate OO-inheritance) */
 union allow_casts_attr_t_ {
-       ia32_attr_t      attr;
-       ia32_x87_attr_t  x87_attr;
-       ia32_asm_attr_t  asm_attr;
+       ia32_attr_t            attr;
+       ia32_x87_attr_t        x87_attr;
+       ia32_asm_attr_t        asm_attr;
+       ia32_immediate_attr_t  immediate_attr;
 };
 
 #ifndef NDEBUG