mirror of
https://github.com/transistorfet/moa.git
synced 2024-09-29 15:56:19 +00:00
Minor fixes
This commit is contained in:
parent
59199533eb
commit
1c5ad3999a
@ -71,3 +71,9 @@ impl<E> From<HostError<E>> for Error {
|
|||||||
Self::Other("other".to_string())
|
Self::Other("other".to_string())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<fmt::Error> for Error {
|
||||||
|
fn from(err: fmt::Error) -> Self {
|
||||||
|
Self::Other(format!("{:?}", err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -86,11 +86,18 @@ impl Debuggable for M68k<Instant> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn print_current_step(&mut self, _system: &System) -> Result<(), Error> {
|
fn print_current_step(&mut self, system: &System) -> Result<(), Error> {
|
||||||
|
let mut bus = system.bus.borrow_mut();
|
||||||
|
let mut adapter: BusAdapter<u32, u64, &mut dyn Addressable, Error> =
|
||||||
|
BusAdapter::new(&mut *bus, |addr| addr as u64, |err| err);
|
||||||
|
|
||||||
// TODO this is called by the debugger, but should be called some other way
|
// TODO this is called by the debugger, but should be called some other way
|
||||||
//let _ = self.decoder.decode_at(&mut self.bus, true, self.state.pc);
|
let mut decoder = M68kDecoder::new(self.info.chip, true, self.state.pc);
|
||||||
//self.decoder.dump_decoded(&mut self.bus);
|
decoder.decode_at(&mut adapter, &mut M68kBusPort::default(), true, self.state.pc)?;
|
||||||
//self.dump_state();
|
decoder.dump_decoded(system.clock, &mut adapter);
|
||||||
|
let mut writer = String::new();
|
||||||
|
self.dump_state(&mut writer)?;
|
||||||
|
println!("{}", writer);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ fn main() {
|
|||||||
Arg::new("ROM")
|
Arg::new("ROM")
|
||||||
.short('r')
|
.short('r')
|
||||||
.long("rom")
|
.long("rom")
|
||||||
.action(ArgAction::SetTrue)
|
.action(ArgAction::Set)
|
||||||
.value_name("FILE")
|
.value_name("FILE")
|
||||||
.help("ROM file to load at the start of memory"),
|
.help("ROM file to load at the start of memory"),
|
||||||
)
|
)
|
||||||
|
2
todo.txt
2
todo.txt
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
* fix the Z80 dumping functions
|
|
||||||
* fix the Z80 reset and bus_request signals
|
* fix the Z80 reset and bus_request signals
|
||||||
* the emulator_hal_memory should throw an error when an access will straddle the end of memory? Or should it autowrap?
|
* the emulator_hal_memory should throw an error when an access will straddle the end of memory? Or should it autowrap?
|
||||||
|
* fix the m68k dumping functions
|
||||||
|
|
||||||
* convert computie system to use the new moa-system library crate to replace the old core crate
|
* convert computie system to use the new moa-system library crate to replace the old core crate
|
||||||
* change package names to drop the 's', so moa-systems-computie becomes moa-system-computie
|
* change package names to drop the 's', so moa-systems-computie becomes moa-system-computie
|
||||||
|
Loading…
Reference in New Issue
Block a user