From bfdcc7926097da0b45019b19a88216fb011600c9 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Sat, 18 Oct 2008 05:08:43 +0000 Subject: [PATCH] cleanup --- defines_apple.s | 2 +- defines_cbm.s | 7 ++----- defines_kbd.s | 2 +- defines_kim.s | 2 +- defines_microtan.s | 2 +- defines_osi.s | 1 + zeropage.s | 10 +--------- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/defines_apple.s b/defines_apple.s index edf840b..a7d7164 100644 --- a/defines_apple.s +++ b/defines_apple.s @@ -11,7 +11,7 @@ CONFIG_SCRTCH_ORDER := 3 ; zero page ZP_START0 = $00 ZP_START1 = $0D -ZP_HOLE2 = $3D +ZP_START2 = $55 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR diff --git a/defines_cbm.s b/defines_cbm.s index 962f3ad..0208a95 100644 --- a/defines_cbm.s +++ b/defines_cbm.s @@ -31,8 +31,7 @@ CONFIG_PEEK_SAVE_LINNUM := 1 ; zero page ZP_START0 = $00 ZP_START1 = $5A - -CONFIG_NO_EXTRA_GO_PTRS := 1 +ZP_START2 = $65 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR @@ -58,9 +57,7 @@ NULL_MAX := $0A ; zero page ZP_START0 = $00 ZP_START1 = $03 -ZP_HOLE2 = $05 - -CONFIG_NO_EXTRA_GO_PTRS := 1 +ZP_START2 = $13 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR diff --git a/defines_kbd.s b/defines_kbd.s index 3e8944a..4c430be 100644 --- a/defines_kbd.s +++ b/defines_kbd.s @@ -15,7 +15,7 @@ CONFIG_SMALL := 1 ; zero page ZP_START0 = $00 ZP_START1 = $06 -ZP_HOLE2 = $05 +ZP_START2 = $15 JMPADRS := $0093 LOWTRX := $0094 ; $AB also EXPSGN? diff --git a/defines_kim.s b/defines_kim.s index 50cc4fe..9ab247d 100644 --- a/defines_kim.s +++ b/defines_kim.s @@ -12,7 +12,7 @@ CONFIG_SCRTCH_ORDER := 2 ; zero page ZP_START0 = $00 ZP_START1 = $0A -ZP_HOLE2 = $4E +ZP_START2 = $63 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR diff --git a/defines_microtan.s b/defines_microtan.s index ac5e074..12408fe 100644 --- a/defines_microtan.s +++ b/defines_microtan.s @@ -16,7 +16,7 @@ CONFIG_SCRTCH_ORDER := 1 ; zero page ZP_START0 = $17 ZP_START1 = $24 -ZP_HOLE2 = $56 +ZP_START2 = $85 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR diff --git a/defines_osi.s b/defines_osi.s index 0d5db85..d5b33db 100644 --- a/defines_osi.s +++ b/defines_osi.s @@ -8,6 +8,7 @@ CONFIG_SMALL := 1 ; zero page ZP_START0 = $00 ZP_START1 = $5B +ZP_START2 = $65 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR diff --git a/zeropage.s b/zeropage.s index 89fdc56..1f0bcc2 100644 --- a/zeropage.s +++ b/zeropage.s @@ -2,22 +2,16 @@ .zeropage -.ifdef ZP_START0 .org ZP_START0 -.endif -.ifdef ZP_START0 GORESTART: .res 3 - .ifndef CONFIG_NO_EXTRA_GO_PTRS GOSTROUT: .res 3 GOAYINT: .res 2 GOGIVEAYF: .res 2 - .endif -.endif .ifdef ZP_START1 .org ZP_START1 @@ -48,9 +42,7 @@ CPRMASK: Z14: .res 1 -.ifdef ZP_HOLE2 -.res ZP_HOLE2 -.endif +.org ZP_START2 TEMPPT: .res 1