1 files changed, 28 insertions(+), 2 deletions(-)

M src/processor.rs

@@ 45,7 45,7 @@ impl <'a> Processor<'a> {
                 let operands: (usize, usize, usize) = (
                     ((instruction.1 & 0xF800) >> 11) as usize,
                     ((instruction.1 & 0x07C0) >> 6) as usize,
-                    ((instruction.1 & 0x004E) >> 1) as usize,
+                    ((instruction.1 & 0x003E) >> 1) as usize,
                 );
                 let mut pc_overwrite: Option<u16> = None;
                 if operands.2 == 31 { //program counter is unwritable for non-control flow


@@ 131,7 131,7 @@ impl <'a> Processor<'a> {
                 let operands: (usize, usize, usize) = (
                     ((instruction.1 & 0xF800) >> 11) as usize,
                     ((instruction.1 & 0x07C0) >> 6) as usize,
-                    ((instruction.1 & 0x004E) >> 1) as usize,
+                    ((instruction.1 & 0x003E) >> 1) as usize,
                 );
                 let mut pc_overwrite: Option<u16> = None;
                 if operands.2 == 31 { //program counter is unwritable for non-control flow


@@ 152,6 152,7 @@ impl <'a> Processor<'a> {
                     }
                     _ => return true
                 }
+
                 if toggles.3 {
                     self.reg[operands.2] = !self.reg[operands.2];
                 };


@@ 161,6 162,31 @@ impl <'a> Processor<'a> {
                 if let Some(addr) = pc_overwrite {
                     self.reg[31] = addr;
                 }
+
+                self.reg[31] += 2;
+                return false
+            }
+            0x0300 => {
+                let toggles: (bool, bool) = ( //Flag specifier, Invert
+                    (instruction.0 & 0x0080) != 0,
+                    (instruction.0 & 0x0040) != 0
+                );
+                let operands: (usize, usize) = (
+                    ((instruction.1 & 0xF800) >> 11) as usize,
+                    ((instruction.1 & 0x07C0) >> 6) as usize,
+                );
+                match instruction.0 & 0x0030 {
+                    0x0000 => {
+                        self.flags[toggles.0 as usize] = (self.reg[operands.0] == self.reg[operands.1]) ^ toggles.1;
+                    }
+                    0x0010 => {
+                        self.flags[toggles.0 as usize] = (self.reg[operands.0] < self.reg[operands.1]) ^ toggles.1;
+                    }
+                    0x0020 => {
+                        self.flags[toggles.0 as usize] = (self.reg[operands.0] > self.reg[operands.1]) ^ toggles.1;
+                    }
+                    _ => return true
+                }
                 self.reg[31] += 2;
                 return false
             }