tm-grammars 1.22.18 → 1.23.0

package/grammars/asm.json

@@ -47,8 +47,8 @@
           "name": "comment.block"
         },
         {
-          "begin": "^\\s*[\\#%]\\s*if\\s+0\\b",
-          "end": "^\\s*[\\#%]\\s*endif\\b",
+          "begin": "^\\s*[#%]\\s*if\\s+0\\b",
+          "end": "^\\s*[#%]\\s*endif\\b",
           "name": "comment.preprocessor"
         }
       ]
@@ -56,67 +56,67 @@
     "constants": {
       "patterns": [
         {
-          "match": "(?i)\\b0[by](?:[01][01_]*)\\.(?:(?:[01][01_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[by][01][01_]*\\.(?:(?:[01][01_]*)?(?:p[+\\-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.binary.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[by](?:[01][01_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[by][01][01_]*p[+\\-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.binary.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[oq](?:[0-7][0-7_]*)\\.(?:(?:[0-7][0-7_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[oq][0-7][0-7_]*\\.(?:(?:[0-7][0-7_]*)?(?:p[+\\-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.octal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[oq](?:[0-7][0-7_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[oq][0-7][0-7_]*p[+\\-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.octal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:0[dt])?(?:[0-9][0-9_]*)\\.(?:(?:[0-9][0-9_]*)?(?:e[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b(?:0[dt])?[0-9][0-9_]*\\.(?:(?:[0-9][0-9_]*)?(?:e[+\\-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.decimal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[0-9][0-9_]*)(?:e[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b[0-9][0-9_]*e[+\\-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.decimal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[0-9][0-9_]*)p(?:[0-9][0-9_]*)?\\b",
+          "match": "(?i)\\b[0-9][0-9_]*p(?:[0-9][0-9_]*)?\\b",
           "name": "constant.numeric.decimal.packed-bcd.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[xh](?:[[:xdigit:]][[:xdigit:]_]*)\\.(?:(?:[[:xdigit:]][[:xdigit:]_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[xh]\\h[\\h_]*\\.(?:(?:\\h[\\h_]*)?(?:p[+\\-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[xh](?:[[:xdigit:]][[:xdigit:]_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[xh]\\h[\\h_]*p[+\\-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)?\\.(?:(?:[[:xdigit:]][[:xdigit:]_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\$[0-9]_?(?:\\h[\\h_]*)?\\.(?:(?:\\h[\\h_]*)?(?:p[+\\-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\$[0-9]_?\\h[\\h_]*p[+\\-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[by](?:[01][01_]*))|(?:(?:[01][01_]*)[by]))\\b",
+          "match": "(?i)\\b(?:0[by][01][01_]*|[01][01_]*[by])\\b",
           "name": "constant.numeric.binary.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[oq](?:[0-7][0-7_]*))|(?:(?:[0-7][0-7_]*)[oq]))\\b",
+          "match": "(?i)\\b(?:0[oq][0-7][0-7_]*|[0-7][0-7_]*[oq])\\b",
           "name": "constant.numeric.octal.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[dt](?:[0-9][0-9_]*))|(?:(?:[0-9][0-9_]*)[dt]?))\\b",
+          "match": "(?i)\\b(?:0[dt][0-9][0-9_]*|[0-9][0-9_]*[dt]?)\\b",
           "name": "constant.numeric.decimal.asm.x86_64"
         },
         {
-          "match": "(?i)(?:\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)?)\\b",
+          "match": "(?i)\\$[0-9]_?(?:\\h[\\h_]*)?\\b",
           "name": "constant.numeric.hex.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[xh](?:[[:xdigit:]][[:xdigit:]_]*))|(?:(?:[[:xdigit:]][[:xdigit:]_]*)[hxHX]))\\b",
+          "match": "(?i)\\b(?:0[xh]\\h[\\h_]*|\\h[\\h_]*[hxHX])\\b",
           "name": "constant.numeric.hex.asm.x86_64"
         }
       ]
@@ -124,7 +124,7 @@
     "entities": {
       "patterns": [
         {
-          "match": "((section|segment)\\s+)?\\.((ro)?data|bss|text)",
+          "match": "((se(?:ction|gment))\\s+)?\\.((ro)?data|bss|text)",
           "name": "entity.name.section"
         },
         {
@@ -147,7 +147,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(\\.\\.@)((?:[[:alpha:]_?](?:[[:alnum:]_$#@~.?]*)))(?:(\\:)?|\\b)",
+          "match": "(\\.\\.@)([[:alpha:]_?][[:alnum:]_$#@~.?]*)(?:(:)?|\\b)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -162,7 +162,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(?:(\\.)?|\\b)((?:[[:alpha:]_?](?:[[:alnum:]_$#@~.?]*)))(?:(\\:))",
+          "match": "(?:(\\.)?|\\b)([[:alpha:]_?][[:alnum:]_$#@~.?]*)(:)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -177,7 +177,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(\\.)([0-9]+(?:[[:alnum:]_$#@~.?]*))(?:(\\:)?|\\b)",
+          "match": "(\\.)([0-9]+[[:alnum:]_$#@~.?]*)(?:(:)?|\\b)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -192,7 +192,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(?:(\\.)?|\\b)([0-9$@~](?:[[:alnum:]_$#@~.?]*))(?:(\\:))",
+          "match": "(?:(\\.)?|\\b)([0-9$@~][[:alnum:]_$#@~.?]*)(:)",
           "name": "invalid.illegal.entity.name.function.asm.x86_64"
         }
       ]
@@ -328,7 +328,7 @@
           "name": "keyword.operator.word.mnemonic.avx"
         },
         {
-          "match": "(?i)\\b(vaes((dec|enc)(last)?|imc|keygenassist)|vpclmulqdq)\\b",
+          "match": "(?i)\\b(v(?:aes((dec|enc)(last)?|imc|keygenassist)|pclmulqdq))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.aes"
         },
         {
@@ -340,7 +340,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.conversion"
         },
         {
-          "match": "(?i)\\b(vh((add|sub)p[ds])|vph((add|sub)([dw]|sw)|minposuw))\\b",
+          "match": "(?i)\\b(v(?:h((add|sub)p[ds])|ph((add|sub)([dw]|sw)|minposuw)))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.horizontal-packed-arithmetic"
         },
         {
@@ -352,7 +352,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.mov"
         },
         {
-          "match": "(?i)\\b(v((add|div|mul|sub|max|min|round|sqrt)[ps][ds]|(addsub|dp)p[ds]|(rcp|rsqrt)[ps]s))\\b",
+          "match": "(?i)\\b(v((add|div|mul|sub|max|min|round|sqrt)[ps][ds]|(addsub|dp)p[ds]|(r(?:cp|sqrt))[ps]s))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-arithmetic"
         },
         {
@@ -360,11 +360,11 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-conversion"
         },
         {
-          "match": "(?i)\\b(vp(shuf([bd]|[hl]w))|vshufp[ds])\\b",
+          "match": "(?i)\\b(v(?:p(shuf([bd]|[hl]w))|shufp[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-shuffle"
         },
         {
-          "match": "(?i)\\b(vp((abs|sign|(max|min)[su])[bdw]|(add|sub)([bdqw]|u?s[bw])|avg[bw]|extr[bdqw]|madd(wd|ubsw)|mul(hu?w|hrsw|l[dw]|u?dq)|sadbw))\\b",
+          "match": "(?i)\\b(vp((abs|sign|(m(?:ax|in))[su])[bdw]|(add|sub)([bdqw]|u?s[bw])|avg[bw]|extr[bdqw]|madd(wd|ubsw)|mul(hu?w|hrsw|l[dw]|u?dq)|sadbw))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.supplemental.arithmetic"
         },
         {
@@ -384,7 +384,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.simd-integer"
         },
         {
-          "match": "(?i)\\b(vp(sra[dwq]|srl[dqw]))\\b",
+          "match": "(?i)\\b(vp(sr(?:a[dwq]|l[dqw])))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.shift-and-rotate"
         },
         {
@@ -404,15 +404,15 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.other"
         },
         {
-          "match": "(?i)\\b(v(maskmovdqu|movntdqa?))\\b",
+          "match": "(?i)\\b(v(m(?:askmovdqu|ovntdqa?)))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.cacheability-control"
         },
         {
-          "match": "(?i)\\b(vcvt(ph2ps|ps2ph))\\b",
+          "match": "(?i)\\b(vcvt(p(?:h2ps|s2ph)))\\b",
           "name": "keyword.operator.word.mnemonic.16-bit-floating-point-conversion"
         },
         {
-          "match": "(?i)\\b(vfn?m((add|sub)(132|213|231)[ps][ds])|vfm((addsub|subadd)(132|213|231)p[ds]))\\b",
+          "match": "(?i)\\b(vf(?:n?m((add|sub)(132|213|231)[ps][ds])|m((addsub|subadd)(132|213|231)p[ds])))\\b",
           "name": "keyword.operator.word.mnemonic.fma"
         }
       ]
@@ -432,7 +432,7 @@
           "name": "keyword.operator.word.mnemonic.avx2.blend"
         },
         {
-          "match": "(?i)\\b(vp?gather[dq][dq]|vgather([dq]|dq)p[ds])\\b",
+          "match": "(?i)\\b(v(?:p?gather[dq][dq]|gather([dq]|dq)p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.avx2.gather"
         }
       ]
@@ -513,7 +513,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.dq.extract"
         },
         {
-          "match": "(?i)\\bvp(mov(m2[dq]|b2d|q2m)|mullq)\\b",
+          "match": "(?i)\\bvp(m(?:ov(m2[dq]|b2d|q2m)|ullq))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.dq.pmov"
         }
       ]
