mirror of
https://github.com/fadden/6502bench.git
synced 2024-07-14 05:28:55 +00:00
d3670c48e8
Correct handling of local variables. We now correctly uniquify them with regard to non-unique labels. Because local vars can effectively have global scope we mostly want to treat them as global, but they're uniquified relative to other globals very late in the process, so we can't just throw them in the symbol table and be done. Fortunately local variables exist in a separate namespace, so we just need to uniquify the variables relative to the post-localization symbol table. In other words, we take the symbol table, apply the label map, and rename any variable that clashes. This also fixes an older problem where we weren't masking the leading '_' on variable labels when generating 64tass output. The code list now makes non-unique labels obvious, but you can't tell the difference between unique global and unique local. What's more, the default type value in Edit Label is now adjusted to Global for unique locals that were auto-generated. To make it a bit easier to figure out what's what, the Info panel now has a "label type" line that reports the type. The 2023-non-unique-labels test had some additional tests added to exercise conflicts with local variables. The 2019-local-variables test output changed slightly because the de-duplicated variable naming convention was simplified.
112 lines
2.0 KiB
ArmAsm
112 lines
2.0 KiB
ArmAsm
.cpu "6502"
|
|
* = $1000
|
|
L1000 lda #$00
|
|
_L1000 lda #$01
|
|
ldx L1000
|
|
ldy _L1000
|
|
ldx #$02
|
|
loop1 dex
|
|
bne loop1
|
|
ldx #$03
|
|
_loop1 dex
|
|
bne _loop1
|
|
global1 nop
|
|
ldx #$04
|
|
_loop ldy #$05
|
|
_loop1 dey
|
|
bne _loop1
|
|
dex
|
|
bne _loop
|
|
jmp loop
|
|
|
|
global2 .byte $ea
|
|
|
|
loop nop
|
|
global3 nop
|
|
ldx #$06
|
|
ldy #$07
|
|
dex
|
|
beq _fwd1
|
|
dey
|
|
beq _fwd2
|
|
_fwd1 nop
|
|
_fwd2 nop
|
|
global4 nop
|
|
ldx #$08
|
|
loop2 dex
|
|
global5 nop
|
|
bne loop2
|
|
nop
|
|
global6 nop
|
|
_spin1 jsr _spin2
|
|
_spin2 jsr _spin1
|
|
nop
|
|
_spin11 lda _spin1+7
|
|
beq _spin11
|
|
lda #<_spin1
|
|
ldx #<_spin2
|
|
lda #>_spin1
|
|
ldx #>_spin2
|
|
bne _skip
|
|
|
|
.word _spin1
|
|
.word _spin2
|
|
.word _spin11
|
|
.byte <_spin1
|
|
.byte <_spin2
|
|
.byte >_spin1
|
|
.byte >_spin2
|
|
|
|
_skip nop
|
|
global_ nop
|
|
X_global ldx #$40
|
|
X__ dex
|
|
bne X__
|
|
beq X___
|
|
|
|
X___ ldx #$41
|
|
_X__ dex
|
|
bne _X__
|
|
nop
|
|
anno lda #$42
|
|
T106B lda anno
|
|
clc
|
|
bcc _skip
|
|
|
|
.word T106B
|
|
|
|
_skip nop
|
|
JMP1 lda JMP1
|
|
JMP0 lda JMP0
|
|
JMP11 lda JMP11
|
|
_JMP lda _JMP
|
|
_JMP0 lda _JMP0
|
|
_JMP1 lda _JMP1
|
|
_JMP2 lda _JMP2
|
|
jmp1 lda jmp1
|
|
Jmp1 lda Jmp1
|
|
BRA lda BRA
|
|
brl lda brl
|
|
LDAL .byte $af
|
|
.byte $95
|
|
.byte $10
|
|
.byte $00
|
|
nop
|
|
plain_1 .var $11
|
|
X_under1_1 .var $12
|
|
X__dub1 .var $13
|
|
lda plain_1
|
|
lda X_under1_1
|
|
lda X__dub1
|
|
_plain lda _plain
|
|
plain lda plain
|
|
global8 dex
|
|
bne plain
|
|
X_under1 lda X_under1
|
|
_X__dub1 lda _X__dub1
|
|
X_under1_1 .var $22
|
|
lda plain_1
|
|
lda X_under1_1
|
|
rts
|
|
|