clean up edasm.

This commit is contained in:
Kelvin Sherlock 2017-09-16 21:11:32 -04:00
parent 3398e38ef4
commit 9d819c5f89
2 changed files with 8 additions and 20 deletions

View File

@ -35,4 +35,8 @@ contexts:
mnemonics-65c02-m740: mnemonics-65c02-m740:
- match: \b(?i:CLT|COM|LDM|RRF|SET|TST)\b - match: \b(?i:CLT|COM|LDM|RRF|SET|TST)\b
scope: keyword.mnemonic.m740 scope: keyword.mnemonic.m740
mnemonics-sweet16:
- match: \b(?i:RTN|SET|LD|LDD|ST|STD|POP|POPD|STP|ADD|SUB|CPR|INR|DCR|BR|BNC|BC|BP|BM|BZ|BNZ|BM1|BNM1|BK|RS|BS)\b
scope: keyword.mnemonic.sweet16

View File

@ -13,9 +13,7 @@ contexts:
- include: comment - include: comment
- include: registers - include: registers
main: main:
- include: label
label:
- match: '{{ws}}' - match: '{{ws}}'
push: opcode push: opcode
@ -33,8 +31,9 @@ contexts:
- match: '{{ws}}' - match: '{{ws}}'
set: operand set: operand
- include: mnemonics-6502
- include: mnemonics-65c02 - include: scope:source.asm.65816#mnemonics-6502
- include: scope:source.asm.65816#mnemonics-65c02
- match: \b((?i)ASC|STR|DCI|CHR)\b - match: \b((?i)ASC|STR|DCI|CHR)\b
scope: keyword.directive scope: keyword.directive
@ -96,21 +95,6 @@ contexts:
- match: \b(?i:A|X|Y)\b - match: \b(?i:A|X|Y)\b
scope: variable.language.register scope: variable.language.register
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-6502-alt:
- match: \b(?i:BLT|BGE|DEA|INA|LSL)\b
scope: keyword.mnemonic.6502-alt
mnemonics-sweet16:
- match: \b(?i:RTN|SET|LD|LDD|ST|STD|POP|POPD|STP|ADD|SUB|CPR|INR|DCR|BR|BNC|BC|BP|BM|BZ|BNZ|BM1|BNM1|BK|RS|BS)\b
scope: keyword.mnemonic.65c02
expect-comment: expect-comment:
- include: comment - include: comment