Skip to content

Feature/update label mangling #525

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 3 commits into from
Apr 26, 2021
Merged

Feature/update label mangling #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd6bdba
Remove Nextlib
boriel Apr 19, 2021
5da6dbe
Set new mangling for labels
boriel Apr 19, 2021
84dbfc8
Update tests
boriel Apr 19, 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
1,966 changes: 0 additions & 1,966 deletions src/arch/zxnext/library/nextlib.bas
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/symbols/label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


class SymbolLABEL(SymbolVAR):
prefix = '__LABEL__'
prefix = '_'

def __init__(self, name, lineno):
super().__init__(name, lineno)
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/053opt.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ _sail:
pop af
call .core.__LTI8
or a
jp nz, .LABEL.__LABEL__enddispara
jp nz, .LABEL._enddispara
.LABEL.__LABEL9:
.LABEL.__LABEL7:
.LABEL.__LABEL5:
.LABEL.__LABEL3:
.LABEL.__LABEL1:
jp .LABEL.__LABEL__enddispara
jp .LABEL._enddispara
.core.__END_PROGRAM:
di
ld hl, (.core.__CALL_BACK__)
Expand All @@ -71,7 +71,7 @@ _sail:
pop ix
ei
ret
.LABEL.__LABEL__enddispara:
.LABEL._enddispara:
ld hl, 0
ld b, h
ld c, l
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/12.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ _a:
DEFB 00
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__100:
.LABEL._100:
ld hl, 0
ld b, h
ld c, l
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/13.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ _a:
DEFB 00
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__mylabel:
.LABEL._mylabel:
ld hl, 0
ld b, h
ld c, l
Expand Down
12 changes: 6 additions & 6 deletions tests/functional/arrlabels.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ _a:
_a.__DATA__.__PTR__:
DEFW _a.__DATA__
_a.__DATA__:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
.LABEL.__LABEL0:
DEFW 0000h
DEFB 02h
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
ld hl, (_a.__DATA__ + 0)
push hl
ld a, 5
Expand Down
12 changes: 6 additions & 6 deletions tests/functional/arrlabels4.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
call _test
ld hl, 0
ld b, h
Expand Down Expand Up @@ -655,7 +655,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
DEFB 00h
DEFB 02h
.LABEL.__LABEL1:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
END
12 changes: 6 additions & 6 deletions tests/functional/arrlabels5.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ _test:
ld de, .LABEL.__LABEL0
ld bc, 6
call .core.__ALLOC_INITIALIZED_LOCAL_ARRAY
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
ld l, (ix-2)
ld h, (ix-1)
ld a, (hl)
Expand Down Expand Up @@ -655,7 +655,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
DEFB 00h
DEFB 02h
.LABEL.__LABEL1:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
END
12 changes: 6 additions & 6 deletions tests/functional/arrlabels6.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ _a:
_a.__DATA__.__PTR__:
DEFW _a.__DATA__
_a.__DATA__:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
.LABEL.__LABEL0:
DEFW 0000h
DEFB 02h
Expand All @@ -36,9 +36,9 @@ _a.__DATA__:
ld a, 5
pop hl
ld (hl), a
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
ld hl, 0
ld b, h
ld c, l
Expand Down
12 changes: 6 additions & 6 deletions tests/functional/arrlabels7.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ _test:
ld a, 5
pop hl
ld (hl), a
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
_test__leave:
ex af, af'
exx
Expand Down Expand Up @@ -655,7 +655,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
DEFB 00h
DEFB 02h
.LABEL.__LABEL1:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
END
12 changes: 6 additions & 6 deletions tests/functional/arrlabels8.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
call _test
ld hl, 0
ld b, h
Expand Down Expand Up @@ -655,7 +655,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
DEFB 00h
DEFB 02h
.LABEL.__LABEL1:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
END
12 changes: 6 additions & 6 deletions tests/functional/arrlabels9.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__label1:
.LABEL.__LABEL__label2:
.LABEL.__LABEL__label3:
.LABEL._label1:
.LABEL._label2:
.LABEL._label3:
call _test
ld hl, 0
ld b, h
Expand Down Expand Up @@ -655,7 +655,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
DEFB 00h
DEFB 02h
.LABEL.__LABEL1:
DEFW .LABEL.__LABEL__label1
DEFW .LABEL.__LABEL__label2
DEFW .LABEL.__LABEL__label3
DEFW .LABEL._label1
DEFW .LABEL._label2
DEFW .LABEL._label3
END
2 changes: 1 addition & 1 deletion tests/functional/atlabel1.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__mylabel:
.LABEL._mylabel:
_radians:
ld a, 082h
ld de, 00000h
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/atlabel2.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__b:
.LABEL._b:
ld hl, 0
ld b, h
ld c, l
Expand All @@ -41,7 +41,7 @@ _test:
add ix, sp
ld hl, 0
push hl
ld hl, .LABEL.__LABEL__b
ld hl, .LABEL._b
ld (ix-2), l
ld (ix-1), h
_test__leave:
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/atlabel3.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ _test:
add ix, sp
ld hl, 0
push hl
ld hl, .LABEL.__LABEL__b
ld hl, .LABEL._b
ld (ix-2), l
ld (ix-1), h
_test__leave:
Expand All @@ -51,7 +51,7 @@ _test2:
push ix
ld ix, 0
add ix, sp
.LABEL.__LABEL__b:
.LABEL._b:
_test2__leave:
ld sp, ix
pop ix
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/break.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ _a:
DEFB 00
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__10:
.LABEL._10:
push hl
ld hl, 4
call .core.CHECK_BREAK
.LABEL.__LABEL__20:
.LABEL._20:
ld a, 1
ld (_a), a
push hl
ld hl, 5
call .core.CHECK_BREAK
.LABEL.__LABEL__30:
.LABEL._30:
ld a, 2
ld (_a), a
inc a
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/data1.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ _a:
call .core.__READ
ld hl, _a
call .core.__STOREF
.LABEL.__LABEL__1010:
.LABEL.__LABEL__4500:
.LABEL._1010:
.LABEL._4500:
ld hl, .DATA.__DATA__1
call .core.__RESTORE
.LABEL.__LABEL__5000:
.LABEL._5000:
ld hl, 0
ld b, h
ld c, l
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/dim_arr_at_label0.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
.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
_a.__DATA__ EQU .LABEL.__LABEL__c
_a.__DATA__ EQU .LABEL._c
_a:
DEFW .LABEL.__LABEL0
_a.__DATA__.__PTR__:
DEFW .LABEL.__LABEL__c
DEFW .LABEL._c
.LABEL.__LABEL0:
DEFW 0000h
DEFB 01h
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__c:
.LABEL._c:
ld hl, 0
ld b, h
ld c, l
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/dim_arr_at_label1.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
.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
_a.__DATA__ EQU (.LABEL.__LABEL__c) + (1)
_a.__DATA__ EQU (.LABEL._c) + (1)
_a:
DEFW .LABEL.__LABEL0
_a.__DATA__.__PTR__:
DEFW (.LABEL.__LABEL__c) + (1)
DEFW (.LABEL._c) + (1)
.LABEL.__LABEL0:
DEFW 0000h
DEFB 01h
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__c:
.LABEL._c:
ld hl, 0
ld b, h
ld c, l
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/dim_at_label0.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__somelabel:
.LABEL._somelabel:
_x:
ld hl, 0
ld b, h
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/dim_at_label1.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
.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
_x EQU (.LABEL.__LABEL__somelabel) + (1)
_x EQU (.LABEL._somelabel) + (1)
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__somelabel:
.LABEL._somelabel:
ld hl, 0
ld b, h
ld c, l
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/dim_at_label2.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
.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
_x EQU (.LABEL.__LABEL__somelabel) + (1)
_x EQU (.LABEL._somelabel) + (1)
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__somelabel:
.LABEL._somelabel:
ld hl, 0
ld b, h
ld c, l
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/dim_at_label3.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA
.core.ZXBASIC_USER_DATA_END:
.core.__MAIN_PROGRAM__:
.LABEL.__LABEL__somelabel:
.LABEL._somelabel:
_x:
ld hl, 0
ld b, h
Expand Down
Loading