From 0fbd1d1a6b80603d5f12063d10265c55e87f4321 Mon Sep 17 00:00:00 2001
From: Kevin Ramharak <kevin@ramharak.nl>
Date: Wed, 23 Jan 2019 17:21:52 +0100
Subject: [PATCH] add setcc instruction to editor lexer

---
 Server/src/main/resources/static/js/editor.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Server/src/main/resources/static/js/editor.js b/Server/src/main/resources/static/js/editor.js
index 7d98023..d4f6d13 100644
--- a/Server/src/main/resources/static/js/editor.js
+++ b/Server/src/main/resources/static/js/editor.js
@@ -275,6 +275,7 @@ function parseInstruction(line, result, currentLine) {
     if (!parseDWInstruction(line, result, currentLine)) {
 
         if (new RegExp('\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|hwi|hwq|nop|neg|' +
+            'seta|setnbe|setae|setnb|setnc|setbe|setna|setb|setc|setnae|sete|setz|setne|setnz|setg|setnle|setge|setnl|setle|setng|setl|setnge|seto|setno|sets|setns|' +
             'call|ret|jmp|jnz|jg|jl|jge|jle|int|jz|js|jns|brk|not|jc|jnc|ror|rol|sal|sar|jo|jno|inc|dec|rcl|xchg|rcr|pushf|popf|ja|jna)\\b').test(mnemonic.toLowerCase())) {
 
 
@@ -333,7 +334,7 @@ function parseInstruction(line, result, currentLine) {
                 strO1 = line.substring(line.indexOf(mnemonic) + mnemonic.length).trim();
 
                 //Validate operand number
-                if (!new RegExp('\\b(?:push|mul|pop|div|neg|call|jnz|jg|jl|jge|jle|hwi|hwq|jz|js|jns|ret|jmp|not|jc|jnc|jo|jno|inc|dec|ja|jna)\\b').test(mnemonic.toLowerCase())) {
+                if (!new RegExp('\\b(?:push|mul|pop|div|neg|call|jnz|jg|jl|jge|jle|hwi|hwq|jz|js|jns|ret|jmp|not|jc|jnc|jo|jno|inc|dec|ja|jna|seta|setnbe|setae|setnb|setnc|setbe|setna|setb|setc|setnae|sete|setz|setne|setnz|setg|setnle|setge|setnl|setle|setng|setl|setnge|seto|setno|sets|setns)\\b').test(mnemonic.toLowerCase())) {
                     result.annotations.push({
                         row: currentLine,
                         column: 0,
@@ -353,6 +354,16 @@ function parseInstruction(line, result, currentLine) {
                     });
                 }
 
+                if (new RegExp('\\b(?:seta|setnbe|setae|setnb|setnc|setbe|setna|setb|setc|setnae|sete|setz|setne|setnz|setg|setnle|setge|setnl|setle|setng|setl|setnge|seto|setno|sets|setns)\\b').test(mnemonic.toLowerCase())) {
+                    if (getOperandType(strO1, result) === OPERAND_IMM) {
+                        result.annotations.push({
+                            row: currentLine,
+                            column: 0,
+                            text: "Invalid operand type: " + strO1,
+                            type: "error"
+                        });
+                    }
+                }
 
             } else {
                 //No operand