From 292413f70562eaf80ac68bffc696185784117bb0 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 04:24:51 +0000
Subject: [PATCH] cleanup

---
 defines_cbm.s      | 29 ++++++++++++++++++-----------
 defines_kbd.s      |  4 ++--
 defines_kim.s      |  3 ++-
 defines_microtan.s |  4 ++--
 defines_osi.s      |  3 +--
 zeropage.s         |  2 ++
 6 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/defines_cbm.s b/defines_cbm.s
index 4cde92c..178daa6 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -29,43 +29,50 @@ CONFIG_PEEK_SAVE_LINNUM := 1
 
 .ifdef CBM1
 ; zero page
-ZP_START = $5A
+ZP_START0 = $00
+ZP_START = $57
 ZP_HOLE = $00
 
+CONFIG_NO_EXTRA_GO_PTRS := 1
+
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
 
 USR				:= $0000
-GORESTART       := $0000
-INPUTBUFFERX    := $0000
-Z03				:= $0003
+
+;GORESTART       := $0000
 
 Z15             := $0004
 POSX            := $0005
 LINNUM          := $0008
-TXPSV			:= $0008
 INPUTBUFFER     := $000A
 
+TXPSV			:= $0008
+INPUTBUFFERX    := $0000
+
+Z03				:= $0003
 Z96				:= $020C
 
 NULL_MAX		:= $0A
 .else
 
 ; zero page
-ZP_START = $03
+ZP_START0 = $00
+ZP_START = $00
 ZP_HOLE = $05
 
+CONFIG_NO_EXTRA_GO_PTRS := 1
+
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
 
-USR				:= $0000
-GORESTART       := $0000
+USR				:= GORESTART ; XXX
 
-Z03				:= $000E
 LINNUM          := $0011
 
-Z96 := $0096
-POSX := $00C6
+Z03				:= $000E
+Z96				:= $0096
+POSX			:= $00C6
 TXPSV = LASTOP
 
 INPUTBUFFER     := $0200
diff --git a/defines_kbd.s b/defines_kbd.s
index 77f2f70..9def941 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -16,6 +16,8 @@ CONFIG_SMALL := 1
 ZP_START = $06
 ZP_HOLE = $05
 
+JMPADRS         := $0093
+LOWTRX          := $0094                        ; $AB also EXPSGN?
 
 POSX            := $0010
 Z17             := $06FC
@@ -26,8 +28,6 @@ TXPSV           := $0049
 INPUTBUFFER     := $0700
 INPUTBUFFERX    := $0700
 
-JMPADRS         := $0093
-LOWTRX          := $0094                        ; $AB also EXPSGN?
 Z96				:= $0096
 
 ; magic memory locations
diff --git a/defines_kim.s b/defines_kim.s
index b261556..79f8976 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -23,8 +23,9 @@ Z17             := $0017
 Z18             := $0018
 LINNUM          := $0019
 
-TXPSV           := $0019
 INPUTBUFFER     := $001B
+
+TXPSV           := $0019
 INPUTBUFFERX    := $0000
 
 ; magic memory locations
diff --git a/defines_microtan.s b/defines_microtan.s
index b9af63d..edcef16 100644
--- a/defines_microtan.s
+++ b/defines_microtan.s
@@ -21,16 +21,16 @@ ZP_HOLE = $56
 JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
 
-USR := $0021
+USR				:= $0021
 
 Z15             := $002F
 POSX            := $0030
 Z17             := $0031
 Z18             := $0032
 LINNUM          := $0033
+INPUTBUFFER     := $0035
 
 TXPSV           := $00BA
-INPUTBUFFER     := $0035
 INPUTBUFFERX    := $0000
 
 ; constants
diff --git a/defines_osi.s b/defines_osi.s
index db00922..f294260 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -14,15 +14,14 @@ JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
 
 USR             := $000A
-
 Z15             := $000D
 POSX            := $000E
 Z17             := $000F
 Z18             := $0010
 LINNUM          := $0011
+INPUTBUFFER     := $0013
 
 TXPSV           := $0011
-INPUTBUFFER     := $0013
 INPUTBUFFERX    := $0000
 
 ; constants
diff --git a/zeropage.s b/zeropage.s
index b0b2fc8..da5674a 100644
--- a/zeropage.s
+++ b/zeropage.s
@@ -5,12 +5,14 @@
 
 GORESTART:
 	.res 3
+  .ifndef CONFIG_NO_EXTRA_GO_PTRS
 GOSTROUT:
 	.res 3
 GOAYINT:
 	.res 2
 GOGIVEAYF:
 	.res 2
+  .endif
 .endif
 
 .res ZP_START