From e59dd8524638b2161fff2644737d32932c834030 Mon Sep 17 00:00:00 2001
From: _ <_@_>
Date: Sat, 30 Sep 2023 10:01:30 -0500
Subject: [PATCH] :bug: bug: impl opcodes

---
 src/instruction.rs |  4 ++++
 src/loader.rs      |  3 ++-
 src/state.rs       | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/instruction.rs b/src/instruction.rs
index 2746faf..134bd15 100644
--- a/src/instruction.rs
+++ b/src/instruction.rs
@@ -52,6 +52,8 @@ pub enum Instruction {
 	// MetaMethod, Binary
 	MmBin (u8, u8, u8),
 	
+	MmBinI (u8, i8, u8, bool),
+	
 	MmBinK (u8, u8, u8, bool),
 	
 	ModK (u8, u8, u8),
@@ -82,6 +84,8 @@ pub enum Instruction {
 	
 	SetTabUp (u8, u8, u8),
 	
+	Sub (u8, u8, u8),
+	
 	TailCall (u8, u8, u8, bool),
 	
 	Test (u8, bool),
diff --git a/src/loader.rs b/src/loader.rs
index a0fad1a..d9b056c 100644
--- a/src/loader.rs
+++ b/src/loader.rs
@@ -84,7 +84,6 @@ pub fn parse_inst (buf: [u8; 4]) -> Option <Inst>
 	let b = buf [2];
 	let ax = a as u32 + ((b as u32) << 8);
 	let c = buf [3];
-	let s_c = c - 0x80;
 	let bx = 
 		(((buf [1] >> 7) as u32) << 0) | 
 		((buf [2] as u32) << 1) |
@@ -114,8 +113,10 @@ pub fn parse_inst (buf: [u8; 4]) -> Option <Inst>
 		0x18 => Inst::MulK (a, b, c),
 		0x19 => Inst::ModK (a, b, c),
 		0x22 => Inst::Add (a, b, c),
+		0x23 => Inst::Sub (a, b, c),
 		0x24 => Inst::Mul (a, b, c),
 		0x2e => Inst::MmBin (a, b, c),
+		0x2f => Inst::MmBinI (a, i_sb (buf)?, c, k),
 		0x30 => Inst::MmBinK (a, b, c, k),
 		0x33 => Inst::Not (a, b),
 		0x34 => Inst::Len (a, b),
diff --git a/src/state.rs b/src/state.rs
index 563eee2..b9c854a 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -448,6 +448,9 @@ impl <'a> State <'a> {
 					panic! ("Not sure how to implememtn OP_MMBIN for these 2 values {a:?}, {b:?}");
 				}
 			},
+			Instruction::MmBinI (_a, _s_b, _c, _k) => {
+				// Ignore
+			},
 			Instruction::MmBinK (_a, _b, _c, _k) => {
 				// Ignore
 			},
@@ -633,6 +636,22 @@ impl <'a> State <'a> {
 				}
 			},
 			Instruction::SetTabUp (_a, _b, _c) => unimplemented! (),
+			Instruction::Sub (a, b, c) => {
+				let v_b = self.reg (*b);
+				let v_c = self.reg (*c);
+				
+				let x = if let (Some (v_b), Some (v_c)) = (v_b.as_int (), v_c.as_int ()) 
+				{
+					Value::from (v_b - v_c)
+				}
+				else {
+					let v_b = v_b.as_float ().unwrap_or_else (|| panic! ("{v_b}"));
+					let v_c = v_c.as_float ().unwrap_or_else (|| panic! ("{v_c}"));
+					Value::from (v_b - v_c)
+				};
+				
+				*self.reg_mut (*a) = x;
+			},
 			Instruction::TailCall (a, b, _c, k) => {
 				assert! (!k, "closing over values in tail calls not implemented");