@@ -553,7 +553,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.f.pblend"
         },
         {
-          "match": "(?i)\\bvp(erm[it]2(d|q|p[ds])|expand[dq]|(max|min)[su]q|movu?s(q[bdw]|d[bw]))\\b",
+          "match": "(?i)\\bvp(erm[it]2([dq]|p[ds])|expand[dq]|(m(?:ax|in))[su]q|movu?s(q[bdw]|d[bw]))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.f.permi"
         },
         {
@@ -569,7 +569,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.f.rcp"
         },
         {
-          "match": "(?i)\\bv(scatter[dq]{2}|shuf[fi](32|64)x[24])\\b",
+          "match": "(?i)\\bv(s(?:catter[dq]{2}|huf[fi](32|64)x[24]))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.f.scatter"
         }
       ]
@@ -577,7 +577,7 @@
     "mnemonics-avx512fp16": {
       "patterns": [
         {
-          "match": "(?i)\\bv((add|cmp|div|fc?(madd|mul)c|fpclass|get(exp|mant)|mul|rcp|reduce|(rnd)?scale|r?sqrt|sub)[ps]h|u?comish)\\b",
+          "match": "(?i)\\bv((add|cmp|div|fc?(m(?:add|ul))c|fpclass|get(exp|mant)|mul|rcp|reduce|(rnd)?scale|r?sqrt|sub)[ps]h|u?comish)\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.add"
         },
         {
@@ -589,7 +589,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.fp16.cvtph2x"
         },
         {
-          "match": "(?i)\\bvcvt(ph2psx|ps2phx)\\b",
+          "match": "(?i)\\bvcvt(p(?:h2psx|s2phx))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.cvtx"
         },
         {
@@ -613,7 +613,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.fp16.fmaddsub"
         },
         {
-          "match": "(?i)\\bv((min|max)ph|mov(sh|w))\\b",
+          "match": "(?i)\\bv((m(?:in|ax))ph|mov(sh|w))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.max"
         }
       ]
@@ -673,7 +673,7 @@
           "name": "keyword.operator.word.mnemonic.fpu.transcendental"
         },
         {
-          "match": "(?i)\\b(fld(1|z|pi|l2[et]|l[ng]2))\\b",
+          "match": "(?i)\\b(fld([1z]|pi|l2[et]|l[ng]2))\\b",
           "name": "keyword.operator.word.mnemonic.fpu.load-constants"
         },
         {
@@ -708,7 +708,7 @@
           "name": "keyword.operator.word.mnemonic.apx.cmpxadd"
         },
         {
-          "match": "(?i)\\b(jmpabs|(push|pop)2p?)\\b",
+          "match": "(?i)\\b(jmpabs|(p(?:ush|op))2p?)\\b",
           "name": "keyword.operator.word.mnemonic.apx.other"
         }
       ]
