Zander671/arm-syntax-vim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shuffle around some conditional instructions, forgot adr

Browse Source
This commit is contained in:
ARM9 2015-07-29 12:41:08 +02:00
parent 7934b63d57
commit 361c39e5f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syntax/include/arm_base_syntax.vim
View File

@ -45,11 +45,9 @@ let armCond = '\%(AL\|CC\|CS\|EQ\|GE\|GT\|HI\|HS\|LE\|LO\|LS\|LT\|MI\|NE\|PL\|VC
" "
" ARMv4 and thumb instructions " ARMv4 and thumb instructions
" "
exec 'syn match armv4Instr "\%(ADC\|ADD\|AND\|BIC\|EOR\|MLA\|MOV\|MUL\|MVN\|NEG\|ORR\|RSB\|RSC\|SBC\|SMLAL\|SMULL\|SUB\|UMLAL\|UMULL\)' . armCond . 'S\?\>"' exec 'syn match armv4Instr "\%(ADC\|ADD\|AND\|ASR\|BIC\|EOR\|LSL\|LSR\|MLA\|MOV\|MUL\|MVN\|NEG\|ORR\|ROR\|RRX\|RSB\|RSC\|SBC\|SMLAL\|SMULL\|SUB\|UMLAL\|UMULL\)' . armCond . 'S\?\>"'
exec 'syn match armv4InstrCond "\%(B\|BL\|BX\|CDP\|CMN\|CMP\|LDC\|MCR\|MRC\|MRS\|MSR\|STC\|SWI\|TEQ\|TST\)' . armCond . '\>"' exec 'syn match armv4InstrCond "\%(ADR\|B\|BL\|BX\|CDP\|CMN\|CMP\|LDC\|MCR\|MRC\|MRS\|MSR\|NOP\|POP\|PUSH\|STC\|SWI\|TEQ\|TST\)' . armCond . '\>"'
syn match armv4InstrNoCond "\%(ASR\|LSL\|LSR\|NOP\|POP\|PUSH\|ROR\|RRX\)\>"
exec 'syn match armv4LDR "\%(LDR\)' . armCond . '\%(B\?T\?\|H\|S[BH]\)\?\>"' exec 'syn match armv4LDR "\%(LDR\)' . armCond . '\%(B\?T\?\|H\|S[BH]\)\?\>"'
exec 'syn match armv4STR "\%(STR\)' . armCond . '\%(B\?T\?\|H\)\?\>"' exec 'syn match armv4STR "\%(STR\)' . armCond . '\%(B\?T\?\|H\)\?\>"'

2
test/armv4-test.s
View File

@ -8,11 +8,13 @@
adc r1, r15, R14 adc r1, r15, R14
add A1, v1, V8 add A1, v1, V8
adrcc r8, 0b
sub r5, #0xFeeDB4c sub r5, #0xFeeDB4c
smull r0, r1,R2 smull r0, r1,R2
smull r0, r1,R2 smull r0, r1,R2
@ illegal @ illegal
adrgts
blx 0002f blx 0002f
smlalBt r1,r15 smlalBt r1,r15
SMLawTb V8, v3 SMLawTb V8, v3