From 8c8e18bb80b11f1426ce47997ebf4d796744a3ef Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Tue, 24 Dec 2019 21:07:55 +0100
Subject: [PATCH] various tape loading fixes

---
 bin/basic_generic.rom                  | Bin 8192 -> 8192 bytes
 bin/basic_testing.rom                  | Bin 8192 -> 8192 bytes
 bin/basic_ultimate64.rom               | Bin 8192 -> 8192 bytes
 bin/kernal_generic.rom                 | Bin 8192 -> 8192 bytes
 bin/kernal_testing.rom                 | Bin 8192 -> 8192 bytes
 bin/kernal_ultimate64.rom              | Bin 8192 -> 8192 bytes
 bin/mega65.rom                         | Bin 131072 -> 131072 bytes
 c64/aliases/,aliases_ram_lowmem.s      |   2 +-
 c64/kernal/iec/save_iec.s              |   7 +-
 c64/kernal/iostack/load_save_common.s  |  16 ++--
 c64/kernal/tape/load_tape_normal.s     | 106 ++++++++-----------------
 c64/kernal/tape/load_tape_turbo.s      |   9 ++-
 c64/kernal/tape/tape_normal_get_byte.s |   2 +-
 c64/kernal/tape/tape_normal_get_data.s |  53 +++++--------
 c64/kernal/tape/tape_normal_pilot.s    |  63 ++++++++++++---
 15 files changed, 127 insertions(+), 131 deletions(-)

diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index b616aec83ba944e707e58e5dbab8becb37c69457..67d6d76139175c96d00e68361bec8caf4a94f8e6 100644
GIT binary patch
delta 162
zcmZp0XmFU|q0#eZrM<$X{~4<k=C4(l_-2tJkX~wa^8W{(Me<<gGE0ToD-?P*7Vxn!
z_H3?adBZ4)O^-s)8-<?9Eo>85+TZweZkAx@W&|o%;jm?9n)qgNGItPT&*W{~&w%7y
n9$g@Ln#T%AvhkV%NgLjFprXx3dFKf-8cj}-uL6qQmsbP;+e|{_

delta 162
zcmZp0XmFU|q0#?lrM<$X{~4<k=C4(F{bG?KkX~wa^8W{(Me<<gGE0ToD-`-S7Vxn!
z_HV9ddBZ4)O^-tV8-@PKEo>85y59Iq+$_P)%?MPk!ePtI^!ml*WbPow{>j_8p8?6a
nJi0*gG>;XKWaBjjk~X~UKt-F6^3D@vG@P6wUj-DqFRusyP!mLL

diff --git a/bin/basic_testing.rom b/bin/basic_testing.rom
index 1b0d3c9bcd2a1c24b07039a176dc6d31c531c8de..30d6963d3f70f99e61627009a856b665133560e7 100644
GIT binary patch
delta 83
zcmZp0XmHrz$HJoW*5}3KAQl}a@#mWxSk5ppo%}M{k3Ag7oxGggfUD*G(hUkN?-hXD
hhwM%uMXDU(EFij$$CVMNc=J)-d4h~alT+m9002%ZAS(a>

delta 83
zcmZp0XmHrz$HJoh*5}*gAQl}agSVR-Sk5ppnZBLu#~u#kPF~J#z*YHv=>~<$_X<Gn
gLv|;SB2|uX77$&><H`tBy!j~aJV8do$tm)406rNXjsO4v

diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index d9a7f63821c294c84b944f184d469f6fc8f58e81..3e91cd62cfa63886f505103e56881f4996a16e00 100644
GIT binary patch
delta 170
zcmZp0XmFU|p%MOerM<$X{~4<k=C4(VdAmpvNH4WI`TqmYB6%=#nWe()6$;@S3;0+V
z!#CHnykV5Yrbi+CtwQ+Z7PblOL2rH1-!UXiR%ExCY{1SoIhOqxP@@WmEi+@x<RtE3
w#_-A8xSs*Zxjec+@-&YXkYwXE1(G(r?Tj&-kMPbHWHg$bB3}g*x-YK?0N$5DD*ylh

