From 509b04ea184ff8a27af11aeb94977b19319737fb Mon Sep 17 00:00:00 2001
From: Ethan Lafrenais <elafrenais12@gmail.com>
Date: Sun, 31 Dec 2017 18:22:31 -0500
Subject: [PATCH] Add editor support for PUSHF and POPF

---
 mar/ace/mode-mar.js     |  2 +-
 mar/ace/mode-mar.min.js |  5 +----
 mar/editor.js           |  4 ++--
 mar/editor.min.js       | 18 +-----------------
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/mar/ace/mode-mar.js b/mar/ace/mode-mar.js
index 922b5a6..4fc68ca 100755
--- a/mar/ace/mode-mar.js
+++ b/mar/ace/mode-mar.js
@@ -47,7 +47,7 @@ define("ace/mode/mar_rules", ["require", "exports", "module", "ace/lib/oop", "ac
             start:
                 [{
                     token: 'keyword.function.assembly',
-                    regex: '\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|dw|nop|equ|neg|hwq|not|ror|rol|sal|sar)\\b',
+                    regex: '\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|dw|nop|equ|neg|hwq|not|ror|rol|sal|sar|pushf|popf)\\b',
                     caseInsensitive: true
                 },
                     {
diff --git a/mar/ace/mode-mar.min.js b/mar/ace/mode-mar.min.js
index 4dbaece..e70564d 100644
--- a/mar/ace/mode-mar.min.js
+++ b/mar/ace/mode-mar.min.js
@@ -1,4 +1 @@
-define("ace/mode/mar_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,d,b){b=a("../lib/oop");a=a("./text_highlight_rules").TextHighlightRules;var c=function(){this.$rules={start:[{token:"keyword.function.assembly",regex:"\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|dw|nop|equ|neg|hwq|not|ror|rol|sal|sar)\\b",caseInsensitive:!0},{token:"keyword.operator.assembly",regex:"\\b(?:call|ret|jmp|jnz|jg|jl|jge|jle|hwi|jz|js|jns|jc|jnc)\\b",caseInsensitive:!0},
-{token:"variable.predefined.ahk",regex:"\\b(?:brk|dup)\\b",caseInsensitive:!0},{token:"variable.parameter.register.assembly",regex:"\\b(?:A|B|C|D|X|Y|bp|sp)\\b",caseInsensitive:!0},{token:"constant.character.decimal.assembly",regex:"\\b[0-9]+\\b"},{token:"constant.character.hexadecimal.assembly",regex:"\\b0x[A-F0-9]+\\b",caseInsensitive:!0},{token:"string.assembly",regex:/"([^\\"]|\\.)*"/},{token:"comment.assembly",regex:";.*$"},{token:"support.function.directive.assembly",regex:/^\.text|\.data/},
-{token:"entity.name.function.assembly",regex:/\w*:/}]};this.normalizeRules()};c.metaData={fileTypes:["asm"],name:"Much Assembly Required",scopeName:"source.assembly"};b.inherits(c,a);d.MarHighlightRules=c});
-define("ace/mode/mar","require exports module ace/lib/oop ace/mode/text ace/mode/mar_rules".split(" "),function(a,d,b){b=a("../lib/oop");var c=a("./text").Mode,e=a("./mar_rules").MarHighlightRules;a=function(){this.HighlightRules=e;this.$behaviour=this.$defaultBehaviour};b.inherits(a,c);a.prototype.lineCommentStart=";";a.prototype.$id="ace/mode/mar";d.Mode=a});
+define("ace/mode/mar_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,s){"use strict";var a=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,r=function(){this.$rules={start:[{token:"keyword.function.assembly",regex:"\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|dw|nop|equ|neg|hwq|not|ror|rol|sal|sar|pushf|popf)\\b",caseInsensitive:!0},{token:"keyword.operator.assembly",regex:"\\b(?:call|ret|jmp|jnz|jg|jl|jge|jle|hwi|jz|js|jns|jc|jnc)\\b",caseInsensitive:!0},{token:"variable.predefined.ahk",regex:"\\b(?:brk|dup)\\b",caseInsensitive:!0},{token:"variable.parameter.register.assembly",regex:"\\b(?:A|B|C|D|X|Y|bp|sp)\\b",caseInsensitive:!0},{token:"constant.character.decimal.assembly",regex:"\\b[0-9]+\\b"},{token:"constant.character.hexadecimal.assembly",regex:"\\b0x[A-F0-9]+\\b",caseInsensitive:!0},{token:"string.assembly",regex:/"([^\\"]|\\.)*"/},{token:"comment.assembly",regex:";.*$"},{token:"support.function.directive.assembly",regex:/^\.text|\.data/},{token:"entity.name.function.assembly",regex:/\w*:/}]},this.normalizeRules()};r.metaData={fileTypes:["asm"],name:"Much Assembly Required",scopeName:"source.assembly"},a.inherits(r,i),t.MarHighlightRules=r}),define("ace/mode/mar",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/mar_rules"],function(e,t,s){"use strict";var a=e("../lib/oop"),i=e("./text").Mode,r=e("./mar_rules").MarHighlightRules,o=function(){this.HighlightRules=r,this.$behaviour=this.$defaultBehaviour};a.inherits(o,i),function(){this.lineCommentStart=";",this.$id="ace/mode/mar"}.call(o.prototype),t.Mode=o});
\ No newline at end of file
diff --git a/mar/editor.js b/mar/editor.js
index f88dcd5..fd04206 100644
--- a/mar/editor.js
+++ b/mar/editor.js
@@ -257,7 +257,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|' +
-                'call|ret|jmp|jnz|jg|jl|jge|jle|int|jz|js|jns|brk|not|jc|jnc|ror|rol|sal|sar|jo|jno)\\b').test(mnemonic.toLowerCase())) {
+                'call|ret|jmp|jnz|jg|jl|jge|jle|int|jz|js|jns|brk|not|jc|jnc|ror|rol|sal|sar|jo|jno|pushf|popf)\\b').test(mnemonic.toLowerCase())) {
 
 
             if (line.indexOf(",") !== -1) {
@@ -338,7 +338,7 @@ function parseInstruction(line, result, currentLine) {
 
             } else {
                 //No operand
-                if (!new RegExp('\\b(?:ret|brk|nop)\\b').test(mnemonic.toLowerCase())) {
+                if (!new RegExp('\\b(?:ret|brk|nop|pushf|popf)\\b').test(mnemonic.toLowerCase())) {
 
                     //Validate operand number
                     result.annotations.push({
diff --git a/mar/editor.min.js b/mar/editor.min.js
index 0898478..3a0f155 100644
--- a/mar/editor.min.js
+++ b/mar/editor.min.js
@@ -1,17 +1 @@
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.checkStringArgs=function(a,c,b){if(null==a)throw new TypeError("The 'this' value for String.prototype."+b+" must not be null or undefined");if(c instanceof RegExp)throw new TypeError("First argument to String.prototype."+b+" must not be a regular expression");return a+""};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;
-$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,c,b){a!=Array.prototype&&a!=Object.prototype&&(a[c]=b.value)};$jscomp.getGlobal=function(a){return"undefined"!=typeof window&&window===a?a:"undefined"!=typeof global&&null!=global?global:a};$jscomp.global=$jscomp.getGlobal(this);
-$jscomp.polyfill=function(a,c,b,d){if(c){b=$jscomp.global;a=a.split(".");for(d=0;d<a.length-1;d++){var e=a[d];e in b||(b[e]={});b=b[e]}a=a[a.length-1];d=b[a];c=c(d);c!=d&&null!=c&&$jscomp.defineProperty(b,a,{configurable:!0,writable:!0,value:c})}};
-$jscomp.polyfill("String.prototype.startsWith",function(a){return a?a:function(a,b){var c=$jscomp.checkStringArgs(this,a,"startsWith");a+="";var e=c.length,f=a.length;b=Math.max(0,Math.min(b|0,c.length));for(var g=0;g<f&&b<e;)if(c[b++]!=a[g++])return!1;return g>=f}},"es6","es3");
-$jscomp.polyfill("String.prototype.endsWith",function(a){return a?a:function(a,b){var c=$jscomp.checkStringArgs(this,a,"endsWith");a+="";void 0===b&&(b=c.length);b=Math.max(0,Math.min(b|0,c.length));for(var e=a.length;0<e&&0<b;)if(c[--b]!=a[--e])return!1;return 0>=e}},"es6","es3");OPERAND_INVALID=-1;OPERAND_REG=0;OPERAND_MEM_IMM=1;OPERAND_MEM_REG=2;OPERAND_IMM=3;editor=ace.edit("editor");editor.session.setOption("useWorker",!1);editor.$blockScrolling=Infinity;
-function removeComment(a){return-1!==a.indexOf(";")?a.substring(0,a.indexOf(";")):a}function checkForLabel(a,c){a=removeComment(a);var b;null!==(b=/\b\w*\b:/.exec(a))&&c.labels.push(b[0].substring(0,b[0].length-1))}function checkForSegmentDeclaration(a){a=getTokens(a);return void 0!==a[0]&&(".data"===a[0].toLowerCase()||".text"===a[0].toLowerCase())}
-function checkForEQUInstruction(a,c,b){var d=getTokens(a);return-1!==a.toLowerCase().indexOf(" equ ")||void 0!==d[1]&&"equ"===d[1].toLowerCase()?(a=Number(d[2]),isNaN(a)||a!==Math.floor(a)?c.annotations.push({row:b,column:0,text:"Usage: constant_name EQU immediate_value",type:"error"}):c.labels.push(d[0]),!0):!1}function getTokens(a){a=a.split(/\s+/);for(var c=0;c<a.length;c++)""===a[c]&&a.splice(c,1);return a}function removeLabel(a){return a.replace(/\b\w*\b:/,"")}
-function checkForORGInstruction(a,c,b){a=removeComment(a);a=removeLabel(a);a=getTokens(a);var d=a[0];if(void 0!==d&&"org"===d.toLowerCase()){if(console.log(a),1<a.length)return d=Number(a[1]),(isNaN(d)||d!==Math.floor(d))&&c.annotations.push({row:b,column:0,text:"Invalid operand: "+a[1],type:"error"}),!0}else return!1}
-function parseDWInstruction(a,c,b){a=a.trim();if("dw"===a.substr(0,2).toLowerCase()){a=a.substr(2,a.length).split(/,(?=(?:[^"]*"[^"]*")*[^"]*$)/,-1);for(var d=0;d<a.length;d++){a[d]=a[d].trim();var e=getTokens(a[d]);if(!(2===e.length&&getOperandType(e[0],c)===OPERAND_IMM&&e[1].toLowerCase().startsWith("dup(")&&e[1].endsWith(")")&&getOperandType(e[1].substring(4,e[1].indexOf(")")),c)===OPERAND_IMM||a[d].startsWith('"')&&a[d].endsWith('"')||getOperandType(a[d],c)===OPERAND_IMM)){c.annotations.push({row:b,
-column:0,text:"Usage: DW IMM, IMM ...",type:"error"});break}}return!0}return!1}
-function getOperandType(a,c){a=a.trim();if(""===a)return OPERAND_INVALID;if(!isNaN(Number(a))&&Number(a)===Math.floor(Number(a))&&-1===a.indexOf("o")&&-1===a.indexOf("e"))return OPERAND_IMM;if(/^(a|b|c|d|x|y|bp|sp)$/.test(a.toLowerCase()))return OPERAND_REG;for(b=0;b<c.labels.length;b++)if(a===c.labels[b])return OPERAND_IMM;if(a.startsWith("[")&&a.endsWith("]")){a=a.replace("[","").replace("]","");if(!isNaN(Number(a))&&Number(a)===Math.floor(Number(a)))return OPERAND_MEM_IMM;for(var b=0;b<c.labels.length;b++)if(a===
-c.labels[b])return OPERAND_MEM_IMM;if(/^(bp|sp)$/.test(a.toLowerCase().substring(0,2).toLowerCase()))a=a.substring(2);else if(/^(a|b|c|d|x|y)$/.test(a.toLowerCase().substring(0,1).toLowerCase()))a=a.substring(1);else return OPERAND_INVALID;if(""===a.replace(/\s+/g,""))return OPERAND_MEM_REG;a=a.replace(/\s+/g,"");for(b=0;b<c.labels.length;b++)if(a.substring(1)===c.labels[b])return OPERAND_MEM_REG;if(!isNaN(Number(a))&&Number(a)===Math.floor(Number(a)))return OPERAND_MEM_REG}return OPERAND_INVALID}
-function parseInstruction(a,c,b){a=removeComment(a);a=removeLabel(a);var d=getTokens(a),e=d[0];if(void 0!==e&&""!==e&&!parseDWInstruction(a,c,b))if(/\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|hwi|hwq|nop|neg|call|ret|jmp|jnz|jg|jl|jge|jle|int|jz|js|jns|brk|not|jc|jnc|ror|rol|sal|sar|jo|jno)\b/.test(e.toLowerCase()))if(-1!==a.indexOf(","))if(d=a.substring(a.indexOf(e)+e.length,a.indexOf(",")),a=a.substring(a.indexOf(",")+1).trim(),/\b(?:mov|add|sub|and|or|test|cmp|shl|shr|xor|rol|ror|sal|sar)\b/.test(e.toLowerCase())){e=
-getOperandType(d,c);var f=getOperandType(a,c);e===OPERAND_INVALID?c.annotations.push({row:b,column:0,text:"Invalid operand: "+d,type:"error"}):f===OPERAND_INVALID?c.annotations.push({row:b,column:0,text:"Invalid operand: "+a,type:"error"}):e===OPERAND_IMM&&c.annotations.push({row:b,column:0,text:"Destination operand can't be an immediate value",type:"error"})}else c.annotations.push({row:b,column:0,text:e+" instruction with 2 operands is illegal",type:"error"});else 1<d.length?(d=a.substring(a.indexOf(e)+
-e.length).trim(),/\b(?:push|mul|pop|div|neg|call|jnz|jg|jl|jge|jle|hwi|hwq|jz|js|jns|ret|jmp|not|jc|jnc|jo|jno)\b/.test(e.toLowerCase())?getOperandType(d,c)===OPERAND_INVALID&&c.annotations.push({row:b,column:0,text:"Invalid operand: "+d,type:"error"}):c.annotations.push({row:b,column:0,text:e+" instruction with 1 operand is illegal",type:"error"})):/\b(?:ret|brk|nop)\b/.test(e.toLowerCase())||c.annotations.push({row:b,column:0,text:e+" instruction with no operand is illegal",type:"error"});else c.annotations.push({row:b,
-column:0,text:"Unknown mnemonic: "+e,type:"error"})}function parse(){for(var a=ace.edit("editor").getValue().split("\n"),c={labels:[],annotations:[]},b=0;b<a.length;b++)checkForLabel(a[b],c);for(b=0;b<a.length;b++)checkForSegmentDeclaration(a[b])||checkForEQUInstruction(a[b],c,b)||checkForORGInstruction(a[b],c,b)||parseInstruction(a[b],c,b);editor.getSession().setAnnotations(c.annotations)}
-function gameClick(){document.getElementById("editorBtns").setAttribute("style","display: none");document.getElementById("gameBtns").setAttribute("style","")}function editorClick(){document.getElementById("editorBtns").setAttribute("style","");document.getElementById("gameBtns").setAttribute("style","display: none")}editor.on("change",parse);
+function removeComment(e){return e.indexOf(";")!==-1?e.substring(0,e.indexOf(";")):e}function checkForLabel(e,t){e=removeComment(e);var r;null!==(r=/\b\w*\b:/.exec(e))&&t.labels.push(r[0].substring(0,r[0].length-1))}function checkForSegmentDeclaration(e){var t=getTokens(e);return void 0!==t[0]&&(".data"===t[0].toLowerCase()||".text"===t[0].toLowerCase())}function checkForEQUInstruction(e,t,r){var n=getTokens(e);if(e.toLowerCase().indexOf(" equ ")!==-1||void 0!==n[1]&&"equ"===n[1].toLowerCase()){var o=Number(n[2]);return isNaN(o)||o!==Math.floor(o)?(t.annotations.push({row:r,column:0,text:"Usage: constant_name EQU immediate_value",type:"error"}),!0):(t.labels.push(n[0]),!0)}return!1}function getTokens(e){for(var t=e.split(/\s+/),r=0;r<t.length;r++)""===t[r]&&t.splice(r,1);return t}function removeLabel(e){return e.replace(/\b\w*\b:/,"")}function checkForORGInstruction(e,t,r){e=removeComment(e),e=removeLabel(e);var n=getTokens(e),o=n[0];if(void 0===o||"org"!==o.toLowerCase())return!1;if(console.log(n),n.length>1){var s=Number(n[1]);return!isNaN(s)&&s===Math.floor(s)||(t.annotations.push({row:r,column:0,text:"Invalid operand: "+n[1],type:"error"}),!0)}}function parseDWInstruction(e,t,r){if(e=e.trim(),"dw"===e.substr(0,2).toLowerCase()){for(var n=e.substr(2,e.length).split(/,(?=(?:[^"]*"[^"]*")*[^"]*$)/,-1),o=0;o<n.length;o++){n[o]=n[o].trim();var s=getTokens(n[o]);if(2===s.length&&getOperandType(s[0],t)===OPERAND_IMM&&s[1].toLowerCase().startsWith("dup(")&&s[1].endsWith(")")&&getOperandType(s[1].substring(4,s[1].indexOf(")")),t)===OPERAND_IMM);else if(n[o].startsWith('"')&&n[o].endsWith('"'));else if(getOperandType(n[o],t)!==OPERAND_IMM)return t.annotations.push({row:r,column:0,text:"Usage: DW IMM, IMM ...",type:"error"}),!0}return!0}return!1}function getOperandType(e,t){if(e=e.trim(),""===e)return OPERAND_INVALID;if(!isNaN(Number(e))&&Number(e)===Math.floor(Number(e))&&e.indexOf("o")===-1&&e.indexOf("e")===-1)return OPERAND_IMM;if(new RegExp("^(a|b|c|d|x|y|bp|sp)$").test(e.toLowerCase()))return OPERAND_REG;for(r=0;r<t.labels.length;r++)if(e===t.labels[r])return OPERAND_IMM;if(e.startsWith("[")&&e.endsWith("]")){if(e=e.replace("[","").replace("]",""),!isNaN(Number(e))&&Number(e)===Math.floor(Number(e)))return OPERAND_MEM_IMM;for(var r=0;r<t.labels.length;r++)if(e===t.labels[r])return OPERAND_MEM_IMM;var n="";if(new RegExp("^(bp|sp)$").test(e.toLowerCase().substring(0,2).toLowerCase()))n=e.substring(2);else{if(!new RegExp("^(a|b|c|d|x|y)$").test(e.toLowerCase().substring(0,1).toLowerCase()))return OPERAND_INVALID;n=e.substring(1)}if(""===n.replace(/\s+/g,""))return OPERAND_MEM_REG;for(n=n.replace(/\s+/g,""),r=0;r<t.labels.length;r++)if(n.substring(1)===t.labels[r])return OPERAND_MEM_REG;if(!isNaN(Number(n))&&Number(n)===Math.floor(Number(n)))return OPERAND_MEM_REG}return OPERAND_INVALID}function parseInstruction(e,t,r){e=removeComment(e),e=removeLabel(e);var n=getTokens(e),o=n[0];if(void 0!==o&&""!==o&&!parseDWInstruction(e,t,r))if(new RegExp("\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|mul|push|pop|div|xor|hwi|hwq|nop|neg|call|ret|jmp|jnz|jg|jl|jge|jle|int|jz|js|jns|brk|not|jc|jnc|ror|rol|sal|sar|jo|jno|pushf|popf)\\b").test(o.toLowerCase()))if(e.indexOf(",")!==-1){var s=e.substring(e.indexOf(o)+o.length,e.indexOf(",")),i=e.substring(e.indexOf(",")+1).trim();if(!new RegExp("\\b(?:mov|add|sub|and|or|test|cmp|shl|shr|xor|rol|ror|sal|sar)\\b").test(o.toLowerCase()))return void t.annotations.push({row:r,column:0,text:o+" instruction with 2 operands is illegal",type:"error"});var a=getOperandType(s,t),u=getOperandType(i,t);if(a===OPERAND_INVALID)return void t.annotations.push({row:r,column:0,text:"Invalid operand: "+s,type:"error"});if(u===OPERAND_INVALID)return void t.annotations.push({row:r,column:0,text:"Invalid operand: "+i,type:"error"});a===OPERAND_IMM&&t.annotations.push({row:r,column:0,text:"Destination operand can't be an immediate value",type:"error"})}else if(n.length>1){if(s=e.substring(e.indexOf(o)+o.length).trim(),!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)\\b").test(o.toLowerCase()))return void t.annotations.push({row:r,column:0,text:o+" instruction with 1 operand is illegal",type:"error"});getOperandType(s,t)===OPERAND_INVALID&&t.annotations.push({row:r,column:0,text:"Invalid operand: "+s,type:"error"})}else new RegExp("\\b(?:ret|brk|nop|pushf|popf)\\b").test(o.toLowerCase())||t.annotations.push({row:r,column:0,text:o+" instruction with no operand is illegal",type:"error"});else t.annotations.push({row:r,column:0,text:"Unknown mnemonic: "+o,type:"error"})}function parse(){for(var e=ace.edit("editor").getValue(),t=e.split("\n"),r={labels:[],annotations:[]},n=0;n<t.length;n++)checkForLabel(t[n],r);for(n=0;n<t.length;n++)checkForSegmentDeclaration(t[n])||checkForEQUInstruction(t[n],r,n)||checkForORGInstruction(t[n],r,n)||parseInstruction(t[n],r,n);editor.getSession().setAnnotations(r.annotations)}function gameClick(){document.getElementById("editorBtns").setAttribute("style","display: none"),document.getElementById("gameBtns").setAttribute("style","")}function editorClick(){document.getElementById("editorBtns").setAttribute("style",""),document.getElementById("gameBtns").setAttribute("style","display: none")}OPERAND_INVALID=-1,OPERAND_REG=0,OPERAND_MEM_IMM=1,OPERAND_MEM_REG=2,OPERAND_IMM=3,editor=ace.edit("editor"),editor.session.setOption("useWorker",!1),editor.$blockScrolling=1/0,editor.on("change",parse);
\ No newline at end of file