Skip to content

Commit 4fa32aa

Browse files
author
Brian Holdsworth
committed
FIX: zload to work correctly when there is no REU
1 parent b594144 commit 4fa32aa

File tree

1 file changed

+12
-26
lines changed

1 file changed

+12
-26
lines changed

cbm/cmd/zload.asm

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ startz80 = *
124124

125125
;code we execute when returning from Z80 program; copy this to $1100
126126
z80ReturnStub = *
127-
cli
128127
lda #bkApp
129128
sta bkSelect
130129
lda $a37
131-
sta $d030 ;back to original CPU speed
132-
jsr aceGrExit
130+
sta $d030 ;back to original CPU speed
131+
cli ;resume interrupt handler
132+
jsr aceGrExit ;reset VDC
133133
jsr toolWinRestore
134134
rts
135135
z80_stub_sz = *-z80ReturnStub
@@ -194,19 +194,12 @@ loadz80 = *
194194

195195
;RAM bank 01 loader code
196196
loadRam01 = *
197-
lda pageCnt+1
198-
cmp #$30
199-
bne +
200-
;first load; copy stub to low-memory
201-
ldy #0
202-
- lda load_stub,y
203-
sta $200,y
204-
iny
205-
cpy #load_stub_sz
206-
bne -
207-
+ jmp $200
208-
load_stub = *
209-
!pseudopc($200) {
197+
ldx pageCnt+0
198+
ldy pageCnt+1
199+
stx zp
200+
sty zp+1
201+
lda #zp
202+
sta $2b9
210203
;TALK
211204
lda loadDev
212205
ora #$40
@@ -218,27 +211,20 @@ load_stub = *
218211
nop
219212
sta $de00
220213
ldy #0
221-
-- lda #$4e
222-
sta bkSelect
223214
- lda $de01
224215
beq -
225216
lda $de00
226-
ldx #$4f
227-
stx bkSelect
228-
sta (pageCnt),y
217+
ldx #bkRam1
218+
jsr STASH
229219
iny
230220
dec byteCnt
231-
bne --
221+
bne -
232222
inc pageCnt+1
233-
lda #bkApp
234-
sta bkSelect
235223
;UNTALK
236224
lda #$5f
237225
sta $de00
238226
clc
239227
rts
240-
}
241-
load_stub_sz = *-load_stub
242228

243229
;load first bytes from progfile and confirm header
244230
checkHdr = *

0 commit comments

Comments
 (0)