Skip to content

Bugfix/load code #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boriel merged 2 commits into from
Mar 18, 2021
Merged

Bugfix/load code #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc4987
Fix bug in LOAD "" CODE
boriel Mar 18, 2021
044067a
Update tests
boriel Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/arch/zx48k/library-asm/load.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl

LOAD_CONT3:
Expand Down Expand Up @@ -220,7 +220,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start

ld l, (ix + 13) ; otherwise use destination in header
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/code00.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ BRIGHT_TMP:
#line 1 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
#line 4 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
COPY_ATTR:
; Just copies current permanent attribs to temporal attribs
; Just copies current permanent attribs into temporal attribs
; and sets print mode
PROC
LOCAL INVERSE1
Expand Down Expand Up @@ -1314,7 +1314,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl
LOAD_CONT3:
ld (TMP_HEADER), hl
Expand Down Expand Up @@ -1400,7 +1400,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start
ld l, (ix + 13) ; otherwise use destination in header
ld h, (ix + 14) ; and load code at addr. saved from
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/code01.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ BRIGHT_TMP:
#line 1 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
#line 4 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
COPY_ATTR:
; Just copies current permanent attribs to temporal attribs
; Just copies current permanent attribs into temporal attribs
; and sets print mode
PROC
LOCAL INVERSE1
Expand Down Expand Up @@ -1314,7 +1314,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl
LOAD_CONT3:
ld (TMP_HEADER), hl
Expand Down Expand Up @@ -1400,7 +1400,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start
ld l, (ix + 13) ; otherwise use destination in header
ld h, (ix + 14) ; and load code at addr. saved from
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/code02.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ BRIGHT_TMP:
#line 1 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
#line 4 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
COPY_ATTR:
; Just copies current permanent attribs to temporal attribs
; Just copies current permanent attribs into temporal attribs
; and sets print mode
PROC
LOCAL INVERSE1
Expand Down Expand Up @@ -1314,7 +1314,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl
LOAD_CONT3:
ld (TMP_HEADER), hl
Expand Down Expand Up @@ -1400,7 +1400,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start
ld l, (ix + 13) ; otherwise use destination in header
ld h, (ix + 14) ; and load code at addr. saved from
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/load02.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ BRIGHT_TMP:
#line 1 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
#line 4 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
COPY_ATTR:
; Just copies current permanent attribs to temporal attribs
; Just copies current permanent attribs into temporal attribs
; and sets print mode
PROC
LOCAL INVERSE1
Expand Down Expand Up @@ -1321,7 +1321,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl
LOAD_CONT3:
ld (TMP_HEADER), hl
Expand Down Expand Up @@ -1407,7 +1407,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start
ld l, (ix + 13) ; otherwise use destination in header
ld h, (ix + 14) ; and load code at addr. saved from
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/load03.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ BRIGHT_TMP:
#line 1 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
#line 4 "/zxbasic/src/arch/zx48k/library-asm/copy_attr.asm"
COPY_ATTR:
; Just copies current permanent attribs to temporal attribs
; Just copies current permanent attribs into temporal attribs
; and sets print mode
PROC
LOCAL INVERSE1
Expand Down Expand Up @@ -1318,7 +1318,7 @@ LOAD_CONT2:
add hl, sp
ld (TMP_SP), hl
ld bc, -18
add hl, sp
add hl, bc
ld sp, hl
LOAD_CONT3:
ld (TMP_HEADER), hl
Expand Down Expand Up @@ -1404,7 +1404,7 @@ VR_CONT_1:
inc hl
ld h, (hl)
ld l, a
or h ; check start for zero (unespecified)
or h ; check start for zero (unspecified)
jr nz, VR_CONT_2 ; Jump if there was a start
ld l, (ix + 13) ; otherwise use destination in header
ld h, (ix + 14) ; and load code at addr. saved from
Expand Down