@@ -724,7 +724,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.data-transfer.xchg"
         },
         {
-          "match": "(?i)\\b((push|pop)(ad?)?|cwde?|cdq|cbw)\\b",
+          "match": "(?i)\\b((p(?:ush|op))(ad?)?|cwde?|cdq|cbw)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.data-transfer.other"
         },
         {
@@ -752,7 +752,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.bit-and-byte.other"
         },
         {
-          "match": "(?i)\\b(jmp|jn?[abceglopsz]|jn?[abgl]e|jp[eo]|j[er]?cxz)\\b",
+          "match": "(?i)\\b(j(?:mp|n?[abceglopsz]|n?[abgl]e|p[eo]|[er]?cxz))\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.control-transfer.jmp"
         },
         {
@@ -768,7 +768,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.io"
         },
         {
-          "match": "(?i)\\b((st|cl)[cdi]|cmc|[ls]ahf|(push|pop)f[dq]?)\\b",
+          "match": "(?i)\\b((st|cl)[cdi]|cmc|[ls]ahf|(p(?:ush|op))f[dq]?)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.flag-control"
         },
         {
@@ -784,11 +784,11 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.cache-control"
         },
         {
-          "match": "(?i)\\b(rdrand|rdseed)\\b",
+          "match": "(?i)\\b(rd(?:rand|seed))\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.rng"
         },
         {
-          "match": "(?i)\\b(andn|bextr|bls(i|r|msk)|bzhi|pdep|pext|[lt]zcnt|(mul|ror|sar|shl|shr)x)\\b",
+          "match": "(?i)\\b(andn|bextr|bls([ir]|msk)|bzhi|pdep|pext|[lt]zcnt|(mul|ror|sar|shl|shr)x)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.bmi"
         }
       ]