delta 170
zcmZp0XmFU|p%L|VrM<$X{~4<k=C4(Vf4fK#NH4WI`TqmYB6%=#nWe()6$()s3;0+V
zqc+#GykV5Yrbi*_twPk~7PblOp>KW8eql(MtjKON*?^sGaxD8XphguATV}@i$w}P7
wj8T)faX$l+b9r=u<Y^u&Aj!sS3M6fK+Zp3GAK{%Z$Y?k@MZO9sbYET(01q)i%m4rY

diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 3ce521ddfbdb42cfacaf3022d9f80b73223ba3cb..2a5d2daefa980360ce9cc20b784f7500b760e4c2 100644
GIT binary patch
delta 3060
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

delta 2944
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

diff --git a/bin/kernal_testing.rom b/bin/kernal_testing.rom
index 286dfc4be159d0c413153d890991729ac723bb01..4ee9d0c3295488a984d2e3469616a7e1a747a65e 100644
GIT binary patch
delta 2485
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
G(f<H8RhWhV

delta 2533
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

diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 7d3f9735d3d83017e0c09b0469b9e922f57e1503..0851f5247b5780ac69349b1adf730397ef81df96 100644
GIT binary patch
delta 3619
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

delta 3566
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

diff --git a/bin/mega65.rom b/bin/mega65.rom
index 1db906dc7d9e2f139d91ef41efcb0381acc3f414..495d1f41b28b766eb6b0e10972b10561392b5ca1 100644
GIT binary patch
delta 2166
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
M?k4|mH>ofDFYu^rSO5S3

delta 2209
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

diff --git a/c64/aliases/,aliases_ram_lowmem.s b/c64/aliases/,aliases_ram_lowmem.s
index 37e3ae08..6e377781 100644
--- a/c64/aliases/,aliases_ram_lowmem.s
+++ b/c64/aliases/,aliases_ram_lowmem.s
@@ -136,7 +136,7 @@
 	.label FA        = $BA  //          current device number
 	.label FNADDR    = $BB  // $BB-$BC  current file name pointer
 	.label ROPRTY    = $BD  //          -- NOT IMPLEMENTED -- tape / RS-232 temporary storage
-	.label FSBLK     = $BE  //          -- NOT IMPLEMENTED --
+	.label FSBLK     = $BE  //          -- NOT IMPLEMENTED -- tape / RS-232 temporary storage
 	.label MYCH      = $BF  //          -- NOT IMPLEMENTED --
 	.label CAS1      = $C0  //          tape motor interlock
 	.label STAL      = $C1  // $C1-$C2  LOAD/SAVE start address
diff --git a/c64/kernal/iec/save_iec.s b/c64/kernal/iec/save_iec.s
index e06d4a9e..19413839 100644
--- a/c64/kernal/iec/save_iec.s
+++ b/c64/kernal/iec/save_iec.s
@@ -85,7 +85,12 @@ iec_save_loop:
 #endif
 
 	// Next iteration
-	jsr lvs_advance_MEMUSS_check_EAL
+#if !HAS_OPCODES_65CE02
+	jsr lvs_advance_MEMUSS
+#else
+	inw MEMUSS+0
+#endif
+	jsr lvs_check_EAL
 	bne iec_save_loop
 
 iec_save_loop_end:
diff --git a/c64/kernal/iostack/load_save_common.s b/c64/kernal/iostack/load_save_common.s
index 10c975b3..a2d31714 100644
--- a/c64/kernal/iostack/load_save_common.s
+++ b/c64/kernal/iostack/load_save_common.s
@@ -87,25 +87,22 @@ lvs_setup_MEMUSS:
 
 #endif
 
-#if CONFIG_TAPE_TURBO || CONFIG_IEC
+#if CONFIG_TAPE_NORMAL || CONFIG_TAPE_TURBO || CONFIG_IEC
 
-lvs_advance_MEMUSS_check_EAL:
+#if !HAS_OPCODES_65CE02
+
+lvs_advance_MEMUSS:
 
 	// Advance pointer
-#if !HAS_OPCODES_65CE02
+
 	inc MEMUSS+0
 	bne !+
 	inc MEMUSS+1
 !:
-#else
-	inw MEMUSS+0
+	rts
 
 #endif
 
-	// FALLTROUGH
-
-#if CONFIG_TAPE_NORMAL || CONFIG_TAPE_TURBO || CONFIG_IEC
-
 lvs_check_EAL:
 
 	lda MEMUSS+1
@@ -116,7 +113,6 @@ lvs_check_EAL:
 !:
 	rts
 
-#endif
 
 lvs_display_searching_for:
 
diff --git a/c64/kernal/tape/load_tape_normal.s b/c64/kernal/tape/load_tape_normal.s
index cd2b0254..c5159b8b 100644
--- a/c64/kernal/tape/load_tape_normal.s
+++ b/c64/kernal/tape/load_tape_normal.s
@@ -56,15 +56,21 @@ load_tape_normal:
 	ldx #%00010001                     // start timer, force latch reload
 	stx CIA2_CRA    // $DD0E
 	
+	// Temporarily store MEMUSS in EAL
+
+	lda MEMUSS+1
+	sta EAL+1
+	lda MEMUSS+0
+	sta EAL+0
+
 	// Start playing
+
 	jsr tape_ask_play
 
 	// FALLTROUGH
 
 load_tape_normal_header:
 
-/* XXX try to reuse block retrieeval rooutine, like this:
-
 	// Try to load header into tape buffer
 
 	lda TAPE1+1
@@ -72,66 +78,36 @@ load_tape_normal_header:
 	lda TAPE1+0
 	sta MEMUSS+0
 
-	// Initialize checksum (RIPRTY, see http://sta.c64.org/cbm64mem.html)
-	
-	lda #$00
-	sta RIPRTY
+	// Retrieve the header
 
-	// Retrieve the header          XXX limit it to 192 bytes
-
-	jsr tape_normal_get_block
+	jsr tape_normal_pilot_header
+	jsr tape_normal_get_data           // XXX limit it to 192 bytes
 	bcs load_tape_normal_header        // unable to read block, try again
 
-	// Handle the header
+	// Check header type
 
-	jsr tape_handle_header
-	bcs load_tape_normal_header        // if name does not match, look for other header
-*/
-
-	// Read pilot and sync of the first header
-
-	jsr tape_normal_pilot
-	ldy #$89
-	jsr tape_normal_sync
-	bcs load_tape_normal_header
-
-	ldy #$00
-
-	// FALLTROUGH
-
-load_tape_normal_header_loop:
-
-	// Read the header
-
-	jsr tape_normal_get_marker          // XXX handle result
-	jsr tape_normal_get_byte            // XXX handle errors
-	sta (TAPE1), y
-	iny
-	cpy #$15
-	bne load_tape_normal_header_loop
-
-	// Read pilot and sync of the second header
-
-	jsr tape_normal_pilot
-	ldy #$09
-	jsr tape_normal_sync
-	bcs load_tape_normal_header
-
-	// XXX do not skip second header, use it to correct data
-	ldy #$15
-!:
-	jsr tape_normal_get_marker
-	jsr tape_normal_get_byte
-	dey
-	bne !-
-
-	// For now only one type of header is supported
-
-	ldy #$00
+	ldy #$00                           // XXX probably can be optimized for 65C02
 	lda (TAPE1),y
 
+	cmp #$05
+	beq_far tape_load_error            // end of tape mark, nothing to load
+
 	cmp #$01
-	bne load_tape_normal_header        // XXX also handle other header types, see Mapping the C64 page 77
+	beq !+
+	cmp #$03
+	bne load_tape_normal_header        // header types 1 and 3 are loadable, see Mapping the C64, page 77
+
+	// XXX handle non-relocatable program, header type 3
+
+!:
+	// Handle the header
+
+	// Restore MEMUSS
+
+	lda EAL+1
+	sta MEMUSS+1
+	lda EAL+0
+	sta MEMUSS+0
 
 	// Handle the header
 
@@ -142,28 +118,14 @@ load_tape_normal_header_loop:
 
 load_tape_normal_payload:
 
-	// Initialize checksum (RIPRTY, see http://sta.c64.org/cbm64mem.html)
-	
-	lda #$00
-	sta RIPRTY
-
 	// Retrieve data
 
+	jsr tape_normal_pilot_data
 	jsr tape_normal_get_data
 	bcs_far tape_load_error
 
-	// Advance MEMUSS (see Mapping the C64, page 36), check if end
-
-	tya
-	clc
-	adc MEMUSS+0
-	sta MEMUSS+0
-	bcc !+
-	inc MEMUSS+1
-!:
-	// XXX check below does not work - why?
-	// jsr lvs_check_EAL
-	// bne_far tape_load_error            // amount of data read does not match header info
+	jsr lvs_check_EAL
+	bne_far tape_load_error            // amount of data read does not match header info
 
 	jmp tape_load_success
 
diff --git a/c64/kernal/tape/load_tape_turbo.s b/c64/kernal/tape/load_tape_turbo.s
index eae97205..4825509b 100644
--- a/c64/kernal/tape/load_tape_turbo.s
+++ b/c64/kernal/tape/load_tape_turbo.s
@@ -64,7 +64,7 @@ load_tape_turbo_header_loop:
 	// Handle the header
 
 	jsr tape_clean_sid
-	jsr tape_handle_header
+	jsr tape_handle_header             // XXX handle non-relocatable programs - any non-0 even header type
 	bcs load_tape_turbo_header         // if name does not match, look for other header
 
 	// FALLTROUGH
@@ -91,7 +91,12 @@ load_tape_turbo_loop:
 	sta PRTY
 
 	// Advance MEMUSS (see Mapping the C64, page 36)
-	jsr lvs_advance_MEMUSS_check_EAL
+#if !HAS_OPCODES_65CE02
+	jsr lvs_advance_MEMUSS
+#else
+	inw MEMUSS+0
+#endif
+	jsr lvs_check_EAL
 	bne load_tape_turbo_loop
 
 	// Get the checksum
diff --git a/c64/kernal/tape/tape_normal_get_byte.s b/c64/kernal/tape/tape_normal_get_byte.s
index 1fbae18e..d63c1d0d 100644
--- a/c64/kernal/tape/tape_normal_get_byte.s
+++ b/c64/kernal/tape/tape_normal_get_byte.s
@@ -2,7 +2,7 @@
 //
 // Tape (normal) helper routine - byte reading
 //
-// Returns byte in .A, Carry flag set = error
+// Returns byte in .A (also sotred in INBIT), Carry flag set = error
 //
 
 
diff --git a/c64/kernal/tape/tape_normal_get_data.s b/c64/kernal/tape/tape_normal_get_data.s
index 71efb6f7..7c7acb14 100644
--- a/c64/kernal/tape/tape_normal_get_data.s
+++ b/c64/kernal/tape/tape_normal_get_data.s
@@ -14,61 +14,46 @@
 
 tape_normal_get_data:
 
+	// Initialize checksum (RIPRTY, see http://sta.c64.org/cbm64mem.html)
+	
+	lda #$00
+	sta RIPRTY
+
 	// Read the pilot and sync of the block
 
-	jsr tape_normal_pilot
 	ldy #$89
 	jsr tape_normal_sync
 	bcs tape_normal_get_block_done     // XXX make it more erroor resistant
-	
-	// Initialize byte counter
-	ldy #$00
+	jsr tape_normal_get_marker
 
 tape_normal_get_data_loop:
 
-	jsr tape_normal_get_marker
-	bcs tape_normal_get_data_2nd_copy // end of data for the block
 	jsr tape_normal_get_byte
-
 	bcs tape_normal_get_block_done     // error reading byte - fatal for now
+	jsr tape_normal_get_marker
+	bcs tape_normal_get_checksum       // end of data for the block
 
 	// Store byte, calculate checksum
+	lda INBIT
+	ldy #$00                           // XXX probably can be optimized for 65C02
 	sta (MEMUSS), y
 	eor RIPRTY
 	sta RIPRTY
 	
-	iny
-	bne tape_normal_get_data_loop
+	// Advance pointer
+#if !HAS_OPCODES_65CE02
+	jsr lvs_advance_MEMUSS
+#else
+	inw MEMUSS+0
+#endif
 
-	// 256 bytes read
-
-	inc MEMUSS+1
 	jmp tape_normal_get_data_loop
 
-tape_normal_get_data_2nd_copy:
+tape_normal_get_checksum: // XXX handle second copy, with pilot starting from $09
 
-	// Read the pilot and sync of the block
-
-	jsr tape_normal_pilot
-	ldy #$09
-	jsr tape_normal_sync
-	bcs tape_normal_get_block_done     // XXX make it more error resistant
-
-	// For now skip the error correction data
-!:
-	jsr tape_normal_get_marker
-	bcs tape_normal_get_checksum
-	jsr tape_normal_get_byte
-	tay
-	jmp !-
-
-tape_normal_get_checksum:
-
-	tya
+	lda INBIT
 	eor RIPRTY
-	cmp #$01                           // sets Carry if checksum verification failed
-
-	clc // XXX checksum calculation fails - why?
+	cmp #$01                           // sets Carry if checksum verification fails
 
 	// FALLTROUGH
 
diff --git a/c64/kernal/tape/tape_normal_pilot.s b/c64/kernal/tape/tape_normal_pilot.s
index b2ee829f..e2fb5823 100644
--- a/c64/kernal/tape/tape_normal_pilot.s
+++ b/c64/kernal/tape/tape_normal_pilot.s
@@ -3,27 +3,70 @@
 // Tape (turbo) helper routine - handling the pilot
 //
 
+// Injest the pilot - series of short pulses. According to http://sidpreservation.6581.org/tape-format/
+// it consist of the following number of pulses:
+// - $6A00 for header
+// - $1A00 for data and seq block header
+// - $4F for repeated header/data
+
 
 #if CONFIG_TAPE_NORMAL
 
 
-tape_normal_pilot:
 
-	// Injest the pilot - series of short pulses. According to http://sidpreservation.6581.org/tape-format/
-	// it consist of the foollowing number of pulses:
-	// - $6A00 for header
-	// - $1A00 for data and seq block header
-	// - $4F for repeated header/data
+tape_normal_pilot_short: // require 1x $40 pulses
+
+	lda #$01
+
+	// FALLTROUGH
+
+tape_normal_pilot_common:
+
+	sta FSBLK
+
+	// FALLTROUGH
+
+tape_normal_pilot_common_restart:
+
+	lda FSBLK
+	sta ROPRTY
+
+	// FALLTROUGH
+
+tape_normal_pilot_common_loop_outer:
+
+	ldy #$40
+
+	// FALLTROUGH
+
+tape_normal_pilot_common_loop_inner:
 
-	ldy #$05                           // this should be enough
-!:
 	jsr tape_normal_get_pulse
-	bcc tape_normal_pilot              // not a pilot - try again
+	bcc tape_normal_pilot_common_restart         // not a pilot - try again
 
 	dey
-	bne !-
+	bne tape_normal_pilot_common_loop_inner
+
+	dec ROPRTY
+	bne tape_normal_pilot_common_loop_outer
 
 	rts
 
 
+
+tape_normal_pilot_data: // require 4x $40 pulses
+
+	lda #$04
+
+	skip_2_bytes_trash_nvz
+
+	// FALLTROUGH
+
+tape_normal_pilot_header: // require 128x $40 pulses
+
+	lda #$80
+
+	jmp tape_normal_pilot_common    // XXX calibrate tape speeed afterwards
+
+
 #endif