Merge branch 'develop'

This commit is contained in:
Georg Ziegler 2018-06-12 09:52:03 +02:00
commit fad43e3b4a
4 changed files with 319 additions and 16 deletions

View File

@ -3,7 +3,8 @@
Adds syntax highlighting to 65816/65C816/65802/6502/65C02 files in Atom, with extra support for various compilers:
- [ACME Crossassembler](https://sourceforge.net/projects/acme-crossass/)
- [cc65 (SNES Syntax: 65816, SPC700, SuperFX)](http://oliverschmidt.github.io/cc65/)
- [Asar SNES Assembler](https://github.com/RPGHacker/asar)
- [cc65 (SNES Syntax: 65816, SPC700, SuperFX)](https://github.com/cc65/cc65)
- [DASM](http://dasm-dillon.sourceforge.net/) (6502)
- [EDASM](https://archive.org/details/EDASM-ProDOS_Assembler_Tools_Manual)
- [Merlin](http://en.wikipedia.org/wiki/Merlin_(assembler))

196
grammars/asar.cson Normal file
View File

@ -0,0 +1,196 @@
# Adds Syntax highlighting for the Asar SNES Assembler
scopeName: 'source.assembly.65816.asar'
fileTypes: [
'asm'
]
name: 'Asar SNES Assembler'
patterns: [
{ include: 'source.65816-opcodes' }
{ include: 'source.65816l-opcodes' }
{ include: 'source.65816alt-opcodes' }
{ include: '#comments' }
{ include: '#symbols' }
{ include: '#directives' }
]
# Repository starts here ------------------------------------------------------
repository:
# comments
comments:
patterns: [
# semicolon line comment
{
match: ';.*$'
name: 'comment.line.semicolon.asar'
}
]
# symbols
symbols:
patterns: [
# delimited strings
{
begin: '"'
beginCaptures:
0: name: 'punctuation.definition.string.begin.asar'
end: '"'
endCaptures:
0: name: 'punctuation.definition.string.end.asar'
name: 'string.quoted.double.assembly.asar'
}
# labels
{
captures:
1: name: 'entity.name.function.label.asar'
2: name: 'entity.name.function.label.asar'
match: '(\\.*)\\b([A-Za-z0-9_]+):'
name: 'meta.label.asar'
}
# defines
{
captures:
1: name: 'keyword.operator.asar'
2: name: 'entity.name.function.label.asar'
match: '(!)\\b([A-Za-z0-9_]+)\\b'
name: 'meta.define.asar'
}
# absolut address/number
{
match: '\\#(\'.\'|[^\\s\']+)'
name: 'constant.numeric.hex.asar'
}
# hex, prefixed with ampersand($)
{
match: '-?\\$[A-Fa-f0-9]+'
name: 'constant.numeric.hex.asar'
}
# binary
{
match: '-?%[01]+'
name: 'constant.numeric.binary.asar'
}
# decimal
{
match: '-?\\b([0-9]+)\\b'
name: 'constant.numeric.decimal.asar'
}
]
# assembler directives
directives:
patterns: [
# arch command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'constant.language.asar'
match: '\\b(arch)\\s+(65816|spc700(-inline)?|superfx)'
name: 'meta.arch.directive.asar'
}
# warn xkas command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'support.function.pseudo.asar'
3: name: 'constant.language.asar'
match: '\\b(warn)\\s+(xkas)\\s+(on|off)\\b'
name: 'meta.warn.directive.asar'
}
# math command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'support.function.pseudo.asar'
3: name: 'constant.language.asar'
match: '\\b(math)\\s+(pri|round)\\s+(on|off)\\b'
name: 'meta.math.directive.asar'
}
# namespace command
{
begin: '\\b(namespace)\\b'
captures:
1:
name: 'support.function.pseudo.asar'
end: '$'
name: 'meta.namespace.directive.asar'
patterns: [
# nested
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'constant.language.asar'
match: '\\b(nested)\\s+(on|off)\\b'
name: 'meta.namespace.nested.asar'
}
# off
{
match: '\\b(off)\\b'
name: 'constant.language.asar'
}
# identifier
{
match: '\\b[a-zA-Z0-9_]+\\b'
name: 'entity.name.function.label.asar'
}
]
}
# base command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'constant.language.asar'
match: '\\b(base)\\s+(off)*'
name: 'meta.base.directive.asar'
}
# bank command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'constant.language.asar'
match: '\\b(bank)\\s+(noassume|auto)*'
name: 'meta.bank.directive.asar'
}
# struct command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'entity.name.function.label.asar'
3: name: 'constant.numeric.hex.asar'
match: '\\b(struct)\\s+([a-zA-Z0-9_]+)\\s+(\\S+)\\b'
name: 'meta.struct.directive.asar'
}
# endstruct command
{
captures:
1: name: 'support.function.pseudo.asar'
2: name: 'support.function.pseudo.asar'
3: name: 'constant.numeric.decimal.asar'
match: '\\b(endstruct)\\s+(align)*\\s+(\\S+)*'
name: 'meta.struct.directive.asar'
}
# data control
{
match: '\\b(inc(bin|src)|(push|pull)(pc|base)|warnpc|skip|asar|org|rep|d[bdlw]|(ex)?(lo|hi)rom|(full)?sa1rom|(no|sfx)rom|function)\\b'
name: 'support.function.pseudo.asar'
}
# conditional control
{
match: '\\b((end)?if)\\b'
name: 'keyword.control.conditional.asar'
}
# macro control
# TODO: fix identifier
{
match: '\\b((end)?macro)\\b'
# name: 'support.function.pseudo.asar'
name: 'keyword.directive.macro.asar'
}
# operators
{
match: '[-+/*^><|#\\[\\](),=.!&]'
name: 'keyword.operator.asar'
}
# TODO: Add built-in functions
]

