6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-08-13 12:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Implement local variables for cc65

Browse Source 
I'd apparently overlooked the ".set" directive, which seems to do
exactly what we need.
This commit is contained in:
Andy McFadden 2019-09-01 18:14:39 -07:00
parent 9a61a852ad
commit 14b215b76d
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SourceGen/AsmGen/AsmCc65.cs
View File

@ -103,7 +103,7 @@ namespace SourceGen.AsmGen {
private static PseudoOp.PseudoOpNames sDataOpNames =
new PseudoOp.PseudoOpNames(new Dictionary<string, string> {
{ "EquDirective", "=" },
//VarDirective
{ "VarDirective", ".set" },
{ "OrgDirective", ".org" },
//RegWidthDirective // .a8, .a16, .i8, .i16
{ "DefineData1", ".byte" },
@ -164,8 +164,6 @@ namespace SourceGen.AsmGen {
// Special handling for forward references to zero-page labels is required.
Quirks.SinglePassAssembler = true;
Quirks.NoRedefinableSymbols = true;
mWorkDirectory = workDirectory;
mFileNameBase = fileNameBase;
Settings = settings;
@ -515,8 +513,9 @@ namespace SourceGen.AsmGen {
string valueStr = PseudoOp.FormatNumericOperand(SourceFormatter,
Project.SymbolTable, null, defSym.DataDescriptor, defSym.Value, 1,
PseudoOp.FormatNumericOpFlags.None);
OutputEquDirective(SourceFormatter.FormatVariableLabel(defSym.Label),
valueStr, defSym.Comment);
OutputLine(SourceFormatter.FormatVariableLabel(defSym.Label),
SourceFormatter.FormatPseudoOp(sDataOpNames.VarDirective),
valueStr, SourceFormatter.FormatEolComment(defSym.Comment));
}
}
@ -569,6 +568,8 @@ namespace SourceGen.AsmGen {
// that cc65 users will expect.
if (!string.IsNullOrEmpty(label) && label[0] != '.' &&
!string.Equals(opcode, sDataOpNames.EquDirective,
StringComparison.InvariantCultureIgnoreCase) &&
!string.Equals(opcode, sDataOpNames.VarDirective,
StringComparison.InvariantCultureIgnoreCase)) {
label += ':';

54
SourceGen/SGTestData/Expected/2019-local-variables_cc65.S
View File

@ -14,10 +14,10 @@ CONST_ZERO = $f0 ;project const
ldx $04
lda CONST_ZERO,S
sta $f1,S
VAR_ZERO = $00
VAR_TWO = $02
VAR_THREE = $03
CONST_ZERO_VAR = $f0
VAR_ZERO .set $00
VAR_TWO .set $02
VAR_THREE .set $03
CONST_ZERO_VAR .set $f0
ldy VAR_ZERO
lda (VAR_ZERO+1),y
sta VAR_THREE
@ -26,8 +26,8 @@ CONST_ZERO_VAR = $f0
sta $f1,S
eor 0
ora 240,S
PROJ_ZERO_DUP1 = $10 ;clash with project symbol
DPCODE_DUP1 = $80 ;clash with user label
PROJ_ZERO_DUP1 .set $10 ;clash with project symbol
DPCODE_DUP1 .set $80 ;clash with user label
lda VAR_ZERO
lda VAR_ZERO+1
lda VAR_TWO
@ -44,16 +44,16 @@ DPCODE_DUP1 = $80 ;clash with user label
ldy PROJ_ONE
ldy $02
.byte $2c
NH0 = $00 ;not hidden
NH1 = $01 ;not hidden
NH0 .set $00 ;not hidden
NH1 .set $01 ;not hidden
L103C: lda #$fe
beq L103C
ldy NH0
ldy NH1
ldy $02
nop
PTR0 = $10
CONST0 = $10
PTR0 .set $10
CONST0 .set $10
lda PTR0
ldx PTR0+1
ldy $12
@ -61,41 +61,41 @@ CONST0 = $10
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 = $20 ;#1
PTR .set $20 ;#1
ldx PTR
PTR .set $22 ;#2
ldx PTR
PTR .set $24 ;#3
ldx PTR
PTR_3 = $22 ;#2
ldx PTR_3
PTR_4 = $24 ;#3
ldx PTR_4
PTR_1: nop
PTR_A = $20
PTR_A .set $20
ldy PTR_A
PTR_B = $1f
PTR_B .set $1f
ldy PTR_B+1
PTR_C = $1d
PTR_C .set $1d
ldy PTR_C+3
PTR_D = $21
PTR_D .set $21
ldy PTR_C+3
VAL0 = $30
VAL1 = $31
VAL2 = $32
VAL3 = $33
VAL4 = $34
VAL5 = $35
VAL0 .set $30
VAL1 .set $31
VAL2 .set $32
VAL3 .set $33
VAL4 .set $34
VAL5 .set $35
and VAL0
and VAL1
and VAL2
and VAL3
and VAL4
and VAL5
VAL14 = $31
VAL14 .set $31
and VAL0
and VAL14
and VAL14+1
and VAL14+2
and VAL14+3
and VAL5
DPNOP = $80 ;same as org
DPNOP .set $80 ;same as org
lda z:DPCODE
jsr DPCODE
rts