Pattern rule for testbenches added

5 files changed, 10 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 5d9984a..7c89a3f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ C_HEADERS=global.h asm_vars.h
 C_FILES=loader.c bankswap.c video.c misc.c debug.c
 S_FILES=loader.s bankswap.s video.s misc.s debug.s
 O_FILES=loader.o bankswap.o video.o misc.o debug.o main.o
-MADE_FILES=testbenches/zexdoc.h testbenches/mine.h
-MADE_BINS=testbenches/zexdoc.bin testbenches/mine.bin
+MADE_FILES=testbenches/mine.testbench.h testbenches/zexdoc.testbench.h testbenches/zexall.testbench.h
+MADE_BINS=testbenches/mine.testbench.bin testbenches/zexdoc.testbench.bin testbenches/zexall.testbench.bin
 OBJ=z680k.89z
 
 TIGCCFLAGS=-Wall -WA,-lz680k.listing
@@ -27,19 +27,11 @@ packager: packager.c
 %.asm: %.asm.m4
 	m4 $(M4_ASM_INCLUDES) $< > $@
 
-testbenches/zexdoc.h:	testbenches/zexdoc.bin
-	echo 'char zexdoc[] = {' > testbenches/zexdoc.h
-	hexdump -v -e '12/1 "0x%02x, "' -e '"\n"' testbenches/zexdoc.bin | sed -e 's/0x *,//g' >> testbenches/zexdoc.h
-	echo '};' >> testbenches/zexdoc.h
+%.testbench.h:	%.testbench.bin
+	echo 'char testbench[] = {' > $(*D)/$(*F).testbench.h
+	hexdump -v -e '12/1 "0x%02x, "' -e '"\n"' $(*D)/$(*F).testbench.bin | sed -e 's/0x *,//g' >> $(*D)/$(*F).testbench.h
+	echo '};' >> $(*D)/$(*F).testbench.h
 
-testbenches/zexdoc.bin:	testbenches/zexdoc.z80
-	spasm testbenches/zexdoc.z80
+%.testbench.bin:	%.testbench.z80
+	spasm $(*D)/$(*F).testbench.z80
 
-
-testbenches/mine.h:	testbenches/mine.bin
-	echo 'char zexdoc[] = {' > testbenches/mine.h
-	hexdump -v -e '12/1 "0x%02x, "' -e '"\n"' testbenches/mine.bin | sed -e 's/0x *,//g' >> testbenches/mine.h
-	echo '};' >> testbenches/mine.h
-
-testbenches/mine.bin:	testbenches/mine.z80
-	spasm testbenches/mine.z80
diff --git a/loader.c b/loader.c
index 5adccbf..fed676a 100644
--- a/loader.c
+++ b/loader.c
@@ -19,7 +19,7 @@ char writestr[16] = { 0x3E, 0x41,	// LD A,'A'
 		      0xC3, 0x40, 0x00	// JP 4000h
 };
 
-#include "testbenches/mine.h"
+#include "testbenches/mine.testbench.h"
 
 void init_load(void);
 void unload(void);
@@ -66,7 +66,7 @@ void init_load(void)
 	mem_page_0 = pages[0];
 	mem_page_loc_0 = 0;
 //	mem_page_1 = pages[0x1f];
-	mem_page_1 = zexdoc;
+	mem_page_1 = testbench;
 	mem_page_loc_1 = 0x1f;
 	mem_page_2 = pages[0];
 	mem_page_loc_2 = 0;
diff --git a/testbenches/mine.z80 b/testbenches/mine.testbench.z80
index 57c6998..57c6998 100644
--- a/testbenches/mine.z80
+++ b/testbenches/mine.testbench.z80
diff --git a/testbenches/zexall.z80 b/testbenches/zexall.testbench.z80
index 586f9ef..586f9ef 100644
--- a/testbenches/zexall.z80
+++ b/testbenches/zexall.testbench.z80
diff --git a/testbenches/zexdoc.z80 b/testbenches/zexdoc.testbench.z80
index eda26dd..eda26dd 100644
--- a/testbenches/zexdoc.z80
+++ b/testbenches/zexdoc.testbench.z80