Match registers after the instructions (#1317)

ashmind · Jan 6, 2024 · b521cbe · b521cbe
1 parent 6394470
commit b521cbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/source/WebApp/app/shared/codemirror/mode-asm.tests.ts b/source/WebApp/app/shared/codemirror/mode-asm.tests.ts
@@ -7,6 +7,7 @@ test.each([
         L0016: vmovdqa [rbp-0x20], xmm4
         L001b: vmovdqa [rbp-0x10], xmm4`],
     [ 'je', 'L000e: je short L0015' ],
+    [ 'fstp', 'L002e: fstp qword ptr [ebp-8], st' ],
     [ 'jle', `L0015: jle short L0001` ]
 ] as const)('mode-asm codemirror highlights assembly instructions correctly', async (expectedToken: string, assemblyCode: string) => {
 

diff --git a/source/WebApp/app/shared/codemirror/mode-asm.ts b/source/WebApp/app/shared/codemirror/mode-asm.ts
@@ -46,19 +46,19 @@ CodeMirror.defineMode('asm', () => {
                 }
             }
 
-            for (const index in registers) {
-                if (stream.match(registers[index], true, true)) {
-                    return 'type';
-                }
-            }
-
             for (const key in grammar) {
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 if (stream.match(grammar[key as keyof typeof grammar])) {
                     return key;
                 }
             }
 
+            for (const index in registers) {
+                if (stream.match(registers[index], true, true)) {
+                    return 'type';
+                }
+            }
+
             stream.match(/\S+/);
             return null;
         }