From 1cb253d09994fd81f19bee16a665e2d5fcd36869 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Thu, 16 Oct 2008 07:12:27 +0000 Subject: [PATCH] cleanup --- defines_apple.s | 4 ++-- defines_cbm.s | 8 ++++---- defines_kbd.s | 3 +-- defines_kim.s | 4 ++-- defines_microtan.s | 4 ++-- defines_osi.s | 4 ++-- init.s | 26 +++++++++++++------------- kbd_extra.s | 2 +- program.s | 14 +++++++------- 9 files changed, 34 insertions(+), 35 deletions(-) diff --git a/defines_apple.s b/defines_apple.s index 29f3480..320399b 100644 --- a/defines_apple.s +++ b/defines_apple.s @@ -21,9 +21,9 @@ ZP_START = $55 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR -Z00 := $0000 +GORESTART := $0000 L0001 := $000B -GOWARM := $0003 +GOSTROUT := $0003 GOAYINT := $0006 GOGIVEAYF := $0008 diff --git a/defines_cbm.s b/defines_cbm.s index b1065b2..01ceb74 100644 --- a/defines_cbm.s +++ b/defines_cbm.s @@ -40,11 +40,11 @@ JMPADRS = DSCLEN + 1 LOWTRX = LOWTR USR := $0000 -Z00 := $0000 +GORESTART := $0000 INPUTBUFFERX := $0000 L0001 := $0001 L0002 := $0002 -GOWARM := $0003 +GOSTROUT := $0003 Z03 := $0003 ; same GOAYINT := $0006 GOGIVEAYF := $0008 @@ -76,10 +76,10 @@ JMPADRS = DSCLEN + 1 LOWTRX = LOWTR USR := $0000 -Z00 := $0000 +GORESTART := $0000 L0001 := $0001 L0002 := $0002 -GOWARM := $0003 +GOSTROUT := $0003 Z15 := $0004 CHARAC := $005A-82-5 ENDCHR := $005B-82-5 diff --git a/defines_kbd.s b/defines_kbd.s index 2877c81..92e8ec3 100644 --- a/defines_kbd.s +++ b/defines_kbd.s @@ -15,10 +15,9 @@ CRLF_2 := $0D ZP_START = $15 -Z00 := $0700 L0001 := $0001 L0002 := $0002 -GOWARM := $0003 +GOSTROUT := $0003 GOAYINT := $0006 GOGIVEAYF := $0008 diff --git a/defines_kim.s b/defines_kim.s index 0b66b82..87359e4 100644 --- a/defines_kim.s +++ b/defines_kim.s @@ -17,10 +17,10 @@ ZP_START = $63 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR -Z00 := $0000 +GORESTART := $0000 L0001 := $0001 L0002 := $0002 -GOWARM := $0003 +GOSTROUT := $0003 GOAYINT := $0006 GOGIVEAYF := $0008 diff --git a/defines_microtan.s b/defines_microtan.s index 5035f21..5ca279e 100644 --- a/defines_microtan.s +++ b/defines_microtan.s @@ -23,10 +23,10 @@ ZP_START = $85 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR -Z00 := $0017 +GORESTART := $0017 L0001 := $0001 L0002 := $0002 -GOWARM := $001A +GOSTROUT := $001A GOAYINT := $001D GOGIVEAYF := $001F diff --git a/defines_osi.s b/defines_osi.s index 70618e9..95aacec 100644 --- a/defines_osi.s +++ b/defines_osi.s @@ -13,10 +13,10 @@ ZP_START = $65 JMPADRS = DSCLEN + 1 LOWTRX = LOWTR -Z00 := $0000 +GORESTART := $0000 L0001 := $0001 L0002 := $0002 -GOWARM := $0003 +GOSTROUT := $0003 GOAYINT := $0006 GOGIVEAYF := $0008 diff --git a/init.s b/init.s index 8dc5623..9f30fe0 100644 --- a/init.s +++ b/init.s @@ -37,10 +37,10 @@ COLD_START2: .ifndef CONFIG_CBM_ALL lda #COLD_START2 - sta Z00+1 - sty Z00+2 - sta GOWARM+1 - sty GOWARM+2 + sta GORESTART+1 + sty GORESTART+2 + sta GOSTROUT+1 + sty GOSTROUT+2 lda #AYINT sta GOAYINT @@ -53,10 +53,10 @@ COLD_START2: lda #$4C .ifdef CONFIG_CBM_ALL sta JMPADRS - sta Z00 - .else - sta Z00 - sta GOWARM + .endif + sta GORESTART + .ifndef CONFIG_CBM_ALL + sta GOSTROUT sta JMPADRS .endif .ifdef APPLE @@ -358,16 +358,16 @@ L4192: .else lda #STROUT - sta GOWARM+1 - sty GOWARM+2 + sta GOSTROUT+1 + sty GOSTROUT+2 .if CONFIG_SCRTCH_ORDER = 3 jsr SCRTCH .endif lda #RESTART - sta Z00+1 - sty Z00+2 - jmp (Z00+1) + sta GORESTART+1 + sty GORESTART+2 + jmp (GORESTART+1) .endif .if .def(KIM) || .def(OSI) diff --git a/kbd_extra.s b/kbd_extra.s index 0096178..ba4368f 100644 --- a/kbd_extra.s +++ b/kbd_extra.s @@ -39,7 +39,7 @@ LFDDD: sbc #$09 bne LFDDD LFDEC: - sta Z00,y + sta INPUTBUFFER,y tax bne LFDDC jsr LE882 diff --git a/program.s b/program.s index 84979ca..bdcc223 100644 --- a/program.s +++ b/program.s @@ -31,9 +31,9 @@ L2329: jsr OUTDO .ifdef CONFIG_SMALL lda ERROR_MESSAGES+1,x -.ifdef KBD + .ifdef KBD and #$7F -.endif + .endif jsr OUTDO .else inx @@ -73,11 +73,11 @@ LE28E: lsr Z14 lda #QT_OK -.ifdef CONFIG_CBM_ALL + .ifdef CONFIG_CBM_ALL jsr STROUT -.else - jsr GOWARM -.endif + .else + jsr GOSTROUT + .endif L2351: jsr INLIN .endif @@ -149,7 +149,7 @@ LE2EE: LE2FD: jsr SETPTRS jsr LE33D - lda Z00 + lda INPUTBUFFER LE306: beq LE28E cmp #$A5