From 82c75e263f639f8e9825ea097fcb75534c9285d9 Mon Sep 17 00:00:00 2001 From: Michael Steil Date: Sun, 19 Oct 2008 06:05:39 +0000 Subject: [PATCH] cleanup --- defines_osi.s | 6 -- extra.s | 21 +++++++ init.s | 27 --------- msbasic.s | 1 + orig/osi.bin | Bin 8192 -> 7906 bytes osi_extra.s | 163 -------------------------------------------------- 6 files changed, 22 insertions(+), 196 deletions(-) create mode 100644 extra.s delete mode 100644 osi_extra.s diff --git a/defines_osi.s b/defines_osi.s index c1702a9..a323719 100644 --- a/defines_osi.s +++ b/defines_osi.s @@ -28,12 +28,6 @@ RAMSTART2 := $0300 ; magic memory locations L0200 := $0200 -LD000 := $D000 -LD300 := $D300 -LD700 := $D700 -LFB00 := $FB00 -LFC00 := $FC00 -LFFE0 := $FFE0 ; monitor functions MONRDKEY := $FFEB diff --git a/extra.s b/extra.s new file mode 100644 index 0000000..f6b80a5 --- /dev/null +++ b/extra.s @@ -0,0 +1,21 @@ +.segment "EXTRA" + +.ifdef KIM +.include "kim_extra.s" +.endif + +.ifdef CONFIG_CBM1_PATCHES +.include "cbm1_patches.s" +.endif + +.ifdef KBD +.include "kbd_extra.s" +.endif + +.ifdef APPLE +.include "apple_extra.s" +.endif + +.ifdef MICROTAN +.include "microtan_extra.s" +.endif \ No newline at end of file diff --git a/init.s b/init.s index adca21f..01d60a0 100644 --- a/init.s +++ b/init.s @@ -436,30 +436,3 @@ QT_BASIC: .byte $0D,$0A,$00 .endif .endif /* KBD */ - -.segment "EXTRA" - -.ifdef OSI -.include "osi_extra.s" -.endif - -.ifdef KIM -.include "kim_extra.s" -.endif - -.ifdef CONFIG_CBM1_PATCHES -.include "cbm1_patches.s" -.endif - - -.ifdef KBD -.include "kbd_extra.s" -.endif - -.ifdef APPLE -.include "apple_extra.s" -.endif - -.ifdef MICROTAN -.include "microtan_extra.s" -.endif \ No newline at end of file diff --git a/msbasic.s b/msbasic.s index fb2011d..7c259b1 100644 --- a/msbasic.s +++ b/msbasic.s @@ -33,3 +33,4 @@ .include "rnd.s" .include "trig.s" .include "init.s" +.include "extra.s" diff --git a/orig/osi.bin b/orig/osi.bin index f04f1bf4b3c38a0515d476f03640c8f9a05ae141..7b039e6b2edd4b6857e055ec7a53e6962f1b4ee7 100644 GIT binary patch delta 7 OcmZp0cx1cbksJUHR|Aj$ delta 296 zcmX9&KTE?v9R1~&=1+@4M<=hgGx_jvCW2gBZFu^Rz!NAyQu+}6y~ornh9(QO^FhNj%rNzEKX zp!$tim3se67}+0vhRmvHVl$|cD+81v1}DL3z!BB{)J5fwdrSF!EH{gm+FNW(m#oC$ zKrjo*ohSkMx{h`RdHo33ZITxePQr_jl4oITp4Xk+G>*Obn}|JJwm)vPNXT?u-;%D? zVm_V&@lfiriRBi)Hc=|09}wjxA*6**zF}%IGdmVei&{2fNNEfi{jX<$GaxvJ)R@Yi ULuQU8M{;!y@(koXO)~)a0p!(;LjV8( diff --git a/osi_extra.s b/osi_extra.s deleted file mode 100644 index 9c69706..0000000 --- a/osi_extra.s +++ /dev/null @@ -1,163 +0,0 @@ -.segment "EXTRA" - - .byte $00,$00 -LBEE4: - lda LBF03+2 - lsr a - bcc LBEE4 - lda LFB00+3 - sta LFB00+7 - and #$7F - rts - pha -LBEF4: - lda LFB00+5 - bpl LBEF4 - pla - sta LFB00+4 - rts - lda LFB00+6 - lda #$FF -LBF03: - sta LFB00+5 - rts -LBF07: - lda LFC00 - lsr a - bcc LBF07 - lda LFC00+1 - beq LBF07 - and #$7F - rts - pha -LBF16: - lda LFC00 - lsr a - lsr a - bcc LBF16 - pla - sta LFC00+1 - rts - lda #$03 - sta LFC00 - lda #$B1 - sta LFC00 - rts - sta L0200+2 - pha - txa - pha - tya - pha - lda L0200+2 - beq LBF6D - ldy L0200+6 - beq LBF47 -LBF3F: - ldx #$40 -LBF41: - dex - bne LBF41 - dey - bne LBF3F -LBF47: - cmp #$0A - beq LBF76 - cmp #$0D - bne LBF55 - jsr LBFD5 - jmp LBF6D -LBF55: - sta L0200+1 - jsr LBFC2 - inc L0200+0 - lda LFFE0+1 - clc - adc LFFE0+0 - cmp L0200+0 - bmi LBF73 -LBF6A: - jsr LBFDE -LBF6D: - pla - tay - pla - tax - pla - rts -LBF73: - jsr LBFD8 -LBF76: - jsr LBFC2 - lda LFFE0 - and #$E0 - sta L0200+2 - ldx #$07 -LBF83: - lda LBFF3,x - sta L0200+7,x - dex - bpl LBF83 - ldx LBFFB,y - lda #$20 - ldy LFFE0+1 - cpy #$20 - bmi LBF99 - asl a -LBF99: - sta L0200+8 - ldy #$00 -LBF9E: - jsr L0200+7 - bne LBF9E - inc L0200+9 - inc L0200+12 - cpx L0200+9 - bne LBF9E -LBFAE: - jsr L0200+7 - cpy L0200+2 - bne LBFAE - lda #$20 -LBFB8: - jsr L0200+10 - dec L0200+8 - bne LBFB8 - beq LBF6A -LBFC2: - ldx L0200+0 - lda L0200+1 -LBFC8: - ldy LFFE0+2 - bne LBFD1 - sta LD300,x - rts -LBFD1: - sta LD700,x - rts -LBFD5: - jsr LBFC2 -LBFD8: - lda LFFE0 - sta L0200+0 -LBFDE: - ldx L0200+0 - lda LD300,x - ldy LFFE0+2 - beq LBFEC - lda LD700,x -LBFEC: - sta L0200+1 - lda #$5F - bne LBFC8 -LBFF3: - lda LD000,y - sta LD000,y - iny - rts -LBFFB: - .byte $D3 - .byte $D7 - brk - brk - brk