mirror of
https://github.com/fadden/6502bench.git
synced 2024-06-12 08:29:29 +00:00
b387298685
In 1.5.0-dev1, as part of changes to the way label localization works, the local variable de-duplicator started checking against a filtered copy of the symbol table. Unfortunately it never re-generated the table, so a long-lived LocalVariableLookup (like the one used by LineListGen) would set up the dup map wrong and be inconsistent with other parts of the program. We now regenerate the table on every Reset(). The de-duplication stuff also had problems when opcodes and operands were double-clicked on. When the opcode is clicked, the selection should jump to the appropriate variable declaration, but it wasn't being found because the label generated in the list was in its original form. Fixed. When an instruction operand is double-clicked, the instruction operand editor opens with an "edit variable" shortcut. This was showing the de-duplicated name, which isn't necessarily a bad thing, but it was passing that value on to the DefSymbol editor, which thought it was being asked to create a new entry. Fixed. (Entering the editor through the LvTable editor works correctly, with nary a de-duplicated name in sight. You'll be forced to rename it because it'll fail the uniqueness test.) References to de-duplicated local variables were getting lost when the symbol's label was replaced (due largely to a convenient but flawed shortcut: xrefs are attached to DefSymbol objects). Fixed by linking the XrefSets. Given the many issues and their relative subtlety, I decided to make the modified names more obvious, and went back to the "_DUPn" naming strategy. (I'm also considering just making it an error and discarding conflicting entries during analysis... this is much more complicated than I expected it to be.) Quick tests can be performed in 2019-local-variables: - go to +000026, double-click on the opcode, confirm sel change - go to +000026, double-click on the operand, confirm orig name shown in shortcut and that shortcut opens editor with orig name - go to +00001a, down a line, click on PROJ_ZERO_DUP1 and confirm that it has a single reference (from +000026) - double-click on var table and confirm editing entry
113 lines
2.1 KiB
ArmAsm
113 lines
2.1 KiB
ArmAsm
.setcpu "6502"
|
|
; .segment "SEG000"
|
|
.org $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
|
|
_global: ldx #$40
|
|
__: dex
|
|
bne __
|
|
beq ___
|
|
|
|
___: ldx #$41
|
|
@__: dex
|
|
bne @__
|
|
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_DUP1 .set $11
|
|
_under1 .set $12
|
|
__dub1 .set $13
|
|
lda plain_DUP1
|
|
lda _under1
|
|
lda __dub1
|
|
@plain: lda @plain
|
|
plain: lda plain
|
|
global8: dex
|
|
bne plain
|
|
X_under1: lda X_under1
|
|
@X__dub1: lda @X__dub1
|
|
_under1 .set $22
|
|
lda plain_DUP1
|
|
lda _under1
|
|
rts
|
|
|