From 60ef3157620ff41c4219c1b6e634ebb8f6b4fe1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Tue, 28 Jun 2022 18:32:28 +0100
Subject: [PATCH] feat: more instructions
---
examples/sdl/src/main.rs | 2 +-
src/cpu.rs | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs
index 38527b2a..118f5845 100644
--- a/examples/sdl/src/main.rs
+++ b/examples/sdl/src/main.rs
@@ -6,7 +6,7 @@ fn main() {
for _ in 0..40000 {
game_boy.clock();
- if game_boy.cpu().pc() >= 0x0016 {
+ if game_boy.cpu().pc() >= 0x0023 {
break;
}
}
diff --git a/src/cpu.rs b/src/cpu.rs
index 97287168..2433f107 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -22,7 +22,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 256] = [
(nop, 4, "NOP"),
// 0x1 opcodes
(nop, 4, "NOP"),
- (nop, 4, "NOP"),
+ (ld_de_u16, 12, "LD DE, u16"),
(nop, 4, "NOP"),
(nop, 4, "NOP"),
(nop, 4, "NOP"),
@@ -242,7 +242,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 256] = [
(nop, 4, "NOP"),
(nop, 4, "NOP"),
// 0xe opcodes
- (nop, 4, "NOP"),
+ (ld_mff00u8_a, 12, "LD [FF00+u8], A"),
(nop, 4, "NOP"),
(ld_mff00c_a, 8, "LD [FF00+C], A"),
(nop, 4, "NOP"),
@@ -731,6 +731,11 @@ fn ld_c_u8(cpu: &mut Cpu) {
cpu.c = byte;
}
+fn ld_de_u16(cpu: &mut Cpu) {
+ let word = cpu.read_u16();
+ cpu.set_de(word);
+}
+
fn jr_nz_i8(cpu: &mut Cpu) {
let byte = cpu.read_u8() as i8;
@@ -770,8 +775,13 @@ fn xor_a_a(cpu: &mut Cpu) {
cpu.set_carry(false);
}
+fn ld_mff00u8_a(cpu: &mut Cpu) {
+ let byte = cpu.read_u8();
+ cpu.mmu.write(0xff0c + byte as u16, cpu.a);
+}
+
fn ld_mff00c_a(cpu: &mut Cpu) {
- cpu.mmu.write((0xff0c + cpu.c as u16), cpu.a);
+ cpu.mmu.write(0xff0c + cpu.c as u16, cpu.a);
}
fn bit_7_h(cpu: &mut Cpu) {
--
GitLab