Skip to content

refact: move runtime bool functions to bool/ #867

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 1 commit into from
Nov 13, 2024
Merged

refact: move runtime bool functions to bool/ #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/arch/z80/backend/runtime/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ class CoreLabels:
CoreLabels.ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: "arrayalloc.asm",
CoreLabels.ALLOC_LOCAL_ARRAY: "arrayalloc.asm",
CoreLabels.ALLOC_LOCAL_ARRAY_WITH_BOUNDS: "arrayalloc.asm",
CoreLabels.AND16: "and16.asm",
CoreLabels.AND32: "and32.asm",
CoreLabels.ANDF: "andf.asm",
CoreLabels.AND16: "bool/and16.asm",
CoreLabels.AND32: "bool/and32.asm",
CoreLabels.ANDF: "bool/andf.asm",
CoreLabels.ARRAY: "array.asm",
CoreLabels.ARRAY_PTR: "array.asm",
CoreLabels.ARRAYSTR_FREE_MEM: "arraystrfree.asm",
Expand Down Expand Up @@ -214,12 +214,12 @@ class CoreLabels:
CoreLabels.NEGF: "negf.asm",
CoreLabels.NEGHL: "neg16.asm",
CoreLabels.NORMALIZE_BOOLEAN: "strictbool.asm",
CoreLabels.NOT32: "not32.asm",
CoreLabels.NOTF: "notf.asm",
CoreLabels.NOT32: "bool/not32.asm",
CoreLabels.NOTF: "bool/notf.asm",
CoreLabels.ON_GOTO: "ongoto.asm",
CoreLabels.ON_GOSUB: "ongoto.asm",
CoreLabels.OR32: "or32.asm",
CoreLabels.ORF: "orf.asm",
CoreLabels.OR32: "bool/or32.asm",
CoreLabels.ORF: "bool/orf.asm",
CoreLabels.PISTORE16: "istore16.asm",
CoreLabels.PISTORE32: "pistore32.asm",
CoreLabels.PISTOREF: "storef.asm",
Expand Down Expand Up @@ -255,8 +255,8 @@ class CoreLabels:
CoreLabels.U32TOFREG: "u32tofreg.asm",
CoreLabels.U8TOFREG: "u32tofreg.asm",
CoreLabels.UBOUND: "bound.asm",
CoreLabels.XOR16: "xor16.asm",
CoreLabels.XOR8: "xor8.asm",
CoreLabels.XOR32: "xor32.asm",
CoreLabels.XORF: "xorf.asm",
CoreLabels.XOR16: "bool/xor16.asm",
CoreLabels.XOR8: "bool/xor8.asm",
CoreLabels.XOR32: "bool/xor32.asm",
CoreLabels.XORF: "bool/xorf.asm",
}
1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/and16.asm → src/lib/arch/zx48k/runtime/bool/and16.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ __AND16:
ret

pop namespace

0 src/lib/arch/zx48k/runtime/and32.asm → src/lib/arch/zx48k/runtime/bool/and32.asm
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/and8.asm → src/lib/arch/zx48k/runtime/bool/and8.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ __AND8:
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/andf.asm → src/lib/arch/zx48k/runtime/bool/andf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __ANDF: ; A & B
jp __FTOU8 ; Convert to 8 bits

pop namespace

2 changes: 0 additions & 2 deletions src/lib/arch/zxnext/runtime/not32.asm → src/lib/arch/zx48k/runtime/bool/not32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ __NOT32: ; A = ¬A
ret

pop namespace


1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/notf.asm → src/lib/arch/zx48k/runtime/bool/notf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __NOTF: ; A = ¬A
jp __FTOU8 ; Convert to 8 bits

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/or32.asm → src/lib/arch/zx48k/runtime/bool/or32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __OR32: ; Performs logical operation A AND B
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/orf.asm → src/lib/arch/zx48k/runtime/bool/orf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __ORF: ; A | B
jp __FTOU8 ; Convert to 32 bits

pop namespace

2 changes: 1 addition & 1 deletion src/lib/arch/zx48k/runtime/xor16.asm → src/lib/arch/zx48k/runtime/bool/xor16.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

; XOR16 implemented in XOR8.ASM file
#include once <xor8.asm>
#include once <bool/xor8.asm>
3 changes: 1 addition & 2 deletions src/lib/arch/zxnext/runtime/xor32.asm → src/lib/arch/zx48k/runtime/bool/xor32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; __FASTCALL__ version (operands: A, H)
; Performs 32bit xor 32bit and returns the boolean

#include once <xor8.asm>
#include once <bool/xor8.asm>

push namespace core

Expand All @@ -25,4 +25,3 @@ __XOR32:
jp __XOR8

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/xor8.asm → src/lib/arch/zx48k/runtime/bool/xor8.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __XOR8:
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/xorf.asm → src/lib/arch/zx48k/runtime/bool/xorf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ __XORF: ; A XOR B
jp __FTOU8 ; Convert to 8 bits

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/and16.asm → src/lib/arch/zxnext/runtime/bool/and16.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ __AND16:
ret

pop namespace

0 src/lib/arch/zxnext/runtime/and32.asm → src/lib/arch/zxnext/runtime/bool/and32.asm
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/and8.asm → src/lib/arch/zxnext/runtime/bool/and8.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ __AND8:
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/andf.asm → src/lib/arch/zxnext/runtime/bool/andf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __ANDF: ; A & B
jp __FTOU8 ; Convert to 8 bits

pop namespace

2 changes: 0 additions & 2 deletions src/lib/arch/zx48k/runtime/not32.asm → src/lib/arch/zxnext/runtime/bool/not32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ __NOT32: ; A = ¬A
ret

pop namespace


1 change: 0 additions & 1 deletion src/lib/arch/zxnext/runtime/notf.asm → src/lib/arch/zxnext/runtime/bool/notf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __NOTF: ; A = ¬A
jp __FTOU8 ; Convert to 8 bits

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/or32.asm → src/lib/arch/zxnext/runtime/bool/or32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __OR32: ; Performs logical operation A AND B
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/orf.asm → src/lib/arch/zxnext/runtime/bool/orf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __ORF: ; A | B
jp __FTOU8 ; Convert to 32 bits

pop namespace

2 changes: 1 addition & 1 deletion src/lib/arch/zxnext/runtime/xor16.asm → src/lib/arch/zxnext/runtime/bool/xor16.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

; XOR16 implemented in XOR8.ASM file
#include once <xor8.asm>
#include once <bool/xor8.asm>
3 changes: 1 addition & 2 deletions src/lib/arch/zx48k/runtime/xor32.asm → src/lib/arch/zxnext/runtime/bool/xor32.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; __FASTCALL__ version (operands: A, H)
; Performs 32bit xor 32bit and returns the boolean

#include once <xor8.asm>
#include once <bool/xor8.asm>

push namespace core

Expand All @@ -25,4 +25,3 @@ __XOR32:
jp __XOR8

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/xor8.asm → src/lib/arch/zxnext/runtime/bool/xor8.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ __XOR8:
ret

pop namespace

1 change: 0 additions & 1 deletion src/lib/arch/zx48k/runtime/xorf.asm → src/lib/arch/zxnext/runtime/bool/xorf.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ __XORF: ; A XOR B
jp __FTOU8 ; Convert to 8 bits

pop namespace

Loading