diff --git a/make.sh b/make.sh index e9c226b..5cdc4db 100755 --- a/make.sh +++ b/make.sh @@ -1,48 +1,48 @@ # 1.0 echo cbmbasic1 -ca65 -D CBM -D CBM1 -D CBM_KBD -D CBM_KBD_APPLE -D CONFIG_CBM1_PATCHES -D CBM1_APPLE -D CBM_APPLE msbasic.s -o cbmbasic1.o && -ld65 -C cbmbasic1.cfg cbmbasic1.o -o cbmbasic1-new.bin && -xxd -g 1 cbmbasic1.bin > cbmbasic1.bin.txt -xxd -g 1 cbmbasic1-new.bin > cbmbasic1-new.bin.txt -diff -u cbmbasic1.bin.txt cbmbasic1-new.bin.txt | head +ca65 -D CBM -D CBM1 -D CBM_KBD -D CBM_KBD_APPLE -D CONFIG_CBM1_PATCHES -D CBM1_APPLE -D CBM_APPLE msbasic.s -o tmp/cbmbasic1.o && +ld65 -C cbmbasic1.cfg tmp/cbmbasic1.o -o tmp/cbmbasic1-new.bin && +xxd -g 1 orig/cbmbasic1.bin > tmp/cbmbasic1.bin.txt +xxd -g 1 tmp/cbmbasic1-new.bin > tmp/cbmbasic1-new.bin.txt +diff -u tmp/cbmbasic1.bin.txt tmp/cbmbasic1-new.bin.txt | head # 1.0 ? echo kbdbasic -ca65 -D KBD -D OSI_KBD -D CBM_KBD -D CBM_KBD_APPLE -D CBM2_KBD -D KIM_KBD -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM2_KBD_APPLE -D KIM_KBD_APPLE -D OSI_KBD_APPLE msbasic.s -o kbdbasic.o && -ld65 -C kbdbasic.cfg kbdbasic.o -o kbdbasic-new.bin && -xxd -g 1 kbdbasic.bin > kbdbasic.bin.txt -xxd -g 1 kbdbasic-new.bin > kbdbasic-new.bin.txt -diff -u kbdbasic.bin.txt kbdbasic-new.bin.txt | head +ca65 -D KBD -D OSI_KBD -D CBM_KBD -D CBM_KBD_APPLE -D CBM2_KBD -D KIM_KBD -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM2_KBD_APPLE -D KIM_KBD_APPLE -D OSI_KBD_APPLE msbasic.s -o tmp/kbdbasic.o && +ld65 -C kbdbasic.cfg tmp/kbdbasic.o -o tmp/kbdbasic-new.bin && +xxd -g 1 orig/kbdbasic.bin > tmp/kbdbasic.bin.txt +xxd -g 1 tmp/kbdbasic-new.bin > tmp/kbdbasic-new.bin.txt +diff -u tmp/kbdbasic.bin.txt tmp/kbdbasic-new.bin.txt | head # 1.0 rev 3.2 echo osi -ca65 -D OSI -D OSI_KBD -D OSI_KBD_APPLE msbasic.s -o osi.o && -ld65 -C osi.cfg osi.o -o osi-new.bin -xxd -g 1 osi.bin > osi.bin.txt -xxd -g 1 osi-new.bin > osi-new.bin.txt -diff -u osi.bin.txt osi-new.bin.txt | head +ca65 -D OSI -D OSI_KBD -D OSI_KBD_APPLE msbasic.s -o tmp/osi.o && +ld65 -C osi.cfg tmp/osi.o -o tmp/osi-new.bin +xxd -g 1 orig/osi.bin > tmp/osi.bin.txt +xxd -g 1 tmp/osi-new.bin > tmp/osi-new.bin.txt +diff -u tmp/osi.bin.txt tmp/osi-new.bin.txt | head # 1.1 echo kb9 -ca65 -D KIM -D KIM_KBD -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM2_KIM -D KIM_KBD_APPLE -D CBM2_KIM_APPLE -D KIM_APPLE msbasic.s -o kb9.o && -ld65 -C kb9.cfg kb9.o -o kb9-new.bin && -xxd -g 1 kb9.bin > kb9.bin.txt -xxd -g 1 kb9-new.bin > kb9-new.bin.txt -diff -u kb9.bin.txt kb9-new.bin.txt | head +ca65 -D KIM -D KIM_KBD -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM2_KIM -D KIM_KBD_APPLE -D CBM2_KIM_APPLE -D KIM_APPLE msbasic.s -o tmp/kb9.o && +ld65 -C kb9.cfg tmp/kb9.o -o tmp/kb9-new.bin && +xxd -g 1 orig/kb9.bin > tmp/kb9.bin.txt +xxd -g 1 tmp/kb9-new.bin > tmp/kb9-new.bin.txt +diff -u tmp/kb9.bin.txt tmp/kb9-new.bin.txt | head # 2 echo cbmbasic2 -ca65 -D CBM -D CBM2 -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM_KBD -D CBM_KBD_APPLE -D CBM2_KBD_APPLE -D CBM2_KBD -D CBM2_KIM -D CBM2_APPLE -D CBM2_KIM_APPLE -D CBM_APPLE msbasic.s -o cbmbasic2.o && -ld65 -C cbmbasic1.cfg cbmbasic2.o -o cbmbasic2-new.bin && -xxd -g 1 cbmbasic2.bin > cbmbasic2.bin.txt -xxd -g 1 cbmbasic2-new.bin > cbmbasic2-new.bin.txt -diff -u cbmbasic2.bin.txt cbmbasic2-new.bin.txt | head +ca65 -D CBM -D CBM2 -D CONFIG_11 -D CONFIG_11_NOAPPLE -D CBM_KBD -D CBM_KBD_APPLE -D CBM2_KBD_APPLE -D CBM2_KBD -D CBM2_KIM -D CBM2_APPLE -D CBM2_KIM_APPLE -D CBM_APPLE msbasic.s -o tmp/cbmbasic2.o && +ld65 -C cbmbasic1.cfg tmp/cbmbasic2.o -o tmp/cbmbasic2-new.bin && +xxd -g 1 orig/cbmbasic2.bin > tmp/cbmbasic2.bin.txt +xxd -g 1 tmp/cbmbasic2-new.bin > tmp/cbmbasic2-new.bin.txt +diff -u tmp/cbmbasic2.bin.txt tmp/cbmbasic2-new.bin.txt | head # 1.1 echo applesoft -ca65 -D APPLE -D CONFIG_11 -D CBM_KBD_APPLE -D CBM2_APPLE -D CBM2_KBD_APPLE -D KIM_KBD_APPLE -D CBM2_KIM_APPLE -D CBM1_APPLE -D CBM_APPLE -D KIM_APPLE -D OSI_KBD_APPLE msbasic.s -o applesoft.o && -ld65 -C applesoft.cfg applesoft.o -o applesoft-new.bin && -xxd -g 1 applesoft.bin > applesoft.bin.txt -xxd -g 1 applesoft-new.bin > applesoft-new.bin.txt -diff -u applesoft.bin.txt applesoft-new.bin.txt | head +ca65 -D APPLE -D CONFIG_11 -D CBM_KBD_APPLE -D CBM2_APPLE -D CBM2_KBD_APPLE -D KIM_KBD_APPLE -D CBM2_KIM_APPLE -D CBM1_APPLE -D CBM_APPLE -D KIM_APPLE -D OSI_KBD_APPLE msbasic.s -o tmp/applesoft.o && +ld65 -C applesoft.cfg tmp/applesoft.o -o tmp/applesoft-new.bin && +xxd -g 1 orig/applesoft.bin > tmp/applesoft.bin.txt +xxd -g 1 tmp/applesoft-new.bin > tmp/applesoft-new.bin.txt +diff -u tmp/applesoft.bin.txt tmp/applesoft-new.bin.txt | head #da65 --info applesoft-temp.txt diff --git a/msbasic.s b/msbasic.s index 053f861..38f326d 100644 --- a/msbasic.s +++ b/msbasic.s @@ -7751,64 +7751,10 @@ INLINX: jsr OUTSP ldx #$80 jmp INLIN1 - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk - brk + .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .byte 0,0,0,0,0,0,0,0,0,0 L29D0: jsr L29DA lda FAC+3 @@ -7822,19 +7768,7 @@ L29DA: L29E0: pla jmp LFB40 - brk ; 29E4 00 . - brk ; 29E5 00 . - brk ; 29E6 00 . -L29E7: - brk ; 29E7 00 . - brk ; 29E8 00 . - brk ; 29E9 00 . - brk ; 29EA 00 . - brk ; 29EB 00 . - brk ; 29EC 00 . - brk ; 29ED 00 . - brk ; 29EE 00 . - brk ; 29EF 00 . + .byte 0,0,0,0,0,0,0,0,0,0,0,0 L29F0: pha ; 29F0 48 H ldx #$01 ; 29F1 A2 01 .. @@ -7843,19 +7777,11 @@ L29F0: inc $BA ; 29F7 E6 BA .. L29F9: jmp L291E ; 29F9 4C 1E 29 L.) -; ---------------------------------------------------------------------------- - brk ; 29FC 00 . - brk ; 29FD 00 . - brk ; 29FE 00 . - brk ; 29FF 00 . - eor ($53,x) ; 2A00 41 53 AS - and ($D2,x) ; 2A02 21 D2 !. - .byte $02 ; 2A04 02 . - .byte $FA ; 2A05 FA . - brk ; 2A06 00 . - lda $12 ; 2A07 A5 12 .. - beq L2A0E ; 2A09 F0 03 .. - jmp (L0008) ; 2A0B 6C 08 00 l.. + .byte $00,$00,$00,$00,$41,$53,$21,$D2 + .byte $02,$FA,$00 + lda $12 + beq L2A0E + jmp (L0008) L2A0E: jsr LF689 .byte $15,$BC,$08,$10,$52,$45,$75,$10 diff --git a/orig/applesoft.bin b/orig/applesoft.bin new file mode 100644 index 0000000..bcd7424 Binary files /dev/null and b/orig/applesoft.bin differ diff --git a/orig/cbmbasic1.bin b/orig/cbmbasic1.bin new file mode 100644 index 0000000..a6edff6 Binary files /dev/null and b/orig/cbmbasic1.bin differ diff --git a/orig/cbmbasic2.bin b/orig/cbmbasic2.bin new file mode 100644 index 0000000..940e4de Binary files /dev/null and b/orig/cbmbasic2.bin differ diff --git a/orig/kb9.bin b/orig/kb9.bin new file mode 100644 index 0000000..ff20761 Binary files /dev/null and b/orig/kb9.bin differ diff --git a/orig/kbdbasic.bin b/orig/kbdbasic.bin new file mode 100644 index 0000000..1d3a1bf Binary files /dev/null and b/orig/kbdbasic.bin differ diff --git a/orig/osi.bin b/orig/osi.bin new file mode 100644 index 0000000..f04f1bf Binary files /dev/null and b/orig/osi.bin differ