commit 04f8d58b78d89cea7ebb50508a5cab16c6209f78 parent d9e4e31e2919820479baa822e9a7dd2d6ce3b43d Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Sun, 22 Sep 2019 13:44:46 +0200 [as] Rename $family.dat to ops.dat There is not point to have a different name in every arch when all of them can use the same name for the files. Diffstat:
14 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/cmd/as/mktbl b/src/cmd/as/mktbl @@ -28,7 +28,7 @@ echo cpu=${cpu:=z80} family=${family:=x80} rm -f $$.c target/$family/${cpu}tbl.c trap "rm -f $$.c" 0 2 3 -awk '!/^$/ {print $1,NR,$2,$3,$4,$5,$6}' target/$family/$family.dat | +awk '!/^$/ {print $1,NR,$2,$3,$4,$5,$6}' target/$family/ops.dat | sort -k1 -k2n | awk -v cpu=`echo $cpu | tr a-z A-Z` -v family=$family -f mktbl.awk > $$.c && mv $$.c target/$family/${cpu}tbl.c diff --git a/src/cmd/as/mktbl.awk b/src/cmd/as/mktbl.awk @@ -4,7 +4,7 @@ BEGIN { "#include \"../../as.h\"\n"\ "#include \"../" family "/proc.h\"\n" - rules = "target/" family "/rules.dat" + rules = "target/" family "/opers.dat" while (getline < rules > 0) { regex[++nregs] = $1 value[nregs] = $2 diff --git a/src/cmd/as/target/powerpc/rules.dat b/src/cmd/as/target/powerpc/opers.dat diff --git a/src/cmd/as/target/powerpc/powerpc.dat b/src/cmd/as/target/powerpc/ops.dat diff --git a/src/cmd/as/target/powerpc/powerpc.mk b/src/cmd/as/target/powerpc/powerpc.mk @@ -5,7 +5,7 @@ POWERPC_OBJ =\ $(POWERPC)/powerpc.o\ $(POWERPC)/ins.o\ -$(POWERPC)/powerpctbl.c: $(POWERPC)/powerpc.dat $(POWERPC)/rules.dat +$(POWERPC)/powerpctbl.c: $(POWERPC)/ops.dat $(POWERPC)/opers.dat ./mktbl -f powerpc -c powerpc $(LIBEXEC)/as-powerpc: $(POWERPC_OBJ) diff --git a/src/cmd/as/target/powerpc/powerpc64.mk b/src/cmd/as/target/powerpc/powerpc64.mk @@ -5,7 +5,7 @@ POWERPC64_OBJ =\ $(POWERPC)/powerpc64.o\ $(POWERPC)/ins.o\ -$(POWERPC)/powerpc64tbl.c: $(POWERPC)/powerpc.dat $(POWERPC)/rules.dat +$(POWERPC)/powerpc64tbl.c: $(POWERPC)/ops.dat $(POWERPC)/opers.dat ./mktbl -f powerpc -c powerpc64 $(LIBEXEC)/as-powerpc64: $(POWERPC64_OBJ) diff --git a/src/cmd/as/target/x80/rules.dat b/src/cmd/as/target/x80/opers.dat diff --git a/src/cmd/as/target/x80/x80.dat b/src/cmd/as/target/x80/ops.dat diff --git a/src/cmd/as/target/x80/z80.mk b/src/cmd/as/target/x80/z80.mk @@ -4,7 +4,7 @@ Z80_OBJ =\ target/x80/z80.o\ target/x80/ins.o\ -target/x80/z80tbl.c: target/x80/x80.dat target/x80/rules.dat +target/x80/z80tbl.c: target/x80/ops.dat target/x80/opers.dat ./mktbl -f x80 -c z80 $(LIBEXEC)/as-z80: $(OBJ) $(Z80_OBJ) diff --git a/src/cmd/as/target/x86/amd64.mk b/src/cmd/as/target/x86/amd64.mk @@ -4,7 +4,7 @@ AMD64_OBJ =\ target/x86/amd64.o\ target/x86/ins.o\ -target/x86/amd64tbl.c: target/x86/x86.dat target/x86/rules.dat +target/x86/amd64tbl.c: target/x86/ops.dat target/x86/opers.dat ./mktbl -f x86 -c amd64 $(LIBEXEC)/as-amd64: $(AMD64_OBJ) diff --git a/src/cmd/as/target/x86/i286.mk b/src/cmd/as/target/x86/i286.mk @@ -4,7 +4,7 @@ I286_OBJ =\ target/x86/i286.o\ target/x86/ins.o\ -target/x86/i286tbl.c: target/x86/x86.dat target/x86/rules.dat +target/x86/i286tbl.c: target/x86/ops.dat target/x86/opers.dat ./mktbl -f x86 -c i286 $(LIBEXEC)/as-i286: $(I286_OBJ) diff --git a/src/cmd/as/target/x86/i386.mk b/src/cmd/as/target/x86/i386.mk @@ -4,7 +4,7 @@ I386_OBJ =\ target/x86/i386.o\ target/x86/ins.o\ -target/x86/i386tbl.c: target/x86/x86.dat target/x86/rules.dat +target/x86/i386tbl.c: target/x86/ops.dat target/x86/opers.dat ./mktbl -f x86 -c i386 $(LIBEXEC)/as-i386: $(I386_OBJ) diff --git a/src/cmd/as/target/x86/rules.dat b/src/cmd/as/target/x86/opers.dat diff --git a/src/cmd/as/target/x86/x86.dat b/src/cmd/as/target/x86/ops.dat