PVB/lemur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 51 Wiki Activity

Add markers to event stream

Browse Source
This commit is contained in:
SonicSwordcane
2025-08-27 22:49:44 -04:00
parent ed06004a60
commit 5e23df4723
4 changed files with 116 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/profiler/state.rs
+60 -56
View File
@@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf};
use anyhow::{Result, bail};
use crate::{emulator::SimEvent, profiler::symbols::SymbolFile};
use crate::profiler::symbols::SymbolFile;
pub struct ProgramState {
symbol_file: SymbolFile,
@@ -42,62 +42,66 @@ impl ProgramState {
Some((*code, call_stack))
}
pub fn track_event(&mut self, event: SimEvent) -> Result<()> {
match event {
SimEvent::Call(address) => {
let Some(code) = self.context_stack.last() else {
bail!("How did we call anything when we're halted?");
};
let Some(stack) = self.call_stacks.get_mut(code) else {
bail!("missing stack {code:04x}");
};
stack.push(StackFrame { address });
}
SimEvent::Return => {
let Some(code) = self.context_stack.last() else {
bail!("how did we return when we're halted?");
};
let Some(stack) = self.call_stacks.get_mut(code) else {
bail!("missing stack {code:04x}");
};
if stack.pop().is_none() {
bail!("returned from {code:04x} but stack was empty");
}
if stack.is_empty() {
bail!("returned to oblivion");
}
}
SimEvent::Halt => {
let Some(RESET_CODE) = self.context_stack.pop() else {
bail!("halted when not in an interrupt");
};
}
SimEvent::Interrupt(code, address) => {
// if the CPU was halted before, wake it up now
if self.context_stack.is_empty() {
self.context_stack.push(RESET_CODE);
}
pub fn track_call(&mut self, address: u32) -> Result<()> {
let Some(code) = self.context_stack.last() else {
bail!("How did we call anything when we're halted?");
};
let Some(stack) = self.call_stacks.get_mut(code) else {
bail!("missing stack {code:04x}");
};
stack.push(StackFrame { address });
Ok(())
}
self.context_stack.push(code);
if self
.call_stacks
.insert(code, vec![StackFrame { address }])
.is_some()
{
bail!("{code:04x} fired twice");
}
}
SimEvent::Reti => {
let Some(code) = self.context_stack.pop() else {
bail!("RETI when halted");
};
if code == RESET_CODE {
bail!("RETI when not in interrupt");
}
if self.call_stacks.remove(&code).is_none() {
bail!("{code:04x} popped but never called");
}
}
pub fn track_return(&mut self) -> Result<()> {
let Some(code) = self.context_stack.last() else {
bail!("how did we return when we're halted?");
};
let Some(stack) = self.call_stacks.get_mut(code) else {
bail!("missing stack {code:04x}");
};
if stack.pop().is_none() {
bail!("returned from {code:04x} but stack was empty");
}
if stack.is_empty() {
bail!("returned to oblivion");
}
Ok(())
}
pub fn track_halt(&mut self) -> Result<()> {
let Some(RESET_CODE) = self.context_stack.pop() else {
bail!("halted when not in an interrupt");
};
Ok(())
}
pub fn track_interrupt(&mut self, code: u16, address: u32) -> Result<()> {
// if the CPU was halted before, wake it up now
if self.context_stack.is_empty() {
self.context_stack.push(RESET_CODE);
}
self.context_stack.push(code);
if self
.call_stacks
.insert(code, vec![StackFrame { address }])
.is_some()
{
bail!("{code:04x} fired twice");
}
Ok(())
}
pub fn track_reti(&mut self) -> Result<()> {
let Some(code) = self.context_stack.pop() else {
bail!("RETI when halted");
};
if code == RESET_CODE {
bail!("RETI when not in interrupt");
}
if self.call_stacks.remove(&code).is_none() {
bail!("{code:04x} popped but never called");
}
Ok(())
}