View File

@ -48,7 +48,7 @@ repository:
}
# hex, suffixed with h(h)
{
match: '-?\\b([a-fA-F0-9]+)h'
match: '-?\\b([a-fA-F0-9]+)h\\b'
name: 'constant.numeric.hex.cc65-directives'
}
# binary
@ -68,43 +68,48 @@ repository:
patterns: [
# ca65 pseudo variables
{
match: '(\\.)?\\b(?i:\\*|asize|cpu|isize|paramcount|time|version)\\b'
match: '(\\.)\\b(?i:\\*|asize|cpu|isize|paramcount|time|version)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 pseudo functions
{
match: '(\\.)?\\b(?i:addrsize|bank(byte)?|blank|con(cat|st)|(hi|lo)(byte|word)|ident|left|x?match|max|mi[dn]|ref(erenced)?|right|sizeof|strat|sprintf|str(ing|len)|tcount)\\b'
match: '(\\.)\\b(?i:addrsize|bank(byte)?|blank|con(cat|st)|(hi|lo)(byte|word)|ident|left|x?match|max|mi[dn]|ref(erenced)?|right|sizeof|strat|sprintf|str(ing|len)|tcount)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 control commands, A through C
{
match: '(\\.)?\\b(?i:a(8|16)|addr|align|asciiz|assert|autoimport|(bank|hi)bytes|bss|byte?|case|charmap|code|condes|(con|de)structor)\\b'
name: 'storage.modifier.cc65-directives'
match: '(\\.)\\b(?i:a(8|16)|addr|align|asciiz|assert|autoimport|(bank|hi)bytes|bss|byte?|case|charmap|code|condes|(con|de)structor)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 control commands, D and E
{
match: '(\\.)?\\b(?i:data|dbyt|debuginfo|define|delmac(ro)?|def(ined(macro)?)?|dword|else(if)?|end(enum)?|end(enum|if|proc|rep(eat)?|scope|struct|union)?|endmac(ro)?|enum|error|exitmac(ro)?|export(zp)?)\\b'
name: 'storage.modifier.cc65-directives'
match: '(\\.)\\b(?i:data|dbyt|debuginfo|define|delmac(ro)?|def(ined(macro)?)?|dword|else(if)?|end(enum)?|end(enum|if|proc|rep(eat)?|scope|struct|union)?|endmac(ro)?|enum|error|exitmac(ro)?|export(zp)?)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 control commands, F through I
{
match: '(\\.)?\\b(?i:faraddr|fatal|feature|f(ile)?opt|forceimport|global(zp)?|i(8|16)|if((n)?blank|const|(n)?def|(n)?ref|p02|p4510|p816|p(s)?c02)?|import(zp)?|inc(bin|lude)|interruptor|ismnem(onic)?)\\b'
name: 'storage.modifier.cc65-directives'
match: '(\\.)\\b(?i:faraddr|fatal|feature|f(ile)?opt|forceimport|global(zp)?|i(8|16)|if((n)?blank|const|(n)?def|(n)?ref|p02|p4510|p816|p(s)?c02)?|import(zp)?|inc(bin|lude)|interruptor|ismnem(onic)?)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 control commands, L through R
{
match: '(\\.)?\\b(?i:linecont|list(bytes)?|lobytes|local(char)?|macpack|mac(ro)?|org|out|p02|p4510|p816|pagelen(gth)?|pc02|pop(cpu|seg)|proc|psc02|push(cpu|seg)|reloc|repeat|res|rodata)\\b'
name: 'storage.modifier.cc65-directives'
match: '(\\.)\\b(?i:linecont|list(bytes)?|lobytes|local(char)?|macpack|mac(ro)?|org|out|p02|p4510|p816|pagelen(gth)?|pc02|pop(cpu|seg)|proc|psc02|push(cpu|seg)|reloc|repeat|res|rodata)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# ca65 control commands, S through Z
{
match: '(\\.)?\\b(?i:scope|segment|set(cpu)?|smart|struct|tag|undef(ine)?|union|warning|word|zeropage)\\b'
name: 'storage.modifier.cc65-directives'
match: '(\\.)\\b(?i:scope|segment|set(cpu)?|smart|struct|tag|undef(ine)?|union|warning|word|zeropage)\\b'
name: 'support.function.pseudo.cc65-directives'
}
# CPU constants
{
match: '\\b(CPU_6502|CPU_65SC02|CPU_65C02|CPU_65816|CPU_SWEET16|CPU_HUC6280|CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_65816|CPU_ISET_SWEET16|CPU_ISET_HUC6280|__APPLE2__|__APPLE2ENH__|__ATARI__|__ATARIXL__|__ATMOS__|__BBC__|__C128__|__C16__|__C64__|__CBM__|__CBM510__|__CBM610__|__GEOS__|__GEOS_APPLE__|__GEOS_CBM__|__LUNIX__|__LYNX__|__NES__|__PET__|__PLUS4__|__SIM6502__|__SIM65C02__|__SUPERVISION__|__VIC20__)\\b'
name: 'constant.other.cc65-directives'
match: '\\b(CPU_6502|CPU_65SC02|CPU_65C02|CPU_65816|CPU_SWEET16|CPU_HUC6280|CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_65816|CPU_ISET_SWEET16|CPU_ISET_HUC6280|__APPLE2__|__APPLE2ENH__|__ATARI__|__ATARIXL__|__ATMOS__|__BBC__|__C128__|__C16__|__C64__|__CBM__|__CBM510__|__CBM610__|__GEOS__|__GEOS_APPLE__|__GEOS_CBM__|__LUNIX__|__LYNX__|__NES__|__PET__|__PLUS4__|__SIM6502__|__SIM65C02__|__SUPERVISION__|__VIC20__|VER_MAJOR|VER_MINOR)\\b'
name: 'constant.language.cc65-directives'
}
# address sizes, macpack packages
{
match: '\\b(?i:direct|zeropage|zp|absolute|abs|near|far|long|dword|atari|cbm|cpu|generic|longbranch)\\b'
name: 'constant.language.cc65-directives'
}
# Operators
{

View File

@ -0,0 +1,101 @@
# Syntax Highlighting for linker config files used with ld65 of the cc65 toolchain
scopeName: 'source.assembly.cc65-linker-config'
name: 'Linker Config File (cc65)' # Name shown in Atom Editor grammar selection
# File extensions associated with this grammar
fileTypes: [
'cfg'
'txt'
]
# include all directives and commands the toolchain supports
patterns: [
{ include: '#comments' }
{ include: '#symbols' }
]
# Repository starts here ------------------------------------------------------
repository:
# comments
comments:
patterns: [
# hash comments
{
match: '\\#.*$'
name: 'comment.line.cc65-linker-config'
}
]
# symbols
symbols:
patterns: [
# strings
{
begin: '"'
beginCaptures:
0:
name: 'punctuation.definition.string.begin.cc65-linker-config'
end: '"'
endCaptures:
0:
name: 'punctuation.definition.string.end.cc65-linker-config'
name: 'string.quoted.double.cc65-linker-config'
}
# hex, prefixed with dollar sign($)
{
match: '\\$\\b[a-fA-F0-9]+\\b'
name: 'constant.numeric.hex.cc65-linker-config'
}
# hex, suffixed with h(h)
{
match: '\\b([a-fA-F0-9]+)h\\b'
name: 'constant.numeric.hex.cc65-linker-config'
}
# binary
{
match: '%[01]+'
name: 'constant.numeric.binary.cc65-linker-config'
}
# decimal
{
match: '\\b([0-9]+)\\b'
name: 'constant.numeric.decimal.cc65-linker-config'
}
# areas
{
match: '\\b(?i:memory|segments|files|formats|features|symbols|once|lowcode|startup|zpsave)\\b'
name: 'storage.modifier.cc65-linker-config'
}
# labels
{
captures:
1: name: 'entity.name.function.label.cc65-linker-config'
match: '\\b([A-Za-z0-9_]+):'
name: 'meta.function.label.cc65-linker-config'
}
# attributes
{
match: '\\b(?i:load|type|define|start|size|fill|file|run|format|os|version|import|export|label|count|segment|order|default|addrsize)\\b'
name: 'storage.modifier.cc65-linker-config'
}
# linker constants
{
match: '\\b(__NAME_LOAD__|__NAME_RUN__|__NAME_SIZE__|__DATA_LOAD__|__DATA_RUN__|__DATA_SIZE__|__STACK_START__|__STACK_SIZE__|__STACK_LAST__|__STACK_FILEOFFS__)\\b'
name: 'constant.language.cc65-linker-config'
}
# address sizes, functions
{
match: '\\b(?i:direct|zeropage|zp|absolut|abs|near|far|long|dword|atari|cbm|cpu|generic|longbranch|yes|ro|rw|bss|weak)\\b'
name: 'constant.other.cc65-linker-config'
}
# case sensitive symbols
{
match: '(%\\bO|\\bo65)\\b'
name: 'constant.other.cc65-linker-config'
}
# operators
{
match: '='
name: 'keyword.operator.cc65-linker-config'
}
]