From 09b0dd5df3894e8d58ec5ecd21c14cc7591ccb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Wed, 29 Jun 2022 16:21:59 +0100
Subject: [PATCH] feat: more instructions added
---
src/cpu.rs | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/cpu.rs b/src/cpu.rs
index 1e65cfc9..55fb7f15 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -76,7 +76,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 256] = [
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
- (nop, 4, "! UNIMP !"),
+ (ld_b_h, 4, "LD B, H"),
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
@@ -259,7 +259,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 256] = [
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
// 0xf opcodes
- (nop, 4, "! UNIMP !"),
+ (ld_a_mff00u8, 12, "LD A, [FF00+u8]"),
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
(nop, 4, "! UNIMP !"),
@@ -871,6 +871,10 @@ fn ld_a_u8(cpu: &mut Cpu) {
cpu.a = byte;
}
+fn ld_b_h(cpu: &mut Cpu) {
+ cpu.b = cpu.h;
+}
+
fn ld_c_a(cpu: &mut Cpu) {
cpu.c = cpu.a;
}
@@ -930,11 +934,11 @@ fn call_u16(cpu: &mut Cpu) {
fn ld_mff00u8_a(cpu: &mut Cpu) {
let byte = cpu.read_u8();
- cpu.mmu.write(0xff0c + byte as u16, cpu.a);
+ cpu.mmu.write(0xff00 + 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(0xff00 + cpu.c as u16, cpu.a);
}
fn ld_mu16_a(cpu: &mut Cpu) {
@@ -942,6 +946,11 @@ fn ld_mu16_a(cpu: &mut Cpu) {
cpu.mmu.write(word, cpu.a);
}
+fn ld_a_mff00u8(cpu: &mut Cpu) {
+ let byte = cpu.read_u8();
+ cpu.a = cpu.mmu.read(0xff00 + byte as u16);
+}
+
fn cp_a_u8(cpu: &mut Cpu) {
let byte = cpu.read_u8();
sub_set_flags(cpu, cpu.a, byte);
--
GitLab