6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-12-02 13:51:36 +00:00
Code Issues Projects Releases Wiki Activity
4b19a029a9
6502bench/SourceGen/SGTestData/Expected/2019-local-variables_64tass.S

120 lines
2.8 KiB
ArmAsm
Raw Normal View History

Handle variable labels that are duplicates of non-variables After thrashing around a bit, I had to choose between making the uniquifier more complicated, or making de-duplication a separate step. Since I don't really expect duplicates to be a thing, I went with the latter. Updated the regression test.
2019-09-01 04:54:20 +00:00
;Edited to have duplicate labels (PROJ_ZERO, DPCODE).
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
.cpu "65816"
Work around two assembler issues Most assemblers end local label scope when a global label is encountered. cc65 takes this one step further by ending local label scope when constants or variables are defined. So, if we have a variable table with a nonzero number of entries, we want to create a fake global label at that point to end the scope. Merlin 32 won't let you write " LDA #',' ". For some reason the comma causes an error. IGenerator now has a "tweak operand format" interface that lets us fix that.
2019-09-20 21:05:17 +00:00
.enc sg_ascii
.cdef $20,$7e,$20
Change some EQU handling Changed the sort order on EQU lines so that constants come before address definitions. This caused trivial changes to three of the regression tests. Added the ability to jump directly to an EQU line when an opcode is double-clicked on.
2019-10-10 20:49:21 +00:00
CONST_ZERO = $f0 ;project const
Add a blank line between constants and addresses In the assembler output, add a blank line between the constants and addresses in the long list of equates. The earlier change that corrected the BIT instruction caused test 2009-branches-and-banks to fail, because it was relying on the idea that BIT made the carry flag indeterminate. Changing a BCC to a BVS restored the desired behavior.
2019-10-23 05:43:10 +00:00
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
PROJ_ZERO = $00 ;project addr
PROJ_ONE = $01 ;project addr
* = $1000
.as
.xs
ldy PROJ_ZERO
lda (PROJ_ONE),y
Apply project/platform symbols to Numeric/Address data operands A ".dd2 <address>" item would get linked to an internal label, but references to external addresses weren't doing the appropriate search through the platform/project symbol list. This change altered the output of the 2019-local-variables test. The previous behavior was restored by disabling "nearby" symbol matching in the project properties. Updated the "lookup symbol by address" function to ignore local variables. Also, minor updates to Applesoft and F8-ROM symbol tables.
2019-09-15 21:19:45 +00:00
sta $03 ;could be PROJ_ONE+2, but "nearby" is off
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
ldx $04
lda CONST_ZERO,s
sta $f1,s
VAR_ZERO .var $00
VAR_TWO .var $02
VAR_THREE .var $03
CONST_ZERO_VAR .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
Label rework, part 6 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.
2019-11-18 21:26:03 +00:00
PROJ_ZERO_1 .var $10 ;clash with project symbol
DPCODE_1 .var $80 ;clash with user label
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
lda VAR_ZERO
lda VAR_ZERO+1
lda VAR_TWO
lda VAR_THREE
lda $04
Label rework, part 6 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.
2019-11-18 21:26:03 +00:00
lda PROJ_ZERO_1
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
lda $11
lda DPCODE
ldx PROJ_ZERO
ldx PROJ_ONE
ldx $02
bit $ffa9
ldy PROJ_ZERO
ldy PROJ_ONE
ldy $02
.byte $2c
NH0 .var $00 ;not hidden
NH1 .var $01 ;not hidden
L103C lda #$fe
beq L103C
ldy NH0
ldy NH1
ldy $02
nop
PTR0 .var $10
CONST0 .var $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.
PTR .var $20 ;#1
ldx PTR
PTR .var $22 ;#2
ldx PTR
PTR .var $24 ;#3
ldx PTR
Work around two assembler issues Most assemblers end local label scope when a global label is encountered. cc65 takes this one step further by ending local label scope when constants or variables are defined. So, if we have a variable table with a nonzero number of entries, we want to create a fake global label at that point to end the scope. Merlin 32 won't let you write " LDA #',' ". For some reason the comma causes an error. IGenerator now has a "tweak operand format" interface that lets us fix that.
2019-09-20 21:05:17 +00:00
_PTR_1 nop
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
PTR_A .var $20
ldy PTR_A
PTR_B .var $1f
ldy PTR_B+1
PTR_C .var $1d
ldy PTR_C+3
PTR_D .var $21
ldy PTR_C+3
VAL0 .var $30
VAL1 .var $31
VAL2 .var $32
VAL3 .var $33
VAL4 .var $34
VAL5 .var $35
and VAL0
and VAL1
and VAL2
and VAL3
and VAL4
and VAL5
VAL14 .var $31
and VAL0
and VAL14
and VAL14+1
and VAL14+2
and VAL14+3
and VAL5
DPNOP .var $80 ;same as org
lda DPCODE
jsr DPCODE
rts
.logical $0080
DPCODE nop
lda DPCODE
lda @wDPCODE
lda @lDPCODE
Work around two assembler issues Most assemblers end local label scope when a global label is encountered. cc65 takes this one step further by ending local label scope when constants or variables are defined. So, if we have a variable table with a nonzero number of entries, we want to create a fake global label at that point to end the scope. Merlin 32 won't let you write " LDA #',' ". For some reason the comma causes an error. IGenerator now has a "tweak operand format" interface that lets us fix that.
2019-09-20 21:05:17 +00:00
_SPLIT1 lda #','
SPLITTER .var $80
ldx $1234
beq _SPLIT1
_SPLIT2 lda ','
ldx $5678
beq _SPLIT2
Add 2019-local-variables test This hits most of the edge cases, but doesn't exercise the two duplicate name situations (var name same as user label, var name same as project/platform symbol). Also, fixed a bug in the EditDefSymbol uniqueness check where it was comparing a symbol to itself.
2019-09-01 03:32:43 +00:00
rts
.here
Reference in New Issue Copy Permalink