mirror of
https://github.com/fadden/6502bench.git
synced 2024-09-10 13:54:52 +00:00
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.
228 lines
5.7 KiB
ArmAsm
228 lines
5.7 KiB
ArmAsm
;Edited to have duplicate labels (PROJ_ZERO, DPCODE).
|
|
!cpu 65816
|
|
CONST_ZERO = $f0 ;project const
|
|
|
|
PROJ_ZERO = $00 ;project addr
|
|
PROJ_ONE = $01 ;project addr
|
|
|
|
* = $1000
|
|
!as
|
|
!rs
|
|
ldy PROJ_ZERO
|
|
lda (PROJ_ONE),y
|
|
sta $03 ;could be PROJ_ONE+2, but "nearby" is off
|
|
ldx $04
|
|
lda CONST_ZERO,S
|
|
sta $f1,S
|
|
!zone Z00000c
|
|
.VAR_ZERO = $00
|
|
.VAR_TWO = $02
|
|
.VAR_THREE = $03
|
|
.CONST_ZERO_VAR = $f0
|
|
ldy .VAR_ZERO
|
|
lda (.VAR_ZERO+1),y
|
|
sta .VAR_THREE
|
|
ldx $04
|
|
lda .CONST_ZERO_VAR,S
|
|
sta $f1,S
|
|
eor 0
|
|
ora 240,S
|
|
!zone Z00001c
|
|
.VAR_ZERO = $00
|
|
.VAR_TWO = $02
|
|
.VAR_THREE = $03
|
|
.PROJ_ZERO_1 = $10 ;clash with project symbol
|
|
.DPCODE_1 = $80 ;clash with user label
|
|
.CONST_ZERO_VAR = $f0
|
|
lda .VAR_ZERO
|
|
lda .VAR_ZERO+1
|
|
lda .VAR_TWO
|
|
!zone Z000022
|
|
.VAR_ZERO = $00
|
|
.VAR_TWO = $02
|
|
.VAR_THREE = $03
|
|
.PROJ_ZERO_1 = $10 ;clash with project symbol
|
|
.DPCODE_1 = $80 ;clash with user label
|
|
.CONST_ZERO_VAR = $f0
|
|
lda .VAR_THREE
|
|
lda $04
|
|
lda .PROJ_ZERO_1
|
|
lda $11
|
|
lda+1 DPCODE
|
|
!zone Z00002c
|
|
ldx PROJ_ZERO
|
|
ldx PROJ_ONE
|
|
ldx $02
|
|
bit $ffa9
|
|
ldy PROJ_ZERO
|
|
ldy PROJ_ONE
|
|
ldy $02
|
|
!byte $2c
|
|
!zone Z00003c
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
L103C lda #$fe
|
|
beq L103C
|
|
ldy .NH0
|
|
ldy .NH1
|
|
ldy $02
|
|
nop
|
|
!zone Z000047
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
lda .PTR0
|
|
ldx .PTR0+1
|
|
ldy $12
|
|
lda (.CONST0,S),y
|
|
sta (.CONST0+3,S),y
|
|
;Test name redefinition. This is mostly of interest for assemblers without
|
|
;redefinable variables, but also of interest to the cross-reference window.
|
|
!zone Z000051
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR = $20 ;#1
|
|
ldx .PTR
|
|
!zone Z000053
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR = $22 ;#2
|
|
ldx .PTR
|
|
!zone Z000055
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR = $24 ;#3
|
|
ldx .PTR
|
|
@PTR_1 nop
|
|
!zone Z000058
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_A = $20
|
|
.PTR = $24 ;#3
|
|
ldy .PTR_A
|
|
!zone Z00005a
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_B = $1f
|
|
.PTR = $24 ;#3
|
|
ldy .PTR_B+1
|
|
!zone Z00005c
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR = $24 ;#3
|
|
ldy .PTR_C+3
|
|
!zone Z00005e
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
ldy .PTR_C+3
|
|
!zone Z000060
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
.VAL0 = $30
|
|
.VAL1 = $31
|
|
.VAL2 = $32
|
|
.VAL3 = $33
|
|
.VAL4 = $34
|
|
.VAL5 = $35
|
|
and .VAL0
|
|
and .VAL1
|
|
and .VAL2
|
|
and .VAL3
|
|
and .VAL4
|
|
and .VAL5
|
|
!zone Z00006c
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
.VAL0 = $30
|
|
.VAL14 = $31
|
|
.VAL5 = $35
|
|
and .VAL0
|
|
and .VAL14
|
|
and .VAL14+1
|
|
and .VAL14+2
|
|
and .VAL14+3
|
|
and .VAL5
|
|
!zone Z000078
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
.VAL0 = $30
|
|
.VAL14 = $31
|
|
.VAL5 = $35
|
|
.DPNOP = $80 ;same as org
|
|
lda+1 DPCODE
|
|
jsr DPCODE
|
|
rts
|
|
|
|
!pseudopc $0080 {
|
|
DPCODE nop
|
|
lda+1 DPCODE
|
|
lda+2 DPCODE
|
|
lda+3 DPCODE
|
|
@SPLIT1 lda #','
|
|
!zone Z00008a
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
.VAL0 = $30
|
|
.VAL14 = $31
|
|
.VAL5 = $35
|
|
.SPLITTER = $80
|
|
ldx $1234
|
|
beq @SPLIT1
|
|
@SPLIT2 lda ','
|
|
!zone Z000091
|
|
.NH0 = $00 ;not hidden
|
|
.NH1 = $01 ;not hidden
|
|
.PTR0 = $10
|
|
.CONST0 = $10
|
|
.PTR_C = $1d
|
|
.PTR_D = $21
|
|
.PTR = $24 ;#3
|
|
.VAL0 = $30
|
|
.VAL14 = $31
|
|
.VAL5 = $35
|
|
.SPLITTER = $80
|
|
ldx $5678
|
|
beq @SPLIT2
|
|
rts
|
|
|
|
} ;!pseudopc
|