attempt to refactor into separate packages, but hitting a rustc panic?

Author: jeremyBanks

Cargo.lock

@@ -7,8 +7,10 @@ version = "0.1.0"
 authors = ["Jeremy Banks <[email protected]>"]
 
 [dependencies]
-futures = "*"
-hyper = "*"
-tokio = "*"
-rand = "*"
-image = "*"
+zerodmg-emulator = { version = "0.1.0", path = "zerodmg-emulator" }
+zerodmg-utils = { version = "0.1.0", path = "zerodmg-utils" }
+futures = "0.1.*"
+hyper = "0.11.*"
+tokio = "0.1.7"
+rand = "0.5.2"
+image = "0.19.0"

Cargo.toml

@@ -9,7 +9,8 @@ use std::thread;
 
 use hyper::server::Http;
 
-mod emulator;
+use zerodmg_emulator as emulator;
+
 mod server;
 
 pub fn main() {

src/main.rs

@@ -0,0 +1,11 @@
+cargo-features = ["edition"]
+
+[package]
+edition = "2018"
+name = "zerodmg-emulator"
+version = "0.1.0"
+authors = ["Jeremy Banks <[email protected]>"]
+
+[dependencies]
+zerodmg-utils = { version = "0.1.0", path = "../zerodmg-utils" }
+image = "0.19.0"

zerodmg-emulator/Cargo.toml

@@ -1,3 +1,5 @@
+use zerodmg_utils::binary::{u8_get_bit, u8_set_bit, u8s_to_u16, u16_to_u8s};
+
 use std::fmt;
 
 #[macro_use]
@@ -357,32 +359,3 @@ impl fmt::Display for OneByteRegister {
         )
     }
 }
-
-pub fn u8s_to_u16(a: u8, b: u8) -> u16 {
-    return a as u16 + ((b as u16) << 8);
-}
-
-pub fn u16_to_u8s(x: u16) -> (u8, u8) {
-    (x as u8, (x >> 8) as u8)
-}
-
-pub fn u8_get_bit(x: u8, offset: u8) -> bool {
-    if offset > 7 {
-        panic!();
-    }
-
-    (x >> offset) & 1 == 1
-}
-
-pub fn u8_set_bit(x: &mut u8, offset: u8, value: bool) {
-    if offset > 7 {
-        panic!();
-    }
-
-    let mask = 1 << offset;
-    if value {
-        *x |= mask;
-    } else {
-        *x &= !mask;
-    }
-}

src/emulator/audio.rs renamed to zerodmg-emulator/src/audio.rs

@@ -1,6 +1,7 @@
+use zerodmg_utils::binary::{u8_get_bit, u8_set_bit};
+
 use super::operation;
 use super::operation::Execution;
-use super::{u8_get_bit, u8_set_bit};
 
 use super::CPUController;
 

src/emulator/cpu/mod.rs renamed to zerodmg-emulator/src/cpu/mod.rs

@@ -1,6 +1,7 @@
+use zerodmg_utils::binary::{u8_get_bit, u8_set_bit};
+
 use super::operation;
 use super::operation::Execution;
-use super::{u8_get_bit, u8_set_bit};
 
 use super::super::memory::MemoryController;
 use super::CPUController;

src/emulator/cpu/opcodes_cb.rs renamed to zerodmg-emulator/src/cpu/opcodes_cb.rs

@@ -1,3 +1,5 @@
+use zerodmg_utils::binary::{u8_get_bit, u8_set_bit, u8s_to_u16, u16_to_u8s};
+
 use super::{CPUController, OneByteRegister};
 
 pub type Operation = fn(opcode: u8, gb: &mut super::GameBoy) -> Execution;
