auto_cast: Move out of bus module

This commit is contained in:
2023-04-29 19:52:38 -05:00
parent beab7c968b
commit f4d7e514bc
7 changed files with 47 additions and 39 deletions

View File

@@ -14,7 +14,7 @@ pub mod mode;
pub mod quirks;
use self::{
bus::{Bus, Get, ReadWrite, Region::*},
bus::{Bus, Region::*},
flags::Flags,
instruction::{
disassembler::{Dis, Disassembler},
@@ -26,6 +26,7 @@ use self::{
use crate::{
bus,
error::{Error, Result},
traits::auto_cast::{AutoCast, Grab},
};
use imperative_rs::InstructionSet;
use owo_colors::OwoColorize;
@@ -492,7 +493,7 @@ impl CPU {
// Fetch slice of memory starting at pc, for var-width opcode 0xf000_iiii
let opchunk = self
.mem
.get(self.pc as usize..)
.grab(self.pc as usize..)
.ok_or(Error::InvalidAddressRange {
range: (self.pc as usize..).into(),
})?;