From 884f39ca8f597c8d5f9418b016c41868afa525d6 Mon Sep 17 00:00:00 2001 From: Michel Heily Date: Sat, 11 Apr 2020 16:06:34 +0300 Subject: [PATCH] Refactor workspace structure Former-commit-id: d6ab90563fa209b431661086f9ec2672bda02a96 --- Cargo.lock | 48 ++++++------- Cargo.toml | 68 ++----------------- bindings/rustboyadvance-jni/Cargo.toml | 2 +- bindings/rustboyadvance-jni/src/lib.rs | 6 +- bindings/rustboyadvance-jni/src/rom_helper.rs | 4 +- platform/rustboyadvance-minifb/Cargo.toml | 2 +- platform/rustboyadvance-minifb/src/main.rs | 6 +- platform/rustboyadvance-sdl2/Cargo.toml | 8 +-- platform/rustboyadvance-sdl2/src/audio.rs | 2 +- platform/rustboyadvance-sdl2/src/input.rs | 4 +- platform/rustboyadvance-sdl2/src/main.rs | 8 +-- platform/rustboyadvance-sdl2/src/video.rs | 4 +- rustboyadvance-core/Cargo.toml | 54 +++++++++++++++ build.rs => rustboyadvance-core/build.rs | 0 .../src}/core/arm7tdmi/alu.rs | 0 .../src}/core/arm7tdmi/arm/display.rs | 0 .../src}/core/arm7tdmi/arm/exec.rs | 0 .../src}/core/arm7tdmi/arm/mod.rs | 0 .../src}/core/arm7tdmi/cpu.rs | 0 .../src}/core/arm7tdmi/exception.rs | 0 .../src}/core/arm7tdmi/mod.rs | 0 .../src}/core/arm7tdmi/psr.rs | 0 .../src}/core/arm7tdmi/thumb/display.rs | 0 .../src}/core/arm7tdmi/thumb/exec.rs | 0 .../src}/core/arm7tdmi/thumb/mod.rs | 0 {src => rustboyadvance-core/src}/core/bus.rs | 0 .../src}/core/cartridge/backup/backup_file.rs | 0 .../src}/core/cartridge/backup/eeprom.rs | 0 .../src}/core/cartridge/backup/flash.rs | 0 .../src}/core/cartridge/backup/mod.rs | 0 .../src}/core/cartridge/builder.rs | 0 .../src}/core/cartridge/header.rs | 0 .../src}/core/cartridge/mod.rs | 0 {src => rustboyadvance-core/src}/core/dma.rs | 0 {src => rustboyadvance-core/src}/core/gba.rs | 4 +- .../src}/core/gpu/layer.rs | 0 .../src}/core/gpu/mod.rs | 0 .../src}/core/gpu/mosaic.rs | 0 .../src}/core/gpu/regs.rs | 0 .../src}/core/gpu/render.rs | 0 .../src}/core/gpu/render/bitmap.rs | 0 .../src}/core/gpu/render/obj.rs | 0 .../src}/core/gpu/render/text.rs | 0 .../src}/core/gpu/rgb15.rs | 0 .../src}/core/gpu/sfx.rs | 0 .../src}/core/gpu/window.rs | 0 .../src}/core/interrupt.rs | 0 .../src}/core/iodev.rs | 0 .../src}/core/keypad.rs | 0 {src => rustboyadvance-core/src}/core/mod.rs | 0 .../src}/core/sound/dsp.rs | 0 .../src}/core/sound/fifo.rs | 0 .../src}/core/sound/mod.rs | 0 .../src}/core/sysbus.rs | 0 .../src}/core/timer.rs | 0 .../src}/debugger/command.rs | 0 .../src}/debugger/mod.rs | 0 .../src}/debugger/palette_view.rs | 0 .../src}/debugger/parser.rs | 0 .../src}/debugger/tile_view.rs | 0 {src => rustboyadvance-core/src}/disass.rs | 0 {src => rustboyadvance-core/src}/gdb.rs | 0 {src => rustboyadvance-core/src}/lib.rs | 0 {src => rustboyadvance-core/src}/util.rs | 0 64 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 rustboyadvance-core/Cargo.toml rename build.rs => rustboyadvance-core/build.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/alu.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/arm/display.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/arm/exec.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/arm/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/cpu.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/exception.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/psr.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/thumb/display.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/thumb/exec.rs (100%) rename {src => rustboyadvance-core/src}/core/arm7tdmi/thumb/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/bus.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/backup/backup_file.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/backup/eeprom.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/backup/flash.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/backup/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/builder.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/header.rs (100%) rename {src => rustboyadvance-core/src}/core/cartridge/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/dma.rs (100%) rename {src => rustboyadvance-core/src}/core/gba.rs (97%) rename {src => rustboyadvance-core/src}/core/gpu/layer.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/mosaic.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/regs.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/render.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/render/bitmap.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/render/obj.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/render/text.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/rgb15.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/sfx.rs (100%) rename {src => rustboyadvance-core/src}/core/gpu/window.rs (100%) rename {src => rustboyadvance-core/src}/core/interrupt.rs (100%) rename {src => rustboyadvance-core/src}/core/iodev.rs (100%) rename {src => rustboyadvance-core/src}/core/keypad.rs (100%) rename {src => rustboyadvance-core/src}/core/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/sound/dsp.rs (100%) rename {src => rustboyadvance-core/src}/core/sound/fifo.rs (100%) rename {src => rustboyadvance-core/src}/core/sound/mod.rs (100%) rename {src => rustboyadvance-core/src}/core/sysbus.rs (100%) rename {src => rustboyadvance-core/src}/core/timer.rs (100%) rename {src => rustboyadvance-core/src}/debugger/command.rs (100%) rename {src => rustboyadvance-core/src}/debugger/mod.rs (100%) rename {src => rustboyadvance-core/src}/debugger/palette_view.rs (100%) rename {src => rustboyadvance-core/src}/debugger/parser.rs (100%) rename {src => rustboyadvance-core/src}/debugger/tile_view.rs (100%) rename {src => rustboyadvance-core/src}/disass.rs (100%) rename {src => rustboyadvance-core/src}/gdb.rs (100%) rename {src => rustboyadvance-core/src}/lib.rs (100%) rename {src => rustboyadvance-core/src}/util.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 5c2a56f..2eda8d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -981,29 +981,7 @@ dependencies = [ ] [[package]] -name = "rustboyadvance-jni" -version = "0.1.0" -dependencies = [ - "android_log 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "jni 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ringbuf 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustboyadvance-ng 0.1.0", -] - -[[package]] -name = "rustboyadvance-minifb" -version = "0.1.0" -dependencies = [ - "bit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "minifb 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustboyadvance-ng 0.1.0", -] - -[[package]] -name = "rustboyadvance-ng" +name = "rustboyadvance-core" version = "0.1.0" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1033,6 +1011,28 @@ dependencies = [ "zip 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustboyadvance-jni" +version = "0.1.0" +dependencies = [ + "android_log 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "jni 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "ringbuf 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustboyadvance-core 0.1.0", +] + +[[package]] +name = "rustboyadvance-minifb" +version = "0.1.0" +dependencies = [ + "bit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "minifb 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rustboyadvance-core 0.1.0", +] + [[package]] name = "rustboyadvance-sdl2" version = "0.1.0" @@ -1043,7 +1043,7 @@ dependencies = [ "flexi_logger 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "ringbuf 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustboyadvance-ng 0.1.0", + "rustboyadvance-core 0.1.0", "sdl2 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "spin_sleep 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 70c1a3b..c07a667 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,61 +1,7 @@ -[package] -name = "rustboyadvance-ng" -version = "0.1.0" -authors = ["Michel Heily "] -edition = "2018" - -[workspace] -members = [ - "platform/rustboyadvance-sdl2", - "platform/rustboyadvance-minifb", - "bindings/rustboyadvance-jni", -] - -[dependencies] -serde = {version = "1.0.104", features = ["derive"] } -bincode = "1.2.1" -byteorder = "1" -num = "0.2.1" -num-traits = "0.2" -enum-primitive-derive = "^0.1" -bit = "^0.1" -colored = "1.9" -ansi_term = "0.12.1" -hexdump = "0.1.0" -time = "0.2.6" -bitfield = "0.13.1" -bitflags = "1.2.1" -zip = {version = "0.5.4", default-features = false, features = ["deflate", "time"]} -ctrlc = "3.1.3" -bit-set = "0.5.1" -debug_stub_derive = "0.3.0" -bytesize = "1.0.0" -memmem = "0.1.1" -log = "0.4.8" -arrayvec = "0.5.1" - -rustyline = {version = "6.0.0", optional = true} -nom = {version = "5.0.0", optional = true} -gdbstub = { version = "0.1.2", optional = true, features = ["std"] } - -[build-dependencies] -bit = "^0.1" - -[dev-dependencies] -criterion = "0.3" - -[[bench]] -name = "performance" -harness = false - -[features] -default = ["arm7tdmi_dispatch_table"] -debugger = ["nom", "rustyline"] -gdb = ["gdbstub"] -# Uses lookup tables when executing instructions instead of `match` statements. -# Faster, but consumes more memory. -arm7tdmi_dispatch_table = [] - -[profile.dev] -opt-level = 0 -debug = true \ No newline at end of file +[workspace] +members = [ + "rustboyadvance-core/", + "platform/rustboyadvance-sdl2", + "platform/rustboyadvance-minifb", + "bindings/rustboyadvance-jni", +] \ No newline at end of file diff --git a/bindings/rustboyadvance-jni/Cargo.toml b/bindings/rustboyadvance-jni/Cargo.toml index 5c49f34..d38a2f7 100644 --- a/bindings/rustboyadvance-jni/Cargo.toml +++ b/bindings/rustboyadvance-jni/Cargo.toml @@ -10,7 +10,7 @@ publish = false crate-type = ["staticlib", "cdylib"] [dependencies] -rustboyadvance-ng = {path = "../../"} +rustboyadvance-core = {path = "../../rustboyadvance-core/"} jni = { version = "0.14", default-features = false } log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]} ringbuf = "0.2.1" diff --git a/bindings/rustboyadvance-jni/src/lib.rs b/bindings/rustboyadvance-jni/src/lib.rs index 90fc3da..5e45ad0 100644 --- a/bindings/rustboyadvance-jni/src/lib.rs +++ b/bindings/rustboyadvance-jni/src/lib.rs @@ -22,8 +22,8 @@ use env_logger; use ringbuf::{Consumer, Producer, RingBuffer}; -use rustboyadvance_ng::prelude::*; -use rustboyadvance_ng::StereoSample; +use rustboyadvance_core::prelude::*; +use rustboyadvance_core::StereoSample; struct AudioRingBuffer { pub prod: Producer, @@ -190,7 +190,7 @@ pub mod bindings { rom: jbyteArray, frame_buffer: jintArray, save_file: JString, - skip_bios: jboolean + skip_bios: jboolean, ) -> jlong { match internal_open_context(&env, bios, rom, frame_buffer, save_file, skip_bios) { Ok(ctx) => Box::into_raw(Box::new(Mutex::new(ctx))) as jlong, diff --git a/bindings/rustboyadvance-jni/src/rom_helper.rs b/bindings/rustboyadvance-jni/src/rom_helper.rs index 1415cc4..bc966a4 100644 --- a/bindings/rustboyadvance-jni/src/rom_helper.rs +++ b/bindings/rustboyadvance-jni/src/rom_helper.rs @@ -2,7 +2,7 @@ use jni::objects::*; use jni::sys::*; use jni::{JNIEnv, JavaVM}; -use rustboyadvance_ng::core::cartridge; +use rustboyadvance_core::core::cartridge; fn parse_rom_header(env: &JNIEnv, barr: jbyteArray) -> cartridge::header::CartridgeHeader { let rom_data = env.convert_byte_array(barr).unwrap(); @@ -27,4 +27,4 @@ pub unsafe extern "C" fn Java_com_mrmichel_rustboyadvance_RomHelper_getGameTitle ) -> jstring { let header = parse_rom_header(&env, rom_data); env.new_string(header.game_title).unwrap().into_inner() -} \ No newline at end of file +} diff --git a/platform/rustboyadvance-minifb/Cargo.toml b/platform/rustboyadvance-minifb/Cargo.toml index 6564344..acfc204 100644 --- a/platform/rustboyadvance-minifb/Cargo.toml +++ b/platform/rustboyadvance-minifb/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-ng = {path = "../../"} +rustboyadvance-core = {path = "../../rustboyadvance-core/"} minifb = "0.11.2" clap = {version = "2.33", features = ["color", "yaml"]} bit = "^0.1" diff --git a/platform/rustboyadvance-minifb/src/main.rs b/platform/rustboyadvance-minifb/src/main.rs index c0d7a90..b659f67 100644 --- a/platform/rustboyadvance-minifb/src/main.rs +++ b/platform/rustboyadvance-minifb/src/main.rs @@ -9,9 +9,9 @@ extern crate clap; #[macro_use] extern crate rustboyadvance_ng; -use rustboyadvance_ng::core::keypad; -use rustboyadvance_ng::prelude::*; -use rustboyadvance_ng::util::FpsCounter; +use rustboyadvance_core::core::keypad; +use rustboyadvance_core::prelude::*; +use rustboyadvance_core::util::FpsCounter; use bit::BitIndex; use minifb; diff --git a/platform/rustboyadvance-sdl2/Cargo.toml b/platform/rustboyadvance-sdl2/Cargo.toml index 0392478..effc389 100644 --- a/platform/rustboyadvance-sdl2/Cargo.toml +++ b/platform/rustboyadvance-sdl2/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-ng = {path = "../../"} +rustboyadvance-core = {path = "../../rustboyadvance-core/"} sdl2 = {version = "0.33.0", features = ["image"]} ringbuf = "0.2.1" bytesize = "1.0.0" @@ -20,6 +20,6 @@ spin_sleep="0.3.7" winres = "0.1" [features] -debugger = ["rustboyadvance-ng/debugger"] -gdb = ["rustboyadvance-ng/gdb"] -arm7tdmi_dispatch_table = ["rustboyadvance-ng/arm7tdmi_dispatch_table"] \ No newline at end of file +debugger = ["rustboyadvance-core/debugger"] +gdb = ["rustboyadvance-core/gdb"] +arm7tdmi_dispatch_table = ["rustboyadvance-core/arm7tdmi_dispatch_table"] \ No newline at end of file diff --git a/platform/rustboyadvance-sdl2/src/audio.rs b/platform/rustboyadvance-sdl2/src/audio.rs index cbd9441..1aad34d 100644 --- a/platform/rustboyadvance-sdl2/src/audio.rs +++ b/platform/rustboyadvance-sdl2/src/audio.rs @@ -1,7 +1,7 @@ use sdl2; use sdl2::audio::{AudioCallback, AudioDevice, AudioSpec, AudioSpecDesired}; -use rustboyadvance_ng::{AudioInterface, StereoSample}; +use rustboyadvance_core::{AudioInterface, StereoSample}; use ringbuf; use ringbuf::{Consumer, Producer, RingBuffer}; diff --git a/platform/rustboyadvance-sdl2/src/input.rs b/platform/rustboyadvance-sdl2/src/input.rs index 1614e66..d91513a 100644 --- a/platform/rustboyadvance-sdl2/src/input.rs +++ b/platform/rustboyadvance-sdl2/src/input.rs @@ -1,7 +1,7 @@ use sdl2::keyboard::Keycode; -use rustboyadvance_ng::core::keypad as gba_keypad; -use rustboyadvance_ng::InputInterface; +use rustboyadvance_core::core::keypad as gba_keypad; +use rustboyadvance_core::InputInterface; use bit; use bit::BitIndex; diff --git a/platform/rustboyadvance-sdl2/src/main.rs b/platform/rustboyadvance-sdl2/src/main.rs index eacb35f..2f03f5b 100644 --- a/platform/rustboyadvance-sdl2/src/main.rs +++ b/platform/rustboyadvance-sdl2/src/main.rs @@ -35,10 +35,10 @@ use audio::create_audio_player; use input::create_input; use video::{create_video_interface, SCREEN_HEIGHT, SCREEN_WIDTH}; -use rustboyadvance_ng::core::cartridge::BackupType; -use rustboyadvance_ng::prelude::*; -use rustboyadvance_ng::util::spawn_and_run_gdb_server; -use rustboyadvance_ng::util::FpsCounter; +use rustboyadvance_core::core::cartridge::BackupType; +use rustboyadvance_core::prelude::*; +use rustboyadvance_core::util::spawn_and_run_gdb_server; +use rustboyadvance_core::util::FpsCounter; const LOG_DIR: &str = ".logs"; const DEFAULT_GDB_SERVER_ADDR: &'static str = "localhost:1337"; diff --git a/platform/rustboyadvance-sdl2/src/video.rs b/platform/rustboyadvance-sdl2/src/video.rs index 51ecfca..26f1b0c 100644 --- a/platform/rustboyadvance-sdl2/src/video.rs +++ b/platform/rustboyadvance-sdl2/src/video.rs @@ -3,8 +3,8 @@ use sdl2::rect::Rect; use sdl2::render::{Texture, TextureCreator, WindowCanvas}; use sdl2::video::WindowContext; -use rustboyadvance_ng::core::gpu::{DISPLAY_HEIGHT, DISPLAY_WIDTH}; -use rustboyadvance_ng::VideoInterface; +use rustboyadvance_core::core::gpu::{DISPLAY_HEIGHT, DISPLAY_WIDTH}; +use rustboyadvance_core::VideoInterface; pub const SCREEN_WIDTH: u32 = DISPLAY_WIDTH as u32; pub const SCREEN_HEIGHT: u32 = DISPLAY_HEIGHT as u32; diff --git a/rustboyadvance-core/Cargo.toml b/rustboyadvance-core/Cargo.toml new file mode 100644 index 0000000..40e2669 --- /dev/null +++ b/rustboyadvance-core/Cargo.toml @@ -0,0 +1,54 @@ +[package] +name = "rustboyadvance-core" +version = "0.1.0" +authors = ["Michel Heily "] +edition = "2018" + +[dependencies] +serde = {version = "1.0.104", features = ["derive"] } +bincode = "1.2.1" +byteorder = "1" +num = "0.2.1" +num-traits = "0.2" +enum-primitive-derive = "^0.1" +bit = "^0.1" +colored = "1.9" +ansi_term = "0.12.1" +hexdump = "0.1.0" +time = "0.2.6" +bitfield = "0.13.1" +bitflags = "1.2.1" +zip = {version = "0.5.4", default-features = false, features = ["deflate", "time"]} +ctrlc = "3.1.3" +bit-set = "0.5.1" +debug_stub_derive = "0.3.0" +bytesize = "1.0.0" +memmem = "0.1.1" +log = "0.4.8" +arrayvec = "0.5.1" + +rustyline = {version = "6.0.0", optional = true} +nom = {version = "5.0.0", optional = true} +gdbstub = { version = "0.1.2", optional = true, features = ["std"] } + +[build-dependencies] +bit = "^0.1" + +[dev-dependencies] +criterion = "0.3" + +[[bench]] +name = "performance" +harness = false + +[features] +default = ["arm7tdmi_dispatch_table"] +debugger = ["nom", "rustyline"] +gdb = ["gdbstub"] +# Uses lookup tables when executing instructions instead of `match` statements. +# Faster, but consumes more memory. +arm7tdmi_dispatch_table = [] + +[profile.dev] +opt-level = 0 +debug = true \ No newline at end of file diff --git a/build.rs b/rustboyadvance-core/build.rs similarity index 100% rename from build.rs rename to rustboyadvance-core/build.rs diff --git a/src/core/arm7tdmi/alu.rs b/rustboyadvance-core/src/core/arm7tdmi/alu.rs similarity index 100% rename from src/core/arm7tdmi/alu.rs rename to rustboyadvance-core/src/core/arm7tdmi/alu.rs diff --git a/src/core/arm7tdmi/arm/display.rs b/rustboyadvance-core/src/core/arm7tdmi/arm/display.rs similarity index 100% rename from src/core/arm7tdmi/arm/display.rs rename to rustboyadvance-core/src/core/arm7tdmi/arm/display.rs diff --git a/src/core/arm7tdmi/arm/exec.rs b/rustboyadvance-core/src/core/arm7tdmi/arm/exec.rs similarity index 100% rename from src/core/arm7tdmi/arm/exec.rs rename to rustboyadvance-core/src/core/arm7tdmi/arm/exec.rs diff --git a/src/core/arm7tdmi/arm/mod.rs b/rustboyadvance-core/src/core/arm7tdmi/arm/mod.rs similarity index 100% rename from src/core/arm7tdmi/arm/mod.rs rename to rustboyadvance-core/src/core/arm7tdmi/arm/mod.rs diff --git a/src/core/arm7tdmi/cpu.rs b/rustboyadvance-core/src/core/arm7tdmi/cpu.rs similarity index 100% rename from src/core/arm7tdmi/cpu.rs rename to rustboyadvance-core/src/core/arm7tdmi/cpu.rs diff --git a/src/core/arm7tdmi/exception.rs b/rustboyadvance-core/src/core/arm7tdmi/exception.rs similarity index 100% rename from src/core/arm7tdmi/exception.rs rename to rustboyadvance-core/src/core/arm7tdmi/exception.rs diff --git a/src/core/arm7tdmi/mod.rs b/rustboyadvance-core/src/core/arm7tdmi/mod.rs similarity index 100% rename from src/core/arm7tdmi/mod.rs rename to rustboyadvance-core/src/core/arm7tdmi/mod.rs diff --git a/src/core/arm7tdmi/psr.rs b/rustboyadvance-core/src/core/arm7tdmi/psr.rs similarity index 100% rename from src/core/arm7tdmi/psr.rs rename to rustboyadvance-core/src/core/arm7tdmi/psr.rs diff --git a/src/core/arm7tdmi/thumb/display.rs b/rustboyadvance-core/src/core/arm7tdmi/thumb/display.rs similarity index 100% rename from src/core/arm7tdmi/thumb/display.rs rename to rustboyadvance-core/src/core/arm7tdmi/thumb/display.rs diff --git a/src/core/arm7tdmi/thumb/exec.rs b/rustboyadvance-core/src/core/arm7tdmi/thumb/exec.rs similarity index 100% rename from src/core/arm7tdmi/thumb/exec.rs rename to rustboyadvance-core/src/core/arm7tdmi/thumb/exec.rs diff --git a/src/core/arm7tdmi/thumb/mod.rs b/rustboyadvance-core/src/core/arm7tdmi/thumb/mod.rs similarity index 100% rename from src/core/arm7tdmi/thumb/mod.rs rename to rustboyadvance-core/src/core/arm7tdmi/thumb/mod.rs diff --git a/src/core/bus.rs b/rustboyadvance-core/src/core/bus.rs similarity index 100% rename from src/core/bus.rs rename to rustboyadvance-core/src/core/bus.rs diff --git a/src/core/cartridge/backup/backup_file.rs b/rustboyadvance-core/src/core/cartridge/backup/backup_file.rs similarity index 100% rename from src/core/cartridge/backup/backup_file.rs rename to rustboyadvance-core/src/core/cartridge/backup/backup_file.rs diff --git a/src/core/cartridge/backup/eeprom.rs b/rustboyadvance-core/src/core/cartridge/backup/eeprom.rs similarity index 100% rename from src/core/cartridge/backup/eeprom.rs rename to rustboyadvance-core/src/core/cartridge/backup/eeprom.rs diff --git a/src/core/cartridge/backup/flash.rs b/rustboyadvance-core/src/core/cartridge/backup/flash.rs similarity index 100% rename from src/core/cartridge/backup/flash.rs rename to rustboyadvance-core/src/core/cartridge/backup/flash.rs diff --git a/src/core/cartridge/backup/mod.rs b/rustboyadvance-core/src/core/cartridge/backup/mod.rs similarity index 100% rename from src/core/cartridge/backup/mod.rs rename to rustboyadvance-core/src/core/cartridge/backup/mod.rs diff --git a/src/core/cartridge/builder.rs b/rustboyadvance-core/src/core/cartridge/builder.rs similarity index 100% rename from src/core/cartridge/builder.rs rename to rustboyadvance-core/src/core/cartridge/builder.rs diff --git a/src/core/cartridge/header.rs b/rustboyadvance-core/src/core/cartridge/header.rs similarity index 100% rename from src/core/cartridge/header.rs rename to rustboyadvance-core/src/core/cartridge/header.rs diff --git a/src/core/cartridge/mod.rs b/rustboyadvance-core/src/core/cartridge/mod.rs similarity index 100% rename from src/core/cartridge/mod.rs rename to rustboyadvance-core/src/core/cartridge/mod.rs diff --git a/src/core/dma.rs b/rustboyadvance-core/src/core/dma.rs similarity index 100% rename from src/core/dma.rs rename to rustboyadvance-core/src/core/dma.rs diff --git a/src/core/gba.rs b/rustboyadvance-core/src/core/gba.rs similarity index 97% rename from src/core/gba.rs rename to rustboyadvance-core/src/core/gba.rs index dd3478b..a1757a6 100644 --- a/src/core/gba.rs +++ b/rustboyadvance-core/src/core/gba.rs @@ -276,7 +276,7 @@ mod tests { #[test] fn test_arm7tdmi_arm_eggvance() { - let mut gba = make_mock_gba(include_bytes!("../../external/gba-suite/arm/arm.gba")); + let mut gba = make_mock_gba(include_bytes!("../../../external/gba-suite/arm/arm.gba")); for _ in 0..10 { gba.frame(); @@ -289,7 +289,7 @@ mod tests { #[test] fn test_arm7tdmi_thumb_eggvance() { - let mut gba = make_mock_gba(include_bytes!("../../external/gba-suite/thumb/thumb.gba")); + let mut gba = make_mock_gba(include_bytes!("../../../external/gba-suite/thumb/thumb.gba")); for _ in 0..10 { gba.frame(); diff --git a/src/core/gpu/layer.rs b/rustboyadvance-core/src/core/gpu/layer.rs similarity index 100% rename from src/core/gpu/layer.rs rename to rustboyadvance-core/src/core/gpu/layer.rs diff --git a/src/core/gpu/mod.rs b/rustboyadvance-core/src/core/gpu/mod.rs similarity index 100% rename from src/core/gpu/mod.rs rename to rustboyadvance-core/src/core/gpu/mod.rs diff --git a/src/core/gpu/mosaic.rs b/rustboyadvance-core/src/core/gpu/mosaic.rs similarity index 100% rename from src/core/gpu/mosaic.rs rename to rustboyadvance-core/src/core/gpu/mosaic.rs diff --git a/src/core/gpu/regs.rs b/rustboyadvance-core/src/core/gpu/regs.rs similarity index 100% rename from src/core/gpu/regs.rs rename to rustboyadvance-core/src/core/gpu/regs.rs diff --git a/src/core/gpu/render.rs b/rustboyadvance-core/src/core/gpu/render.rs similarity index 100% rename from src/core/gpu/render.rs rename to rustboyadvance-core/src/core/gpu/render.rs diff --git a/src/core/gpu/render/bitmap.rs b/rustboyadvance-core/src/core/gpu/render/bitmap.rs similarity index 100% rename from src/core/gpu/render/bitmap.rs rename to rustboyadvance-core/src/core/gpu/render/bitmap.rs diff --git a/src/core/gpu/render/obj.rs b/rustboyadvance-core/src/core/gpu/render/obj.rs similarity index 100% rename from src/core/gpu/render/obj.rs rename to rustboyadvance-core/src/core/gpu/render/obj.rs diff --git a/src/core/gpu/render/text.rs b/rustboyadvance-core/src/core/gpu/render/text.rs similarity index 100% rename from src/core/gpu/render/text.rs rename to rustboyadvance-core/src/core/gpu/render/text.rs diff --git a/src/core/gpu/rgb15.rs b/rustboyadvance-core/src/core/gpu/rgb15.rs similarity index 100% rename from src/core/gpu/rgb15.rs rename to rustboyadvance-core/src/core/gpu/rgb15.rs diff --git a/src/core/gpu/sfx.rs b/rustboyadvance-core/src/core/gpu/sfx.rs similarity index 100% rename from src/core/gpu/sfx.rs rename to rustboyadvance-core/src/core/gpu/sfx.rs diff --git a/src/core/gpu/window.rs b/rustboyadvance-core/src/core/gpu/window.rs similarity index 100% rename from src/core/gpu/window.rs rename to rustboyadvance-core/src/core/gpu/window.rs diff --git a/src/core/interrupt.rs b/rustboyadvance-core/src/core/interrupt.rs similarity index 100% rename from src/core/interrupt.rs rename to rustboyadvance-core/src/core/interrupt.rs diff --git a/src/core/iodev.rs b/rustboyadvance-core/src/core/iodev.rs similarity index 100% rename from src/core/iodev.rs rename to rustboyadvance-core/src/core/iodev.rs diff --git a/src/core/keypad.rs b/rustboyadvance-core/src/core/keypad.rs similarity index 100% rename from src/core/keypad.rs rename to rustboyadvance-core/src/core/keypad.rs diff --git a/src/core/mod.rs b/rustboyadvance-core/src/core/mod.rs similarity index 100% rename from src/core/mod.rs rename to rustboyadvance-core/src/core/mod.rs diff --git a/src/core/sound/dsp.rs b/rustboyadvance-core/src/core/sound/dsp.rs similarity index 100% rename from src/core/sound/dsp.rs rename to rustboyadvance-core/src/core/sound/dsp.rs diff --git a/src/core/sound/fifo.rs b/rustboyadvance-core/src/core/sound/fifo.rs similarity index 100% rename from src/core/sound/fifo.rs rename to rustboyadvance-core/src/core/sound/fifo.rs diff --git a/src/core/sound/mod.rs b/rustboyadvance-core/src/core/sound/mod.rs similarity index 100% rename from src/core/sound/mod.rs rename to rustboyadvance-core/src/core/sound/mod.rs diff --git a/src/core/sysbus.rs b/rustboyadvance-core/src/core/sysbus.rs similarity index 100% rename from src/core/sysbus.rs rename to rustboyadvance-core/src/core/sysbus.rs diff --git a/src/core/timer.rs b/rustboyadvance-core/src/core/timer.rs similarity index 100% rename from src/core/timer.rs rename to rustboyadvance-core/src/core/timer.rs diff --git a/src/debugger/command.rs b/rustboyadvance-core/src/debugger/command.rs similarity index 100% rename from src/debugger/command.rs rename to rustboyadvance-core/src/debugger/command.rs diff --git a/src/debugger/mod.rs b/rustboyadvance-core/src/debugger/mod.rs similarity index 100% rename from src/debugger/mod.rs rename to rustboyadvance-core/src/debugger/mod.rs diff --git a/src/debugger/palette_view.rs b/rustboyadvance-core/src/debugger/palette_view.rs similarity index 100% rename from src/debugger/palette_view.rs rename to rustboyadvance-core/src/debugger/palette_view.rs diff --git a/src/debugger/parser.rs b/rustboyadvance-core/src/debugger/parser.rs similarity index 100% rename from src/debugger/parser.rs rename to rustboyadvance-core/src/debugger/parser.rs diff --git a/src/debugger/tile_view.rs b/rustboyadvance-core/src/debugger/tile_view.rs similarity index 100% rename from src/debugger/tile_view.rs rename to rustboyadvance-core/src/debugger/tile_view.rs diff --git a/src/disass.rs b/rustboyadvance-core/src/disass.rs similarity index 100% rename from src/disass.rs rename to rustboyadvance-core/src/disass.rs diff --git a/src/gdb.rs b/rustboyadvance-core/src/gdb.rs similarity index 100% rename from src/gdb.rs rename to rustboyadvance-core/src/gdb.rs diff --git a/src/lib.rs b/rustboyadvance-core/src/lib.rs similarity index 100% rename from src/lib.rs rename to rustboyadvance-core/src/lib.rs diff --git a/src/util.rs b/rustboyadvance-core/src/util.rs similarity index 100% rename from src/util.rs rename to rustboyadvance-core/src/util.rs