@@ -832,7 +832,7 @@
           "name": "keyword.operator.word.mnemonic.other.m"
         },
         {
-          "match": "(?i)\\bp((abs|(max|min)[su]?|mull|sra)q|config|twrite)\\b",
+          "match": "(?i)\\bp((abs|(m(?:ax|in))[su]?|mull|sra)q|config|twrite)\\b",
           "name": "keyword.operator.word.mnemonic.other.p"
         },
         {
@@ -848,7 +848,7 @@
           "name": "keyword.operator.word.mnemonic.other.t"
         },
         {
-          "match": "(?i)\\bu(monitor|mwait)\\b",
+          "match": "(?i)\\bu(m(?:onitor|wait))\\b",
           "name": "keyword.operator.word.mnemonic.other.u"
         },
         {
@@ -856,7 +856,7 @@
           "name": "keyword.operator.word.mnemonic.other.vb"
         },
         {
-          "match": "(?i)\\bv(compressw|cvtne2?ps2bf16)\\b",
+          "match": "(?i)\\bv(c(?:ompressw|vtne2?ps2bf16))\\b",
           "name": "keyword.operator.word.mnemonic.other.vc"
         },
         {
@@ -872,7 +872,7 @@
           "name": "keyword.operator.word.mnemonic.other.vi"
         },
         {
-          "match": "(?i)\\bv(maskmov|(max|min)sh)\\b",
+          "match": "(?i)\\bv(maskmov|(m(?:ax|in))sh)\\b",
           "name": "keyword.operator.word.mnemonic.other.vm"
         },
         {
@@ -892,15 +892,15 @@
           "name": "keyword.operator.word.mnemonic.other.vpd"
         },
         {
-          "match": "(?i)\\b(vperm(b|t2[bw])|vp(expand[bw]|extrtd))\\b",
+          "match": "(?i)\\b(vp(?:erm(b|t2[bw])|(ex(?:pand[bw]|trtd))))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpe"
         },
         {
-          "match": "(?i)\\bvp(madd52[hl]uq|mov(d(2m|[bw])|q[bdw]|wb)|mpov[bdqw]2m|multishiftqb)\\b",
+          "match": "(?i)\\bvp(m(?:add52[hl]uq|ov(d(2m|[bw])|q[bdw]|wb)|pov[bdqw]2m|ultishiftqb))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpm"
         },
         {
-          "match": "(?i)\\b(vpopcnt[bdqw]|vpor[dq])\\b",
+          "match": "(?i)\\b(vpo(?:pcnt[bdqw]|r[dq]))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpo"
         },
         {
@@ -908,7 +908,7 @@
           "name": "keyword.operator.word.mnemonic.other.vpr"
         },
         {
-          "match": "(?i)\\bvp(sh[lr]dv?[dqw]|shufbitqmb|shufps)\\b",
+          "match": "(?i)\\bvp(sh(?:[lr]dv?[dqw]|ufbitqmb|ufps))\\b",
           "name": "keyword.operator.word.mnemonic.other.vps"
         },
         {
@@ -920,11 +920,11 @@
           "name": "keyword.operator.word.mnemonic.other.vpx"
         },
         {
-          "match": "(?i)\\bv(scalef[ps][dhs]|scatter[dq]p[ds])\\b",
+          "match": "(?i)\\bv(sca(?:lef[ps][dhs]|tter[dq]p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.other.vs"
         },
         {
-          "match": "(?i)\\b(wbnoinvd|wru?ss[dq])\\b",
+          "match": "(?i)\\b(w(?:bnoinvd|ru?ss[dq]))\\b",
           "name": "keyword.operator.word.mnemonic.other.w"
         }
       ]
