Fixed two typos resulting in uninitialised variable access

[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 b40413b..996a3cb 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;
@@ -44,8 +45,7 @@ typedef enum {
 typedef enum {
        ia32_ImmNone     = 0,
        ia32_ImmConst    = 1,
-       ia32_ImmSymConst = 2,
-       ia32_ImmAsm      = 3
+       ia32_ImmSymConst = 2
 } ia32_immop_type_t;
 
 typedef        enum {
@@ -88,14 +88,17 @@ 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_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 {
+       except_attr  exc;               /**< the exception attribute. MUST be the first one. */
        struct {
                unsigned tp:3;              /**< ia32 node type. */
                unsigned imm_tp:2;          /**< ia32 immop type. */
@@ -128,7 +131,6 @@ struct ia32_attr_t {
        union {
                tarval    *tv;        /**< tarval for immediate operations */
                ir_entity *sc;        /**< the symconst ident */
-               ident     *asm_text;  /**< used by asm node */
        } cnst_val;
 
        ir_mode *ls_mode;     /**< Load/Store mode: This is the mode of the value
@@ -153,17 +155,32 @@ struct ia32_attr_t {
        const arch_register_t **slots;     /**< register slots for assigned registers */
 };
 
+typedef struct ia32_immediate_attr_t ia32_immediate_attr_t;
+struct ia32_immediate_attr_t {
+       ia32_attr_t  attr;
+       ir_entity   *symconst;
+       tarval      *offset;
+};
+
 typedef struct ia32_x87_attr_t ia32_x87_attr_t;
 struct ia32_x87_attr_t {
-       ia32_attr_t  attr;
+       ia32_attr_t            attr;
        const arch_register_t *x87[3];    /**< register slots for x87 register */
 };
 
+typedef struct ia32_asm_attr_t ia32_asm_attr_t;
+struct ia32_asm_attr_t {
+       ia32_x87_attr_t  x87_attr;
+       ident           *asm_text;
+};
+
 /* 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_attr_t            attr;
+       ia32_x87_attr_t        x87_attr;
+       ia32_asm_attr_t        asm_attr;
+       ia32_immediate_attr_t  immediate_attr;
 };
 
 #ifndef NDEBUG