core: arm7tdmi: Refactor display->disass.
Also, move core::disass into core::arm7tdmi::disass Former-commit-id: 82f60cb814d6cf23e62565e34b61f8771e704525 Former-commit-id: 345ddaac674c78e77e62f106d7c0deda857fe5ed
This commit is contained in:
parent
28a57a874a
commit
586a5bf16c
|
@ -1,5 +1,5 @@
|
|||
#[cfg(feature = "debugger")]
|
||||
pub mod display;
|
||||
pub mod disass;
|
||||
pub mod exec;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::fmt;
|
||||
use std::marker::PhantomData;
|
||||
|
||||
use super::arm7tdmi::InstructionDecoder;
|
||||
use super::InstructionDecoder;
|
||||
use super::Addr;
|
||||
|
||||
pub struct Disassembler<'a, D>
|
|
@ -17,6 +17,7 @@ pub use alu::*;
|
|||
pub mod exception;
|
||||
pub mod psr;
|
||||
pub use psr::*;
|
||||
pub mod disass;
|
||||
|
||||
pub const REG_PC: usize = 15;
|
||||
pub const REG_LR: usize = 14;
|
||||
|
|
|
@ -6,7 +6,7 @@ use crate::byteorder::{LittleEndian, ReadBytesExt};
|
|||
use crate::num::FromPrimitive;
|
||||
|
||||
#[cfg(feature = "debugger")]
|
||||
pub mod display;
|
||||
pub mod disass;
|
||||
pub mod exec;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq)]
|
||||
|
|
|
@ -39,9 +39,9 @@ use std::fmt;
|
|||
#[macro_use]
|
||||
pub mod util;
|
||||
pub mod arm7tdmi;
|
||||
pub use arm7tdmi::disass;
|
||||
mod bios;
|
||||
pub mod cartridge;
|
||||
pub mod disass;
|
||||
pub mod gpu;
|
||||
mod sched;
|
||||
pub mod sound;
|
||||
|
|
Reference in a new issue