From: Matthias Braun <matze@braunis.de>
Date: Wed, 27 Jul 2011 10:53:10 +0000 (+0200)
Subject: avoid generic names like flags in generator
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=1350645390c1ab5f39ab987d9c3dfb2b031e56ec;p=libfirm

avoid generic names like flags in generator
---

diff --git a/ir/be/amd64/amd64_spec.pl b/ir/be/amd64/amd64_spec.pl
index 6a90fed70..107f0385f 100644
--- a/ir/be/amd64/amd64_spec.pl
+++ b/ir/be/amd64/amd64_spec.pl
@@ -143,12 +143,12 @@ $default_copy_attr = "amd64_copy_attr";
 
 %init_attr = (
 	amd64_attr_t           =>
-		 "\tinit_amd64_attributes(res, flags, in_reqs, exec_units, n_res);",
+		 "\tinit_amd64_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
 	amd64_SymConst_attr_t =>
-		"\tinit_amd64_attributes(res, flags, in_reqs, exec_units, n_res);"
+		"\tinit_amd64_attributes(res, irn_flags_, in_reqs, exec_units, n_res);"
 		. "\tinit_amd64_SymConst_attributes(res, entity);",
 	amd64_condcode_attr_t =>
-		"\tinit_amd64_attributes(res, flags, in_reqs, exec_units, n_res);"
+		"\tinit_amd64_attributes(res, irn_flags_, in_reqs, exec_units, n_res);"
 		. "\tinit_amd64_condcode_attributes(res, pnc);",
 );
 
diff --git a/ir/be/arm/arm_spec.pl b/ir/be/arm/arm_spec.pl
index a1155c762..2dc736870 100644
--- a/ir/be/arm/arm_spec.pl
+++ b/ir/be/arm/arm_spec.pl
@@ -72,25 +72,25 @@ $default_attr_type = "arm_attr_t";
 $default_copy_attr = "arm_copy_attr";
 
 %init_attr = (
-	arm_attr_t           => "\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);",
+	arm_attr_t           => "\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
 	arm_SymConst_attr_t  =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_arm_SymConst_attributes(res, entity, symconst_offset);",
-	arm_CondJmp_attr_t   => "\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);",
-	arm_SwitchJmp_attr_t => "\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);",
-	arm_fConst_attr_t    => "\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);",
+	arm_CondJmp_attr_t   => "\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
+	arm_SwitchJmp_attr_t => "\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
+	arm_fConst_attr_t    => "\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
 	arm_load_store_attr_t =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_arm_load_store_attributes(res, ls_mode, entity, entity_sign, offset, is_frame_entity);",
 	arm_shifter_operand_t =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n",
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n",
 	arm_cmp_attr_t =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n",
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n",
 	arm_farith_attr_t =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_arm_farith_attributes(res, op_mode);",
 	arm_CopyB_attr_t =>
-		"\tinit_arm_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_arm_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_arm_CopyB_attributes(res, size);",
 );
 
diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index bc39460ea..0814f6ceb 100644
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -165,31 +165,31 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 
 %init_attr = (
 	ia32_asm_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_x87_attributes(res);".
 		"\tinit_ia32_asm_attributes(res);",
 	ia32_attr_t     =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);",
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
 	ia32_call_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_call_attributes(res, pop, call_tp);",
 	ia32_condcode_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_condcode_attributes(res, condition_code);",
 	ia32_switch_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_switch_attributes(res, default_pn);",
 	ia32_copyb_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_copyb_attributes(res, size);",
 	ia32_immediate_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_immediate_attributes(res, symconst, symconst_sign, no_pic_adjust, offset);",
 	ia32_x87_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_x87_attributes(res);",
 	ia32_climbframe_attr_t =>
-		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_climbframe_attributes(res, count);",
 );
 
diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 88b1d5199..08ce0c977 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -70,7 +70,7 @@ if(!defined($default_attr_type)) {
 }
 if(!defined(%init_attr)) {
 	%init_attr = (
-		"$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, exec_units, n_res);",
+		"$default_attr_type" => "\tinit_${arch}_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
 	);
 }
 if(!defined($default_cmp_attr)) {
@@ -270,9 +270,9 @@ sub create_constructor {
 
 	# emit constructor code
 	$temp = <<EOF;
-	ir_graph         *irg     = get_irn_irg(block);
-	ir_op            *op      = op_${arch}_${op};
-	arch_irn_flags_t  flags   = arch_irn_flags_none;
+	ir_graph         *irg        = get_irn_irg(block);
+	ir_op            *op         = op_${arch}_${op};
+	arch_irn_flags_t  irn_flags_ = arch_irn_flags_none;
 	ir_node          *res;
 	backend_info_t   *info;
 EOF
@@ -426,14 +426,14 @@ EOF
 			if (not defined($known_irn_flags{$flag})) {
 				print STDERR "WARNING: irn_flag '$flag' in opcode $op is unknown\n";
 			} else {
-				$temp .= "\tflags |= " . $known_irn_flags{$flag} . ";\n";
+				$temp .= "\tirn_flags_ |= " . $known_irn_flags{$flag} . ";\n";
 			}
 		}
 		$temp .= "\n";
 	}
 
 	# lookup init function
-	my $attr_init_code = "(void)in;(void)exec_units;(void)flags;(void)in_reqs;(void)n_res;";
+	my $attr_init_code = "(void)in;(void)exec_units;(void)irn_flags_;(void)in_reqs;(void)n_res;";
 	if ($attr_type ne "") {
 		$attr_init_code = $init_attr{$attr_type};
 		if(!defined($attr_init_code)) {
diff --git a/ir/be/sparc/sparc_spec.pl b/ir/be/sparc/sparc_spec.pl
index 697554be4..4ffb80e34 100644
--- a/ir/be/sparc/sparc_spec.pl
+++ b/ir/be/sparc/sparc_spec.pl
@@ -123,14 +123,14 @@ $default_copy_attr = "sparc_copy_attr";
 
 
 %init_attr = (
-	sparc_attr_t             => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);",
-	sparc_load_store_attr_t  => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);",
-	sparc_jmp_cond_attr_t    => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);",
-	sparc_switch_jmp_attr_t  => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+	sparc_attr_t             => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
+	sparc_load_store_attr_t  => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
+	sparc_jmp_cond_attr_t    => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);",
+	sparc_switch_jmp_attr_t  => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 	                            "\tinit_sparc_switch_jmp_attributes(res, default_pn, jump_table);\n",
-	sparc_fp_attr_t          => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+	sparc_fp_attr_t          => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);\n".
 	                            "\tinit_sparc_fp_attributes(res, fp_mode);\n",
-	sparc_fp_conv_attr_t     => "\tinit_sparc_attributes(res, flags, in_reqs, exec_units, n_res);".
+	sparc_fp_conv_attr_t     => "\tinit_sparc_attributes(res, irn_flags_, in_reqs, exec_units, n_res);".
 	                            "\tinit_sparc_fp_conv_attributes(res, src_mode, dest_mode);\n",
 );