Move gameboy to lib

choffmann · Dec 30, 2023 · bacc6d0 · bacc6d0
1 parent 14cfdc1
commit bacc6d0
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-/target
+**/target
 /rom
diff --git a/.idea/gameboy.iml b/.idea/gameboy.iml
diff --git a/gameboy-bin/Cargo.lock b/gameboy-bin/Cargo.lock
diff --git a/gameboy-bin/Cargo.toml b/gameboy-bin/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "gameboy-bin"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+gameboy = { path = "../gameboy-lib" }
diff --git a/gameboy-bin/src/main.rs b/gameboy-bin/src/main.rs
@@ -0,0 +1,11 @@
+extern crate gameboy;
+
+fn main() {
+    let boot_rom = load_boot_rom();
+    boot_rom.iter().for_each(|n|println!("{:x}", n));
+    gameboy::start_gameboy(boot_rom);
+}
+
+fn load_boot_rom() -> Vec<u8> {
+    return std::fs::read("/mnt/datahub/projects/emulation/gameboy/rom/dmg_boot.bin").expect("Error while reading boot rom")
+}
diff --git a/Cargo.lock → gameboy-lib/Cargo.lock b/Cargo.lock → gameboy-lib/Cargo.lock
diff --git a/Cargo.toml → gameboy-lib/Cargo.toml b/Cargo.toml → gameboy-lib/Cargo.toml
diff --git a/src/cpu/cpu.rs → gameboy-lib/src/cpu/cpu.rs b/src/cpu/cpu.rs → gameboy-lib/src/cpu/cpu.rs
diff --git a/src/cpu/instructions.rs → gameboy-lib/src/cpu/instructions.rs b/src/cpu/instructions.rs → gameboy-lib/src/cpu/instructions.rs
diff --git a/src/cpu/mod.rs → gameboy-lib/src/cpu/mod.rs b/src/cpu/mod.rs → gameboy-lib/src/cpu/mod.rs
diff --git a/src/cpu/registers/flag_register.rs → ...oy-lib/src/cpu/registers/flag_register.rs b/src/cpu/registers/flag_register.rs → ...oy-lib/src/cpu/registers/flag_register.rs
diff --git a/src/cpu/registers/mod.rs → gameboy-lib/src/cpu/registers/mod.rs b/src/cpu/registers/mod.rs → gameboy-lib/src/cpu/registers/mod.rs
diff --git a/src/cpu/registers/register.rs → gameboy-lib/src/cpu/registers/register.rs b/src/cpu/registers/register.rs → gameboy-lib/src/cpu/registers/register.rs
diff --git a/src/cpu/registers/register_8bit.rs → ...oy-lib/src/cpu/registers/register_8bit.rs b/src/cpu/registers/register_8bit.rs → ...oy-lib/src/cpu/registers/register_8bit.rs
diff --git a/src/cpu/registers/stack_pointer.rs → ...oy-lib/src/cpu/registers/stack_pointer.rs b/src/cpu/registers/stack_pointer.rs → ...oy-lib/src/cpu/registers/stack_pointer.rs
diff --git a/gameboy-lib/src/lib.rs b/gameboy-lib/src/lib.rs
@@ -0,0 +1,11 @@
+use crate::cpu::cpu::CPU;
+
+pub mod cpu;
+mod memory;
+
+pub fn start_gameboy(boot_rom: Vec<u8>) {
+    let mut cpu = CPU::boot(boot_rom);
+    loop {
+        cpu.step();
+    }
+}
diff --git a/src/memory.rs → gameboy-lib/src/memory.rs b/src/memory.rs → gameboy-lib/src/memory.rs
diff --git a/src/main.rs b/src/main.rs