mirror of
https://github.com/ksherlock/65816.tmbundle.git
synced 2024-06-15 12:29:29 +00:00
fixup ninja force, edasm.
This commit is contained in:
parent
db5fb2e8cf
commit
63b2c68f66
|
@ -12,7 +12,10 @@ contexts:
|
||||||
prototype:
|
prototype:
|
||||||
- include: comment
|
- include: comment
|
||||||
- include: registers
|
- include: registers
|
||||||
|
- include: eol
|
||||||
|
|
||||||
main:
|
main:
|
||||||
|
- meta_include_prototype: false
|
||||||
|
|
||||||
- match: '{{ws}}'
|
- match: '{{ws}}'
|
||||||
push: opcode
|
push: opcode
|
||||||
|
@ -141,3 +144,7 @@ contexts:
|
||||||
- match: \n
|
- match: \n
|
||||||
scope: invalid.illegal.newline.asm
|
scope: invalid.illegal.newline.asm
|
||||||
pop: true
|
pop: true
|
||||||
|
|
||||||
|
eol:
|
||||||
|
- match: '$'
|
||||||
|
pop: true
|
||||||
|
|
|
@ -9,11 +9,12 @@ variables:
|
||||||
ident: '[A-Za-z_][A-Za-z0-9_]*'
|
ident: '[A-Za-z_][A-Za-z0-9_]*'
|
||||||
|
|
||||||
contexts:
|
contexts:
|
||||||
|
prototype:
|
||||||
|
- include: comment
|
||||||
|
- include: eol
|
||||||
|
|
||||||
main:
|
main:
|
||||||
- include: label
|
- meta_include_prototype: false
|
||||||
|
|
||||||
|
|
||||||
label:
|
|
||||||
|
|
||||||
- match: '{{ws}}'
|
- match: '{{ws}}'
|
||||||
push: opcode
|
push: opcode
|
||||||
|
@ -36,11 +37,10 @@ contexts:
|
||||||
opcode:
|
opcode:
|
||||||
- match: '{{ws}}'
|
- match: '{{ws}}'
|
||||||
set: operand
|
set: operand
|
||||||
- include: comment
|
- include: scope:source.asm.65816#mnemonics-6502
|
||||||
- include: mnemonics-6502
|
- include: scope:source.asm.65816#mnemonics-65c02
|
||||||
- include: mnemonics-65c02
|
- include: scope:source.asm.65816#mnemonics-65816
|
||||||
- include: mnemonics-65816
|
- include: scope:source.asm.65816#mnemonics-65816-long
|
||||||
- include: mnemonics-65816-long
|
|
||||||
- include: mnemonics-65816-alt
|
- include: mnemonics-65816-alt
|
||||||
|
|
||||||
# toolbox macros
|
# toolbox macros
|
||||||
|
@ -74,27 +74,23 @@ contexts:
|
||||||
|
|
||||||
|
|
||||||
operand:
|
operand:
|
||||||
- include: comment
|
|
||||||
- include: numbers
|
- include: numbers
|
||||||
- include: strings
|
- include: strings
|
||||||
- include: macro-parm
|
- include: macro-parm
|
||||||
|
|
||||||
operand-string:
|
operand-string:
|
||||||
- include: comment
|
|
||||||
- include: strings
|
- include: strings
|
||||||
|
|
||||||
- match: \S
|
- match: \S
|
||||||
scope: invalid.illegal.operand
|
scope: invalid.illegal.operand
|
||||||
|
|
||||||
operand-hex:
|
operand-hex:
|
||||||
- include: comment
|
|
||||||
- match: '[0-9A-Fa-f]{1,2}'
|
- match: '[0-9A-Fa-f]{1,2}'
|
||||||
scope: constant.numeric.hex
|
scope: constant.numeric.hex
|
||||||
- match: '[^ \t,]'
|
- match: '[^ \t,]'
|
||||||
scope: invalid.illegal.operand
|
scope: invalid.illegal.operand
|
||||||
|
|
||||||
operand-on-off:
|
operand-on-off:
|
||||||
- include: comment
|
|
||||||
- match: \b(?i:ON|OFF)\b
|
- match: \b(?i:ON|OFF)\b
|
||||||
scope: constant.language
|
scope: constant.language
|
||||||
- match: \S
|
- match: \S
|
||||||
|
@ -107,21 +103,6 @@ contexts:
|
||||||
- match: \n
|
- match: \n
|
||||||
pop: true
|
pop: true
|
||||||
|
|
||||||
mnemonics-6502:
|
|
||||||
- match: \b(?i:ADC|AND|ASL|BCC|BCS|BEQ|BIT|BMI|BNE|BPL|BRK|BVC|BVS|CLC|CLD|CLI|CLV|CMP|CPX|CPY|DEC|DEX|DEY|EOR|INC|INX|INY|JMP|JSR|LDA|LDX|LDY|LSR|NOP|ORA|PHA|PHP|PLA|PLP|ROL|ROR|RTI|RTS|SBC|SEC|SED|SEI|STA|STX|STY|TAX|TAY|TSX|TXA|TXS|TYA)\b
|
|
||||||
scope: keyword.mnemonic.6502
|
|
||||||
|
|
||||||
mnemonics-65c02:
|
|
||||||
- match: \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b
|
|
||||||
scope: keyword.mnemonic.65c02
|
|
||||||
|
|
||||||
mnemonics-65816:
|
|
||||||
- match: \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b
|
|
||||||
scope: keyword.mnemonic.65816
|
|
||||||
|
|
||||||
mnemonics-65816-long:
|
|
||||||
- match: \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b
|
|
||||||
scope: keyword.mnemonic.65816.long
|
|
||||||
|
|
||||||
mnemonics-65816-alt:
|
mnemonics-65816-alt:
|
||||||
- match: \b(?i:BLT|BGE)\b
|
- match: \b(?i:BLT|BGE)\b
|
||||||
|
@ -144,11 +125,16 @@ contexts:
|
||||||
- match: '"'
|
- match: '"'
|
||||||
scope: punctuation.definition.string.begin
|
scope: punctuation.definition.string.begin
|
||||||
push:
|
push:
|
||||||
|
- meta_include_prototype: false
|
||||||
|
- meta_scope: string.quoted.double
|
||||||
- match: '"'
|
- match: '"'
|
||||||
scope: punctuation.definition.string.end
|
scope: punctuation.definition.string.end
|
||||||
pop: true
|
pop: true
|
||||||
- match: \n
|
- match: '\n'
|
||||||
scope: invalid.illegal.newline.asm
|
scope: invalid.illegal.newline.asm
|
||||||
pop: true
|
pop: true
|
||||||
- match: .
|
|
||||||
scope: string.quoted.double
|
|
||||||
|
eol:
|
||||||
|
- match: '$'
|
||||||
|
pop: true
|
||||||
|
|
Loading…
Reference in New Issue
Block a user