Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2024-06-30 05:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Modified timer to store its own start time

Browse Source
This commit is contained in:
transistor 2021-10-25 19:29:39 -07:00
parent 089f25903b
commit 0b17b0fc8c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpus/m68k/execute.rs
View File

@ -103,10 +103,10 @@ impl M68k {
}
pub fn cycle_one(&mut self, system: &System) -> Result<(), Error> {
let timer = self.timer.cycle.start();
self.timer.cycle.start();
self.decode_next(system)?;
self.execute_current(system)?;
self.timer.cycle.end(timer);
self.timer.cycle.end();
//if (self.timer.cycle.events % 500) == 0 {
// println!("{}", self.timer);
@ -156,9 +156,9 @@ impl M68k {
pub fn decode_next(&mut self, system: &System) -> Result<(), Error> {
self.check_breakpoints();
let timer = self.timer.decode.start();
self.timer.decode.start();
self.decoder.decode_at(system, self.state.pc)?;
self.timer.decode.end(timer);
self.timer.decode.end();
if self.debugger.use_tracing {
self.decoder.dump_decoded(system);
@ -173,7 +173,7 @@ impl M68k {
}
pub fn execute_current(&mut self, system: &System) -> Result<(), Error> {
let timer = self.timer.decode.start();
self.timer.execute.start();
match self.decoder.instruction {
Instruction::ADD(src, dest, size) => {
let value = self.get_target_value(system, src, size)?;
@ -336,7 +336,7 @@ impl M68k {
Instruction::DBcc(cond, reg, offset) => {
let condition_true = self.get_current_condition(cond);
if !condition_true {
let next = (get_value_sized(self.state.d_reg[reg as usize], Size::Word) as u16) as i16 - 1;
let next = ((get_value_sized(self.state.d_reg[reg as usize], Size::Word) as u16) as i16).wrapping_sub(1);
set_value_sized(&mut self.state.d_reg[reg as usize], next as u32, Size::Word);
if next != -1 {
self.state.pc = (self.decoder.start + 2).wrapping_add(offset as u32);
@ -661,7 +661,7 @@ impl M68k {
_ => { return Err(Error::new("Unsupported instruction")); },
}
self.timer.execute.end(timer);
self.timer.execute.end();
Ok(())
}

12
src/timers.rs
View File

@ -2,11 +2,13 @@
use std::fmt;
use std::time::Instant;
#[derive(Clone)]
pub struct AverageTimer {
pub high: u32,
pub average: f32,
pub low: u32,
pub events: u32,
pub start: Option<Instant>,
}
impl AverageTimer {
@ -16,15 +18,16 @@ impl AverageTimer {
average: 0.0,
low: u32::MAX,
events: 0,
start: None,
}
}
pub fn start(&self) -> Instant {
Instant::now()
pub fn start(&mut self) {
self.start = Some(Instant::now())
}
pub fn end(&mut self, timer: Instant) {
let time = timer.elapsed().as_nanos() as u32;
pub fn end(&mut self) {
let time = self.start.unwrap().elapsed().as_nanos() as u32;
self.events += 1;
if time > self.high {
@ -69,4 +72,3 @@ impl fmt::Display for CpuTimer {
}
}