@@ -951,7 +951,7 @@
           "name": "invalid.keyword.operator.word.mnemonic.sse5.packed-arithmetic"
         },
         {
-          "match": "(?i)\\b(pcmov|permp[ds]|pperm|prot[bdqw]|psh[al][bdqw])\\b",
+          "match": "(?i)\\b(p(?:cmov|ermp[ds]|perm|rot[bdqw]|sh[al][bdqw]))\\b",
           "name": "invalid.keyword.operator.word.mnemonic.sse5.simd-integer"
         }
       ]
@@ -963,7 +963,7 @@
           "name": "keyword.operator.word.mnemonic.mmx.data-transfer"
         },
         {
-          "match": "(?i)\\b(pack(ssdw|[su]swb)|punpck[hl](bw|dq|wd))\\b",
+          "match": "(?i)\\b(p(?:ack(ssdw|[su]swb)|unpck[hl](bw|dq|wd)))\\b",
           "name": "keyword.operator.word.mnemonic.mmx.conversion"
         },
         {
@@ -975,7 +975,7 @@
           "name": "keyword.operator.word.mnemonic.mmx.comparison"
         },
         {
-          "match": "(?i)\\b(pandn?|px?or)\\b",
+          "match": "(?i)\\b(p(?:andn?|x?or))\\b",
           "name": "keyword.operator.word.mnemonic.mmx.logical"
         },
         {
@@ -1099,7 +1099,7 @@
           "name": "keyword.operator.word.mnemonic.sse.state-management"
         },
         {
-          "match": "(?i)\\b(p(avg[bw]|extrw|insrw|(max|min)(sw|ub)|sadbw|shufw|mulhuw|movmskb))\\b",
+          "match": "(?i)\\b(p(avg[bw]|extrw|insrw|(m(?:ax|in))(sw|ub)|sadbw|shufw|mulhuw|movmskb))\\b",
           "name": "keyword.operator.word.mnemonic.sse.simd-integer"
         },
         {
@@ -1187,7 +1187,7 @@
           "name": "keyword.operator.word.mnemonic.sse4.1.packed-blending"
         },
         {
-          "match": "(?i)\\b(p(min|max)(u[dw]|s[bd]))\\b",
+          "match": "(?i)\\b(p(m(?:in|ax))(u[dw]|s[bd]))\\b",
           "name": "keyword.operator.word.mnemonic.sse4.1.packed-integer"
         },
         {
@@ -1239,7 +1239,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.sse4.a"
         },
         {
-          "match": "(?i)\\b(vfn?m((add|sub)[ps][ds])|vfm((addsub|subadd)p[ds]))\\b",
+          "match": "(?i)\\b(vf(?:n?m((add|sub)[ps][ds])|m((addsub|subadd)p[ds])))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.fma4"
         },
         {
@@ -1251,7 +1251,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.xop.simd-horizontal"
         },
         {
-          "match": "(?i)\\b(vfrcz[ps][ds]|vpermil2p[ds])\\b",
+          "match": "(?i)\\b(v(?:frcz[ps][ds]|permil2p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.xop.other"
         },
         {
@@ -1259,7 +1259,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.3dnow"
         },
         {
-          "match": "(?i)\\b(p(avgusb|(f2i|i2f)[dw]|mulhrw|swapd)|pf((p?n)?acc|add|max|min|mul|rcp(it[12])?|rsqit1|rsqrt|subr?))\\b",
+          "match": "(?i)\\b(p(?:(avgusb|(f2i|i2f)[dw]|mulhrw|swapd)|f((p?n)?acc|add|max|min|mul|rcp(it[12])?|rsqit1|rsqrt|subr?)))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.3dnow.simd"
         },
         {
@@ -1295,7 +1295,7 @@
           "name": "keyword.operator.word.mnemonic.system"
         },
         {
-          "match": "(?i)\\b(lock|hlt|rsm|(rd|wr)(msr|pkru|[fg]sbase)|rd(pmc|tscp?)|sys(enter|exit))\\b",
+          "match": "(?i)\\b(lock|hlt|rsm|(rd|wr)(msr|pkru|[fg]sbase)|rd(pmc|tscp?)|sys(e(?:nter|xit)))\\b",
           "name": "keyword.operator.word.mnemonic.system"
         },
         {
@@ -1355,13 +1355,13 @@
           ]
         },
         {
-          "begin": "^\\s*[#%]\\s*(include|import)\\b\\s+",
+          "begin": "^\\s*[#%]\\s*(i(?:nclude|mport))\\b\\s+",
           "captures": {
             "1": {
               "name": "keyword.control.import.include.c"
             }
           },
-          "end": "(?=(?://|/\\*))|$",
+          "end": "(?=/[/*])|$",
           "name": "meta.preprocessor.c.include",
           "patterns": [
             {
@@ -1407,7 +1407,7 @@
               "name": "keyword.control.import.c"
             }
           },
-          "end": "(?=(?://|/\\*))|$",
+          "end": "(?=/[/*])|$",
           "name": "meta.preprocessor.c",
           "patterns": [
             {
@@ -1420,7 +1420,7 @@
           ]
         },
         {
-          "begin": "^\\s*[#%]\\s*(assign|strlen|substr|(end|exit)?rep|push|pop|rotate|use|ifusing|ifusable|def(?:ailas|str|tok)|undef(?:alias)?)\\b",
+          "begin": "^\\s*[#%]\\s*(assign|strlen|substr|(e(?:nd|xit))?rep|push|pop|rotate|use|ifusing|ifusable|def(?:ailas|str|tok)|undef(?:alias)?)\\b",
           "captures": {
             "1": {
               "name": "keyword.control"
@@ -1443,7 +1443,7 @@
     "preprocessor-functions": {
       "patterns": [
         {
-          "begin": "((%)(?:(abs|cond|count|eval|isn?(?:def|macro|ctx|idni?|id|num|str|token|empty|env)?|num|sel|str(?:cat|len)?|substr|tok)\\s*(\\()))",
+          "begin": "((%)(abs|cond|count|eval|isn?(?:def|macro|ctx|idni?|id|num|str|token|empty|env)?|num|sel|str(?:cat|len)?|substr|tok)\\s*(\\())",
           "captures": {
             "3": {
               "name": "support.function.preprocessor.asm.x86_64"
@@ -1462,27 +1462,27 @@
     "registers": {
       "patterns": [
         {
-          "match": "(?i)\\b(?:[abcd][hl]|[er]?[abcd]x|[er]?(?:di|si|bp|sp)|dil|sil|bpl|spl|r(?:8|9|1[0-5])[bdlw]?)\\b",
+          "match": "(?i)\\b(?:[abcd][hl]|[er]?[abcd]x|[er]?(?:di|si|bp|sp)|dil|sil|bpl|spl|r(?:[89]|1[0-5])[bdlw]?)\\b",
           "name": "constant.language.register.general-purpose.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[cdefgs]s)\\b",
+          "match": "(?i)\\b[cdefgs]s\\b",
           "name": "constant.language.register.segment.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[er]?flags)\\b",
+          "match": "(?i)\\b[er]?flags\\b",
           "name": "constant.language.register.flags.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[er]?ip)\\b",
+          "match": "(?i)\\b[er]?ip\\b",
           "name": "constant.language.register.instruction-pointer.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:cr[02-4])\\b",
+          "match": "(?i)\\bcr[02-4]\\b",
           "name": "constant.language.register.control.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:mm|st|fpr)[0-7])\\b",
+          "match": "(?i)\\b(?:mm|st|fpr)[0-7]\\b",
           "name": "constant.language.register.mmx.asm.x86_64"
         },
         {
@@ -1490,19 +1490,19 @@
           "name": "constant.language.register.sse_avx.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:zmm(?:[12]?[0-9]|30|31))\\b",
+          "match": "(?i)\\bzmm(?:[12]?[0-9]|30|31)\\b",
           "name": "constant.language.register.avx512.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:bnd(?:[0-3]|cfg[su]|status))\\b",
+          "match": "(?i)\\bbnd(?:[0-3]|cfg[su]|status)\\b",
           "name": "constant.language.register.memory-protection.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:[gil]dt)r?|tr)\\b",
+          "match": "(?i)\\b(?:[gil]dtr?|tr)\\b",
           "name": "constant.language.register.system-table-pointer.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:dr[0-367])\\b",
+          "match": "(?i)\\bdr[0-367]\\b",
           "name": "constant.language.register.debug.asm.x86_64"
         },
         {
@@ -1607,7 +1607,7 @@
           "name": "storage.modifier.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[ao](?:16|32|64))\\b",
+          "match": "(?i)\\b[ao](?:16|32|64)\\b",
           "name": "storage.modifier.prefix.asm.x86_64"
         },
         {
@@ -1620,7 +1620,7 @@
               "name": "storage.modifier.prefix.vex.asm.x86_64"
             }
           },
-          "match": "{(vex[23]?|evex|rex)}"
+          "match": "\\{(vex[23]?|evex|rex)}"
         },
         {
           "captures": {
@@ -1628,7 +1628,7 @@
               "name": "storage.modifier.opmask.asm.x86_64"
             }
           },
-          "match": "{(k[1-7])}"
+          "match": "\\{(k[1-7])}"
         },
         {
           "captures": {
@@ -1636,7 +1636,7 @@
               "name": "storage.modifier.precision.asm.x86_64"
             }
           },
-          "match": "{(1to(?:8|16))}"
+          "match": "\\{(1to(?:8|16))}"
         },
         {
           "captures": {
@@ -1644,18 +1644,18 @@
               "name": "storage.modifier.rounding.asm.x86_64"
             }
           },
-          "match": "{(z|(?:r[nudz]-)?sae)}"
+          "match": "\\{(z|(?:r[nudz]-)?sae)}"
         },
         {
           "match": "\\.\\.(?:start|imagebase|tlvp|got(?:pc(?:rel)?|(?:tp)?off)?|plt|sym|tlsie)\\b",
           "name": "support.constant.asm.x86_64"
         },
         {
-          "match": "\\b__\\?(?:utf(?:(?:16|32)(?:[lb]e)?)|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)\\?__\\b",
+          "match": "\\b__\\?(?:utf(?:16|32)(?:[lb]e)?|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)\\?__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__(?:utf(?:(?:16|32)(?:[lb]e)?)|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)__\\b",
+          "match": "\\b__(?:utf(?:16|32)(?:[lb]e)?|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)__\\b",
           "name": "support.function.legacy.asm.x86_64"
         },
         {
@@ -1675,7 +1675,7 @@
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__\\?USE_(?:\\w+)\\?__\\b",
+          "match": "\\b__\\?USE_\\w+\\?__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
@@ -1707,7 +1707,7 @@
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__USE_(?:\\w+)__\\b",
+          "match": "\\b__USE_\\w+__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
@@ -1727,7 +1727,7 @@
           "name": "support.constant.fp.asm.x86_64"
         },
         {
-          "match": "\\b(?:float(?:8|16|32|64|80[me]|128[lh]))\\b",
+          "match": "\\bfloat(?:8|16|32|64|80[me]|128[lh])\\b",
           "name": "support.function.fp.asm.x86_64"
         },
         {