From a7e8369b7500b281b814321906cfd93e11d6e673 Mon Sep 17 00:00:00 2001
From: Dan Dore <dorebell@gmail.com>
Date: Fri, 3 May 2024 14:27:23 -0700
Subject: [PATCH] adds signed lt instructions to assembler

---
 assembler/grammar/assembly.pest | 2 +-
 assembler/src/lib.rs            | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assembler/grammar/assembly.pest b/assembler/grammar/assembly.pest
index 82cea9e..bceb2fa 100644
--- a/assembler/grammar/assembly.pest
+++ b/assembler/grammar/assembly.pest
@@ -6,7 +6,7 @@ mnemonic = {
     "lw" | "sw" | "loadu8" | "loads8" | "storeu8" | "jalv" | "jal" | "beqi" | "beq" | "bnei" | "bne" | "imm32" | "stop" |
     "advread" | "advwrite" | 
     "addi" | "add" | "subi" | "sub" | "muli" | "mul" | "mulhsi"| "mulhui"| "mulhs"| "mulhu"  | "divi" | "div" | "sdiv" | "sdivi" |
-    "ilte" | "ltei" | "lte" | "ilt" | "lti" | "lt" | "shli" | "shl" | "shri" | "shr" | "srai" | "sra" |
+    "ilte" | "ltei" | "lte" | "ilt" | "lti" | "lt" | "sltei" | "slti" | "sle" | "slt" | "islt" | "isle" | "shli" | "shl" | "shri" | "shr" | "srai" | "sra" |
     "andi" | "and" | "ori" | "or" | "xori" | "xor" | "nei" | "ne" | "eqi" | "eq" |
     "feadd" | "fesub" | "femul" |
     "write"
diff --git a/assembler/src/lib.rs b/assembler/src/lib.rs
index 64a4a06..fb0bce1 100644
--- a/assembler/src/lib.rs
+++ b/assembler/src/lib.rs
@@ -10,7 +10,6 @@ pub struct AssemblyParser;
 
 pub fn assemble(input: &str) -> Result<Vec<u8>, String> {
     let parsed = AssemblyParser::parse(Rule::assembly, input).unwrap();
-
     // First pass: Record label locations
     let mut label_locations = HashMap::new();
     let mut pc = 0;
@@ -82,6 +81,8 @@ pub fn assemble(input: &str) -> Result<Vec<u8>, String> {
                     "sdiv" | "sdivi" => SDIV32,
                     "ilt" | "lt" | "lti" => LT32,
                     "ilte" | "lte" | "ltei" => LTE32,
+                    "islt" | "slt" | "slti" => SLT32,
+                    "isle" | "sle" | "slei" => SLE32,
                     "shl" | "shli" => SHL32,
                     "shr" | "shri" => SHR32,
                     "sra" | "srai" => SRA32,
@@ -123,17 +124,17 @@ pub fn assemble(input: &str) -> Result<Vec<u8>, String> {
                     }
                     "add" | "sub" | "mul" | "mulhs" | "mulhu" | "div" | "lt" | "lte" | "shl"
                     | "shr" | "sra" | "beq" | "bne" | "and" | "or" | "xor" | "ne" | "eq"
-                    | "jal" | "jalv" => {
+                    | "jal" | "jalv" | "slt" | "sle" => {
                         // (a, b, c, 0, 0)
                         operands.extend(vec![0; 2]);
                     }
                     "addi" | "subi" | "muli" | "mulhsi" | "mulhui" | "divi" | "sdivi" | "lti"
                     | "ltei" | "shli" | "shri" | "srai" | "beqi" | "bnei" | "andi" | "ori"
-                    | "xori" | "nei" | "eqi" => {
+                    | "xori" | "nei" | "eqi" | "slti" | "slei" => {
                         // (a, b, c, 0, 1)
                         operands.extend(vec![0, 1]);
                     }
-                    "ilt" | "ilte" => {
+                    "ilt" | "ilte" | "islt" | "isle" => {
                         // (a, b, c, 1, 0)
                         operands.extend(vec![1, 0]);
                     }