devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

core: arm7tdmi: Refactor display->disass.

Browse source 
Also, move core::disass into core::arm7tdmi::disass


Former-commit-id: 82f60cb814d6cf23e62565e34b61f8771e704525
Former-commit-id: 345ddaac674c78e77e62f106d7c0deda857fe5ed
This commit is contained in:
Michel Heily 2020-11-24 00:45:07 +02:00
parent 28a57a874a
commit 586a5bf16c
7 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
core/src/arm7tdmi/arm/display.rs → core/src/arm7tdmi/arm/disass.rs
View file

2
core/src/arm7tdmi/arm/mod.rs
View file

@ -1,5 +1,5 @@
#[cfg(feature = "debugger")] #[cfg(feature = "debugger")]
pub mod display; pub mod disass;
pub mod exec; pub mod exec;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

2
core/src/disass.rs → core/src/arm7tdmi/disass.rs
View file

@ -1,7 +1,7 @@
use std::fmt; use std::fmt;
use std::marker::PhantomData; use std::marker::PhantomData;
use super::arm7tdmi::InstructionDecoder; use super::InstructionDecoder;
use super::Addr; use super::Addr;
pub struct Disassembler<'a, D> pub struct Disassembler<'a, D>

1
core/src/arm7tdmi/mod.rs
View file

@ -17,6 +17,7 @@ pub use alu::*;
pub mod exception; pub mod exception;
pub mod psr; pub mod psr;
pub use psr::*; pub use psr::*;
pub mod disass;
pub const REG_PC: usize = 15; pub const REG_PC: usize = 15;
pub const REG_LR: usize = 14; pub const REG_LR: usize = 14;

0
core/src/arm7tdmi/thumb/display.rs → core/src/arm7tdmi/thumb/disass.rs
View file

2
core/src/arm7tdmi/thumb/mod.rs
View file

@ -6,7 +6,7 @@ use crate::byteorder::{LittleEndian, ReadBytesExt};
use crate::num::FromPrimitive; use crate::num::FromPrimitive;
#[cfg(feature = "debugger")] #[cfg(feature = "debugger")]
pub mod display; pub mod disass;
pub mod exec; pub mod exec;
#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq)] #[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq)]

2
core/src/lib.rs
View file

@ -39,9 +39,9 @@ use std::fmt;
#[macro_use] #[macro_use]
pub mod util; pub mod util;
pub mod arm7tdmi; pub mod arm7tdmi;
pub use arm7tdmi::disass;
mod bios; mod bios;
pub mod cartridge; pub mod cartridge;
pub mod disass;
pub mod gpu; pub mod gpu;
mod sched; mod sched;
pub mod sound; pub mod sound;