From: Christian Würdig <chriswue@ipd.info.uni-karlsruhe.de>
Date: Wed, 30 May 2007 17:00:01 +0000 (+0000)
Subject: changed attribute name from asm to assem as asm is a reserved keyword an GCC does... 
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=a9c0fd51347b4b1aff689b476ad91824e494be54;p=libfirm

changed attribute name from asm to assem as asm is a reserved keyword an GCC does not like it as attribute name

[r14197]
---

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index af614d0a2..8f98b892b 100644
--- 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 99a09a4bc..b2ac8b593 100644
--- 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 7511ee7bb..74f5290c5 100644
--- 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) {