From 2653826dffbbcbc1a06e05ce9f950010dd9435f6 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 30 Apr 2019 13:52:14 -0400
Subject: [PATCH] zasm: move zasm.asm to instr.asm and create main.asm

instr.asm is for single instruction assembly.
---
 apps/zasm/emul/Makefile           |  2 +-
 apps/zasm/{zasm.asm => instr.asm} | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 rename apps/zasm/{zasm.asm => instr.asm} (99%)

diff --git a/apps/zasm/emul/Makefile b/apps/zasm/emul/Makefile
index b1145d2..171d023 100644
--- a/apps/zasm/emul/Makefile
+++ b/apps/zasm/emul/Makefile
@@ -8,5 +8,5 @@ libz80/libz80.o: libz80/z80.c
 kernel.h: glue.asm
 	scas -o - -I ../../../parts/z80 $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
 
-zasm.h: ../zasm.asm ../tok.asm
+zasm.h: ../main.asm ../instr.asm ../tok.asm
 	scas -o - -I.. $< | ./bin2c.sh ZASM | tee $@ > /dev/null
diff --git a/apps/zasm/zasm.asm b/apps/zasm/instr.asm
similarity index 99%
rename from apps/zasm/zasm.asm
rename to apps/zasm/instr.asm
index 0a7089c..db8033d 100644
--- a/apps/zasm/zasm.asm
+++ b/apps/zasm/instr.asm
@@ -1,5 +1,3 @@
-#include "user.inc"
-
 ; *** Consts ***
 ; Number of rows in the argspec table
 ARGSPEC_TBL_CNT		.equ	31
@@ -8,18 +6,6 @@ INSTR_TBL_CNT		.equ	135
 ; size in bytes of each row in the primary instructions table
 INSTR_TBL_ROWSIZE	.equ	9
 
-; *** Code ***
-.org	USER_CODE
-
-call	parseLine
-ld	b, 0
-ld	c, a	; written bytes
-ld	hl, curUpcode
-call	copy
-ret
-
-#include "tok.asm"
-
 ; run RLA the number of times specified in B
 rlaX:
 	; first, see if B == 0 to see if we need to bail out