@@ -114,7 +116,7 @@ pub const ADD: Operation = |opcode, gb| {
     gb.cpu.a = a1;
     gb.set_z_flag(a1 == 0);
     gb.set_n_flag(false);
-    gb.set_h_flag(super::u8_get_bit(a1, 4));
+    gb.set_h_flag(u8_get_bit(a1, 4));
     gb.set_c_flag(a1 < a0);
     op_execution!{
         cycles: 1 + extra_read_cycles;
@@ -131,7 +133,7 @@ pub const SUB: Operation = |opcode, gb| {
     gb.cpu.a = a1;
     gb.set_z_flag(a1 == 0);
     gb.set_n_flag(false);
-    gb.set_h_flag(super::u8_get_bit(a1, 4));
+    gb.set_h_flag(u8_get_bit(a1, 4));
     gb.set_c_flag(a1 > a0);
     op_execution!{
         cycles: 1 + extra_read_cycles;
@@ -147,7 +149,7 @@ pub const CP: Operation = |opcode, gb| {
     let delta = a.wrapping_sub(source_value);
     gb.set_z_flag(delta == 0);
     gb.set_n_flag(false);
-    gb.set_h_flag(super::u8_get_bit(delta, 4));
+    gb.set_h_flag(u8_get_bit(delta, 4));
     gb.set_c_flag(delta > a);
     op_execution!{
         cycles: 1 + extra_read_cycles;
@@ -180,7 +182,7 @@ pub const INC: Operation = |opcode, gb| {
     let extra_write_cycles = gb.set_register(target, new_value);
     gb.set_z_flag(new_value == 0);
     gb.set_n_flag(false);
-    gb.set_h_flag(super::u8_get_bit(new_value, 4));
+    gb.set_h_flag(u8_get_bit(new_value, 4));
     op_execution!{
         cycles: 1 + extra_read_cycles + extra_write_cycles;
         asm: "INC {}", target;
@@ -195,7 +197,7 @@ pub const DEC: Operation = |opcode, gb| {
     let extra_write_cycles = gb.set_register(target, new_value);
     gb.set_z_flag(new_value == 0);
     gb.set_n_flag(true);
-    gb.set_h_flag(super::u8_get_bit(new_value, 4));
+    gb.set_h_flag(u8_get_bit(new_value, 4));
     op_execution!{
         cycles: 1 + extra_read_cycles + extra_write_cycles;
         asm: "DEC {}", target;
@@ -207,7 +209,7 @@ pub const RST: Operation = |opcode, gb| {
     let high_byte = opcode & 0b00_111_000;
     let h = gb.cpu.h;
     let pc0 = gb.cpu.pc;
-    let pc1 = super::u8s_to_u16(high_byte, h);
+    let pc1 = u8s_to_u16(high_byte, h);
     gb.stack_push(pc0);
     gb.cpu.pc = pc1;
     op_execution!{

src/emulator/cpu/opcodes_main.rs renamed to zerodmg-emulator/src/cpu/opcodes_main.rs

@@ -0,0 +1,10 @@
+cargo-features = ["edition"]
+
+[package]
+edition = "2018"
+name = "zerodmg-utils"
+version = "0.1.0"
+authors = ["Jeremy Banks <[email protected]>"]
+
+[dependencies]
+image = "0.19.0"

src/emulator/cpu/operation.rs renamed to zerodmg-emulator/src/cpu/operation.rs

@@ -0,0 +1,28 @@
+pub fn u8s_to_u16(a: u8, b: u8) -> u16 {
+    return a as u16 + ((b as u16) << 8);
+}
+
+pub fn u16_to_u8s(x: u16) -> (u8, u8) {
+    (x as u8, (x >> 8) as u8)
+}
+
+pub fn u8_get_bit(x: u8, offset: u8) -> bool {
+    if offset > 7 {
+        panic!();
+    }
+
+    (x >> offset) & 1 == 1
+}
+
+pub fn u8_set_bit(x: &mut u8, offset: u8, value: bool) {
+    if offset > 7 {
+        panic!();
+    }
+
+    let mask = 1 << offset;
+    if value {
+        *x |= mask;
+    } else {
+        *x &= !mask;
+    }
+}

src/emulator/mod.rs renamed to zerodmg-emulator/src/lib.rs

@@ -0,0 +1 @@
+pub mod binary;