Skip to content

fix: crash when converting some from byte to bool #969

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.

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
merged 1 commit into from
Mar 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/arch/z80/backend/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ def _cast(ins: Quad):

xsB = sB = YY_TYPES[tB] # Type sizes

if tA in ("u8", "i8") and tB == "bool":
return [] # bytes are booleans already (0 = False, not 0 = True)

output = []
if tA in ("u8", "i8", "bool"):
output.extend(Bits8.get_oper(ins[4]))
Expand Down
55 changes: 55 additions & 0 deletions tests/functional/arch/zx48k/bool_crash.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
org 32768
.core.__START_PROGRAM:
di
push ix
push iy
exx
push hl
exx
ld hl, 0
add hl, sp
ld (.core.__CALL_BACK__), hl
ei
jp .core.__MAIN_PROGRAM__
.core.__CALL_BACK__:
DEFW 0
.core.ZXBASIC_USER_DATA:
; Defines USER DATA Length in bytes
.core.ZXBASIC_USER_DATA_LEN EQU .core.ZXBASIC_USER_DATA_END - .core.ZXBASIC_USER_DATA
.core.__LABEL__.ZXBASIC_USER_DATA_LEN EQU .core.ZXBASIC_USER_DATA_LEN
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
_pldx:
DEFB 00
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
ld hl, 0
ld b, h
ld c, l
.core.__END_PROGRAM:
di
ld hl, (.core.__CALL_BACK__)
ld sp, hl
exx
pop hl
exx
pop iy
pop ix
ei
ret
_ReadKeys:
push ix
ld ix, 0
add ix, sp
pop af
ld hl, (_pldx - 1)
or h
jp z, .LABEL.__LABEL1
ld a, 1
ld (_pldx), a
.LABEL.__LABEL1:
_ReadKeys__leave:
ld sp, ix
pop ix
ret
;; --- end of user code ---
END
7 changes: 7 additions & 0 deletions tests/functional/arch/zx48k/bool_crash.bas
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dim pldx as ubyte

sub ReadKeys()
if pldx or (pldx and %1) then
pldx = 1
endif
end sub