From 54315c12f99d0adbd6899131fa12b74ef537073f Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Fri, 17 Oct 2008 07:49:43 +0000
Subject: [PATCH] cleanup

---
 defines_apple.s    |  5 +++--
 defines_cbm.s      | 12 ++++++------
 defines_kbd.s      | 10 +++++-----
 defines_kim.s      | 10 +++++-----
 defines_microtan.s | 22 +++++++++++-----------
 defines_osi.s      | 11 ++++++-----
 zeropage.s         |  4 ++--
 7 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/defines_apple.s b/defines_apple.s
index e1eeb3c..8c0b936 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -9,8 +9,8 @@ CONFIG_SCRTCH_ORDER := 3
 ; INPUTBUFFER > $0100
 
 ; zero page
-ZP_START1 = $0D
-ZP_START = $3D
+ZP_START = $0D
+ZP_HOLE = $3D
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -26,6 +26,7 @@ POSX            := $0050
 Z17             := $0051
 Z18             := $0052
 LINNUM          := $0053
+
 TXPSV           := $0053
 INPUTBUFFER     := $0200
 INPUTBUFFERX    := $0200
diff --git a/defines_cbm.s b/defines_cbm.s
index 0d6773e..4cde92c 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -29,8 +29,8 @@ CONFIG_PEEK_SAVE_LINNUM := 1
 
 .ifdef CBM1
 ; zero page
-ZP_START1 = $5A
-ZP_START = $00
+ZP_START = $5A
+ZP_HOLE = $00
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -52,8 +52,8 @@ NULL_MAX		:= $0A
 .else
 
 ; zero page
-ZP_START1 = $03
-ZP_START = $05
+ZP_START = $03
+ZP_HOLE = $05
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -64,8 +64,8 @@ GORESTART       := $0000
 Z03				:= $000E
 LINNUM          := $0011
 
-Z96 := $00E8-82
-POSX := $0118-82
+Z96 := $0096
+POSX := $00C6
 TXPSV = LASTOP
 
 INPUTBUFFER     := $0200
diff --git a/defines_kbd.s b/defines_kbd.s
index 4916756..5e90885 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -12,18 +12,16 @@ CONFIG_SCRTCH_ORDER := 3
 CONFIG_SMALL := 1
 ; INPUTBUFFER > $0100
 
-CRLF_1 := LF
-CRLF_2 := CR
-
 ; zero page
-ZP_START1 = $6
-ZP_START = $05
+ZP_START = $6
+ZP_HOLE = $05
 
 
 POSX            := $0010
 Z17             := $06FC
 Z18             := $06FD
 LINNUM          := $0013
+
 TXPSV           := $0049
 INPUTBUFFER     := $0700
 INPUTBUFFERX    := $0700
@@ -40,6 +38,8 @@ L6874			:= $6874
 ; constants
 STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $49
+CRLF_1 := LF
+CRLF_2 := CR
 
 ; memory layout
 RAMSTART2		:= $0300
diff --git a/defines_kim.s b/defines_kim.s
index ad707b1..46bfeb9 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -9,12 +9,9 @@ CONFIG_ROR_WORKAROUND := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
 CONFIG_SCRTCH_ORDER := 2
 
-CRLF_1 := CR
-CRLF_2 := LF
-
 ; zero page
-ZP_START1 = $0A
-ZP_START = $4E
+ZP_START = $0A
+ZP_HOLE = $4E
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -29,6 +26,7 @@ POSX            := $0016
 Z17             := $0017
 Z18             := $0018
 LINNUM          := $0019
+
 TXPSV           := $0019
 INPUTBUFFER     := $001B
 INPUTBUFFERX    := $0000
@@ -45,4 +43,6 @@ MONCOUT         := $1EA0
 STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $36
 NULL_MAX		:= $F2 ; probably different in original version; the image I have seems to be modified; see PDF
+CRLF_1 := CR
+CRLF_2 := LF
 
diff --git a/defines_microtan.s b/defines_microtan.s
index 0ddbfd4..28640de 100644
--- a/defines_microtan.s
+++ b/defines_microtan.s
@@ -13,12 +13,9 @@ CONFIG_ROR_WORKAROUND := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
 CONFIG_SCRTCH_ORDER := 1
 
-CRLF_1 := CR
-CRLF_2 := LF
-
 ; zero page
-ZP_START1 = $24
-ZP_START = $56
+ZP_START = $24
+ZP_HOLE = $56
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -30,19 +27,22 @@ GOGIVEAYF       := $001F
 
 USR := $0021
 
-Z15             := $0015+$1A
-POSX            := $0016+$1A
-Z17             := $0017+$1A
-Z18             := $0018+$1A
-LINNUM          := $0019+$1A
+Z15             := $002F
+POSX            := $0030
+Z17             := $0031
+Z18             := $0032
+LINNUM          := $0033
+
 TXPSV           := $00BA
-INPUTBUFFER     := $001B+$1A
+INPUTBUFFER     := $0035
 INPUTBUFFERX    := $0000
 
 ; constants
 STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $3E
 NULL_MAX		:= $F0
+CRLF_1 := CR
+CRLF_2 := LF
 
 ; memory layout
 RAMSTART2 := $0400
diff --git a/defines_osi.s b/defines_osi.s
index 580e3f1..8b47f69 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -5,12 +5,9 @@ CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_SCRTCH_ORDER := 3
 CONFIG_SMALL := 1
 
-CRLF_1 := CR
-CRLF_2 := LF
-
 ; zero page
-ZP_START1 = $5B
-ZP_START = $00
+ZP_START = $5B
+ZP_HOLE = $00
 
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
@@ -21,11 +18,13 @@ GOAYINT         := $0006
 GOGIVEAYF       := $0008
 
 USR             := $000A
+
 Z15             := $000D
 POSX            := $000E
 Z17             := $000F
 Z18             := $0010
 LINNUM          := $0011
+
 TXPSV           := $0011
 INPUTBUFFER     := $0013
 INPUTBUFFERX    := $0000
@@ -34,6 +33,8 @@ INPUTBUFFERX    := $0000
 STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $33
 NULL_MAX		:= $0A
+CRLF_1 := CR
+CRLF_2 := LF
 
 ; memory layout
 RAMSTART2		:= $0300
diff --git a/zeropage.s b/zeropage.s
index 8540cbb..fe04151 100644
--- a/zeropage.s
+++ b/zeropage.s
@@ -1,6 +1,6 @@
 .zeropage
 
-.res ZP_START1
+.res ZP_START
 
 CHARAC:
 	.res 1
@@ -27,7 +27,7 @@ CPRMASK:
 Z14:
 	.res 1
 
-.res ZP_START
+.res ZP_HOLE
 
 TEMPPT:
 	.res 1