more test coverage

gemma/src/chip8/instructions.rs

@@ -300,8 +300,8 @@ impl Chip8CpuInstructions {
             Chip8CpuInstructions::SKP(_) => INST_SKP,
             Chip8CpuInstructions::SNEB(_, _) => INST_SNEB,
             Chip8CpuInstructions::SNEY(_, _) => INST_SNEY,
-            Chip8CpuInstructions::SKNP(_) => INST_SNKP,
-            Chip8CpuInstructions::STR(x) => INST_STR,
+            Chip8CpuInstructions::SKNP(_) => INST_SKNP,
+            Chip8CpuInstructions::STR(_) => INST_STR,
             Chip8CpuInstructions::SUB(_, _) => INST_SUB,
             Chip8CpuInstructions::SUBC(_, _) => INST_SUBC,
             Chip8CpuInstructions::SYS(_) => INST_SYS,
@@ -329,8 +329,8 @@ impl Chip8CpuInstructions {
                 format!("0x{x:02x}, 0x{byte:02x}")
             }
             // Reg, Reg
-            Chip8CpuInstructions::SEY(x, y) |
-            Chip8CpuInstructions::LDR_Y(x, y) |
+            SEY(x, y) |
+            LDR_Y(x, y) |
             Chip8CpuInstructions::OR(x, y) |
             Chip8CpuInstructions::AND(x, y) |
             Chip8CpuInstructions::ORY(x, y) |
@@ -489,8 +489,44 @@ impl Chip8CpuInstructions {
             INST_RND => {
                 RND(param1 as u8, param2 as u8)
             }
-            INST_DRW => {
-                DRW(param1 as u8, param2 as u8, param3 as u8)
+            INST_SKP => {
+                SKP(param1 as u8)
+            }
+            INST_SKNP => {
+                SKNP(param1 as u8)
+            }
+            INST_LDRD => {
+                LDRD(param1 as u8)
+            }
+            INST_LDRK => {
+                LDRK(param1 as u8)
+            }
+            INST_LDRI => {
+                LDRI(param1 as u8)
+            }
+            INST_BCD => {
+                BCD(param1 as u8)
+            }
+            INST_LDF => {
+                LDFX(param1 as u8)
+            }
+            INST_LDF2 => {
+                LDF2(param1 as u8)
+            }
+            INST_LDIX => {
+                LDIX(param1 as u8)
+            }
+            INST_LIDR => {
+                LIDR(param1 as u8)
+            }
+            INST_LDIS => {
+                LDIS(param1 as u8)
+            }
+            INST_STR => {
+                STR(param1 as u8)
+            }
+            INST_LDD => {
+                LDD(param1 as u8)
             }
             _ => {
                 XXXXERRORINSTRUCTION

gemma/src/constants.rs

@@ -36,7 +36,7 @@ pub const INST_LDF2: &str = "LDF2";
 pub const INST_LDIA: &str = "LDIA";
 pub const INST_LDIX: &str = "LDIX";
 pub const INST_LIDR: &str = "LIDR";
-pub const INST_LDIS: &str = "LIDS";
+pub const INST_LDIS: &str = "LDIS";
 pub const INST_LDR: &str = "LDR";
 pub const INST_LDRD: &str = "LDRD";
 pub const INST_LDRI: &str = "LDRI";
@@ -53,9 +53,9 @@ pub const INST_SEY: &str = "SEY";
 pub const INST_SHL: &str = "SHL";
 pub const INST_SHR: &str = "SHR";
 pub const INST_SKP: &str = "SKP";
+pub const INST_SKNP: &str = "SKNP";
 pub const INST_SNEB: &str = "SNEB";
 pub const INST_SNEY: &str = "SNEY";
-pub const INST_SNKP: &str = "SNKP";
 pub const INST_STR: &str = "STR";
 pub const INST_SUB: &str = "SUB";
 pub const INST_SUBC: &str = "SUBC";