From: ian <ian>
Date: Fri, 30 Dec 2005 17:57:17 +0000 (+0000)
Subject: avoid clashes between macro args and real variables (!)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=58b50fd723d236a3f2c48f239d29744a201eeffc;p=trains.git

avoid clashes between macro args and real variables (!)
---

diff --git a/iwjpictest/insn-aliases.inc-gen b/iwjpictest/insn-aliases.inc-gen
index d362091..9a3e290 100755
--- a/iwjpictest/insn-aliases.inc-gen
+++ b/iwjpictest/insn-aliases.inc-gen
@@ -64,14 +64,20 @@ desc () {
 			"$new" "$fan" "$ds" "$use"
 	fi
 }
+mapargs () {
+	local str=$1
+	printf "%s\n" "$str" \
+	| sed -e 's/\b[a-z]\b/insn_aliases_arg_&/g'
+}
+
 alias_r () {
 	local use=$1 new=$2 actargs=$3 formargs=$4
+	
 	if $macros; then
-		cat <<END
-$new	macro	$formargs
+		mapargs	\
+"$new	macro	$formargs
 	$use	$actargs
-	endm
-END
+	endm"
 	fi
 }
 alias_f () {
diff --git a/iwjpictest/to-insn-aliases b/iwjpictest/to-insn-aliases
index e579c3d..dff1548 100755
--- a/iwjpictest/to-insn-aliases
+++ b/iwjpictest/to-insn-aliases
@@ -145,6 +145,7 @@ sub readaliases ($) {
     my ($formarglets) = 'inkfgb';
     while (<$f>) {
 	s/0xfe8/W/;
+	s/\binsn_aliases_arg_([a-z])\b/$1/g;
 	if (m/^\s*\;/) {
 	} elsif (m/^(\w+)\s+macro(?:\s+([$formarglets,]+))?\s*$/o) {
 	    die if defined $inmacro;