changed attribute name from asm to assem as asm is a reserved keyword an GCC does...

[r14197]

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index af614d0..8f98b89 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -849,7 +849,7 @@ new_bd_ASM(dbg_info *db, ir_node *block, ir_node *store, int arity, ir_node *inp
                in[i + 1] = inputs[i];
 
        res = new_ir_node(db, irg, block, op_ASM, mode_T, arity + 1, in);
-       res->attr.asm.asm_text = asm_text;
+       res->attr.assem.asm_text = asm_text;
 
        res = optimize_node(res);
        IRN_VRFY_IRG(res, irg);

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 99a09a4..b2ac8b5 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -2339,7 +2339,7 @@ void set_Pin_op(ir_node *pin, ir_node *node) {
 /* Return the assembler text of an ASM pseudo node. */
 const char *get_ASM_text(const ir_node *node) {
        assert(node->op == op_ASM);
-       return get_id_str(node->attr.asm.asm_text);
+       return get_id_str(node->attr.assem.asm_text);
 }
 
 

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 7511ee7..74f5290 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -238,7 +238,7 @@ typedef union {
        bound_attr     bound;         /**< For Bound operation */
        conv_attr      conv;          /**< For Conv operation */
        divmod_attr    divmod;        /**< For Div/Mod/DivMod operation */
-       asm_attr       asm;           /**< For ASM operation. */
+       asm_attr       assem;         /**< For ASM operation. */
 } attr;
 
 /**
@@ -445,7 +445,7 @@ _get_irn_intra_n(const ir_node *node, int n) {
 
        int arn = _get_irn_intra_arity(node);
        assert(node);
-       assert(-1 <= n && n < _get_irn_intra_arity(node));
+       assert(-1 <= n && n < arn);
 
        nn = node->in[n + 1];
        if (nn == NULL) {