Merge pull request #12 from pineman/4-decoder

pineman · Oct 1, 2023 · 1e1ebb6 · 1e1ebb6
2 parents 4919ec9 + 6b6b5f8
commit 1e1ebb6
Show file tree

Hide file tree

Showing 4 changed files with 756 additions and 278 deletions.
diff --git a/README.md b/README.md
@@ -5,8 +5,11 @@
 * https://rgbds.gbdev.io/docs/v0.6.1/gbz80.7/
 * http://z80.info/decoding.htm
 
+## References (sort of)
+* http://marc.rawer.de/Gameboy/Docs/GBCPUman.pdf
+* https://gekkio.fi/files/gb-docs/gbctr.pdf
+
 ## Misc
 * https://www.copetti.org/writings/consoles/game-boy/
 * https://gbdev.io/pandocs/
 * https://rylev.github.io/DMG-01/public/book/cpu/introduction.html
-
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -1,11 +1,12 @@
-use fpt::instructions::load_instructions;
+use fpt::instructions::{cb_instructions, load_instructions};
 use fpt::LR35902;
 
 fn main() {
     let mut lr35902 = LR35902::new();
 
     lr35902.load_bootrom(include_bytes!("../../dmg0.bin"));
     lr35902.load_instructions(load_instructions());
+    lr35902.load_cb_instructions(cb_instructions());
 
     loop {
         lr35902.step();