diff --git a/src/arch/zx48k/library-asm/load.asm b/src/arch/zx48k/library-asm/load.asm index 14cf443ed..1209fe031 100644 --- a/src/arch/zx48k/library-asm/load.asm +++ b/src/arch/zx48k/library-asm/load.asm @@ -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: @@ -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 diff --git a/tests/functional/code00.asm b/tests/functional/code00.asm index 5f5ed5664..53b16691b 100644 --- a/tests/functional/code00.asm +++ b/tests/functional/code00.asm @@ -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 @@ -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 @@ -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 diff --git a/tests/functional/code01.asm b/tests/functional/code01.asm index 993653920..a6a6b1402 100644 --- a/tests/functional/code01.asm +++ b/tests/functional/code01.asm @@ -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 @@ -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 @@ -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 diff --git a/tests/functional/code02.asm b/tests/functional/code02.asm index e074fca80..1ff2d5d1a 100644 --- a/tests/functional/code02.asm +++ b/tests/functional/code02.asm @@ -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 @@ -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 @@ -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 diff --git a/tests/functional/load02.asm b/tests/functional/load02.asm index 18898ba14..21fcac011 100644 --- a/tests/functional/load02.asm +++ b/tests/functional/load02.asm @@ -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 @@ -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 @@ -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 diff --git a/tests/functional/load03.asm b/tests/functional/load03.asm index 595e72dd0..2af90d65d 100644 --- a/tests/functional/load03.asm +++ b/tests/functional/load03.asm @@ -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 @@ -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 @@ -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