diff --git a/syntax/include/arm_base_syntax.vim b/syntax/include/arm_base_syntax.vim index 5be2589..5d820a6 100644 --- a/syntax/include/arm_base_syntax.vim +++ b/syntax/include/arm_base_syntax.vim @@ -33,6 +33,8 @@ so :p:h/arm_directives.vim " Registers syn match armRegister "R\%(1[0-5]\|[0-9]\)" +syn match armRegister "C\%(1[0-5]\|[0-9]\)" +syn match armRegister "P\%(1[0-5]\|[0-9]\)" syn keyword armRegister FP SP LR PC SPSR CPSR CPSR_c CPSR_cxsf BP syn match armRegister "A[1-3]" syn match armRegister "V[1-8]" diff --git a/syntax/include/armv6_base_syntax.vim b/syntax/include/armv6_base_syntax.vim index f20b716..08e5c24 100644 --- a/syntax/include/armv6_base_syntax.vim +++ b/syntax/include/armv6_base_syntax.vim @@ -13,7 +13,7 @@ exec 'syn match armv6Instr "\%(SH\?\|Q\|U[QH]\?\)\%(ADD16\|SUB16\|ADD8\|SUB8\|AS exec 'syn match armv6Instr "\%(USAD8\|USADA8\|SSAT\|SSAT16\|USAT\|USAT16\)' . armCond . '\>"' -exec 'syn match armv6Instr "\%(MOVT\|MRA\|MAR\|MRRC2\|MCRR2\|ORN\|BFC\|BFI\|SBFX\|UBFX\)' . armCond . '\>"' +exec 'syn match armv6Instr "\%(MOVT\|MRA\|MAR\|ORN\|BFC\|BFI\|SBFX\|UBFX\)' . armCond . '\>"' exec 'syn match armv6Instr "\%(PKHBT\|PKHTB\|SXTH\|SXTB16\|SXTB\|SXTAH\|SXTAB16\|SXTAB\|UXTH\|UXTB\|UXTB16\|UXTAH\|UXTAB16\|UXTAB\|RBIT\|REV\|REV16\|REVSH\|SEL\)' . armCond . '\>"' @@ -23,6 +23,7 @@ exec 'syn match armv6LDR "\%(LDREX[HBD]\)' . armCond . '\>"' exec 'syn match armv6STR "\%(STREX[HBD]\|CLREX\)' . armCond . '\>"' syn match armv6InstrNoCond "\%(IT\|CBN\?Z\|TBB\|TBH\|CPSID\|CPSIE\|CPS\|SETEND\|SRS\%(IA\|IB\|DA\|DB\)\|RFE\%(IA\|IB\|DA\|DB\)\)\>" +syn keyword armv6InstrNoCond MRRC2 MCRR2 exec 'syn match armv7Instr "\%(DBG\|DMB\|DSB\|ISB\|SEV\|WFE\|WFI\|YIELD\)' . armCond . '\>"'