The fastloader works, read-only! It's much, much faster than without one

(still not great).

Author: davidgiven

src/arch/commodore/c64.S

@@ -581,52 +581,34 @@ zendproc
 ; Reads a 256-byte sector whose LBA index is in XA.
 
 zproc read_sector
-    jsr convert_to_ts
+    tay
+    txa
     pha
     tya
     pha
 
-    lda #8
-    jsr LISTEN
-    lda #$6f
-    jsr SECOND
-
-    lda #'U'
-    jsr CIOUT
-    lda #'1'
-    jsr CIOUT
-    lda #2
-    jsr decimal_out
-    lda #0
-    jsr decimal_out
-    pla                 ; get sector
-    jsr decimal_out
-    pla                 ; get track
-    jsr decimal_out
-
-    jsr UNLSN
-
-    ;jsr get_status
-
-    lda #8
-    jsr TALK
-    lda #$62
-    jsr TALKSA
+    lda #'R'
+    jsr uload3_send
+    pla
+    jsr uload3_send
+    pla
+    jsr uload3_send
 
     ldy #0
     zrepeat
-        jsr ACPTR
+        jsr uload3_recv
         sta disk_buffer, y
         iny
     zuntil eq
 
-    jsr UNTALK
+    clc
     rts
 zendproc
 
 ; Writes a 256-byte sector whose LBA index is in XA.
 
 zproc write_sector
+.if 0
     jsr convert_to_ts
     pha
     tya
@@ -692,6 +674,9 @@ zproc write_sector
 reset_buffer_pointer_command:
     .ascii "B-P 2 0"
     .byte 13, 0
+.endif
+    sec
+    rts
 zendproc
 
 ; Prints an 8-bit hex number in A.
@@ -944,12 +929,6 @@ ddEnd:
     rts
 zendproc
 
-
-loading_msg:
-    .byte 147, 14, 5
-    .ascii "cp/m-65 FOR THE cOMMODORE 64"
-    .byte 13, 0
-
 .data
 
 zp_base:    .byte __USERZEROPAGE_START__

src/arch/commodore/c64.ld

@@ -25,6 +25,8 @@ SECTIONS {
 	} >ram AT>bootstrap
 
 	.data : {
+		 . = ALIGN(16);
+		 *(.aligned.16)
 		*(.data .data.* .rodata .rodata.*)
 		bios_end_addr = .;
 	} >ram AT>bootstrap

src/arch/commodore/uload3/client.S

@@ -170,10 +170,7 @@ zendproc
 zproc uload3_recv_file
     zrepeat
         jsr uload3_recv
-        zif eq
-            clc
-            rts
-        zendif
+        zbreakif eq
         cmp #0xff
         zif eq
             ; Error!
@@ -197,5 +194,9 @@ zproc uload3_recv_file
         zif cs
             inc ptr+1
         zendif
-    zendloop
+
+        lda uloadtmp
+        cmp #0xfe
+    zuntil ne
+    rts
 zendproc

src/arch/commodore/uload3/drive1541.S

@@ -218,9 +218,15 @@ zproc drv_recvstring, .drive
     rts
 zendproc
 
-; Converts an LBA sector number in XA to a track/sector.
+; Reads an LBA sector number and converts it to (track, sector).
+
+zproc read_lba, .drive
+    jsr drv_recv
+    pha
+    jsr drv_recv
+    tax
+    pla
 
-zproc convert_to_ts, .drive
     ldy #0
     zloop
         cpx #0
@@ -255,16 +261,30 @@ zproc drv_start, .drive
     ; fall through
 zlproc drv_main, .drive
     zloop
+    main_done:
         jsr drv_recv            ; get command byte, exit if ATN goes low
 
+        cmp #'R'                ; read a sector
+        beq read_sector
         cmp #'F'                ; load a file
         beq load_file
 
         lda #$ff                ; unknown command
-    main_done:
         jsr drv_send
     zendloop
 
+read_sector:
+    jsr read_lba
+    jsr drv_readsector
+
+    ldx #0
+    zrepeat
+        lda DRIVEBUFFER, x
+        jsr drv_send
+        inx
+    zuntil eq
+    jmp main_done
+
 load_file:
     jsr drv_recvstring
 
@@ -349,7 +369,6 @@ dirent_found:
         lda DRIVEBUFFER+0
     zuntil eq
 
-    lda #0                      ; end of data
-    jsr drv_send
+    label:
     jmp main_done
 zendproc