From e3e024029fd21965dc3c79cd6d02c90654fb46fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Sun, 26 Jun 2022 11:09:15 +0100
Subject: [PATCH] feat: better opcodes
---
src/cpu.rs | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/cpu.rs b/src/cpu.rs
index 88b5d3dc..2b8d463a 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -5,12 +5,12 @@ pub const PREFIX: u8 = 0xcb;
pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 208] = [
// 0x0 opcodes
(nop, 4, "NOP"),
- (ld_bc_u16, 12, "LD BC, NN"),
+ (ld_bc_u16, 12, "LD BC, u16"),
(ld_mbc_a, 8, "LD [BC], A"),
(inc_bc, 8, "INC BC"),
(inc_b, 4, "INC B"),
(dec_b, 4, "DEC B"),
- (ld_b_u8, 8, "LD B, N"),
+ (ld_b_u8, 8, "LD B, u8"),
(rlca, 4, "RLCA"),
(ld_mu16_sp, 20, "LD [u16], SP"),
(add_hl_bc, 8, "ADD HL, BC"),
@@ -18,7 +18,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 208] = [
(nop, 4, "NOP"),
(nop, 4, "NOP"),
(nop, 4, "NOP"),
- (nop, 4, "NOP"),
+ (ld_c_u8, 8, "LD C, u8"),
(nop, 4, "NOP"),
// 0x1 opcodes
(nop, 4, "NOP"),
@@ -56,7 +56,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 208] = [
(nop, 4, "NOP"),
// 0x3 opcodes
(nop, 4, "NOP"),
- (ld_sp_u16, 12, "LD SP, NN"),
+ (ld_sp_u16, 12, "LD SP, u16"),
(ld_mhld_a, 8, "LD [HL]-, A"),
(nop, 4, "NOP"),
(nop, 4, "NOP"),
@@ -660,6 +660,11 @@ fn add_hl_bc(cpu: &mut Cpu) {
cpu.set_hl(value);
}
+fn ld_c_u8(cpu: &mut Cpu) {
+ let byte = cpu.read_u8();
+ cpu.c = byte;
+}
+
fn jr_nz_i8(cpu: &mut Cpu) {
let byte = cpu.read_u8() as i8;
--
GitLab