This commit is contained in:
2026-03-24 13:40:37 +00:00
parent 8b744a120e
commit 790629fee7
2 changed files with 7 additions and 78 deletions
@@ -257,10 +257,7 @@ impl VirtualMachine {
let mut steps_executed = 0;
let mut ending_reason: Option<LogicalFrameEndingReason> = None;
while (self.cycles - start_cycles) < budget
&& !self.halted
&& self.pc < self.program.rom.len()
{
while (self.cycles - start_cycles) < budget && !self.halted && self.pc < self.program.rom.len() {
// Debugger support: stop before executing an instruction if there's a breakpoint.
// Note: we skip the check for the very first step of a slice to avoid
// getting stuck on the same breakpoint repeatedly.
@@ -272,27 +269,6 @@ impl VirtualMachine {
let pc_before = self.pc;
let cycles_before = self.cycles;
// Fast-path for FRAME_SYNC:
// This instruction is special because it marks the end of a logical game frame.
// We peak ahead to handle it efficiently.
let opcode_val = self.peek_u16()?;
let opcode = OpCode::try_from(opcode_val)?;
if opcode == OpCode::FrameSync {
self.pc += 2; // Advance PC past the opcode
self.cycles += OpCode::FrameSync.cycles();
steps_executed += 1;
ending_reason = Some(LogicalFrameEndingReason::FrameSync);
break;
}
if opcode == OpCode::Trap {
self.pc += 2; // Advance PC past the opcode
self.cycles += OpCode::Trap.cycles();
steps_executed += 1;
ending_reason = Some(LogicalFrameEndingReason::Breakpoint);
break;
}
// Execute a single step (Fetch-Decode-Execute)
if let Err(reason) = self.step(native, ctx) {
ending_reason = Some(reason);
@@ -433,7 +409,9 @@ impl VirtualMachine {
}
}
OpCode::Trap => {
// Handled in run_budget for interruption
// Manual breakpoint instruction: consume cycles and signal a breakpoint
self.cycles += OpCode::Trap.cycles();
return Err(LogicalFrameEndingReason::Breakpoint);
}
OpCode::PushConst => {
let idx = instr
@@ -994,7 +972,9 @@ impl VirtualMachine {
}
}
OpCode::FrameSync => {
return Ok(());
// Marks the logical end of a frame: consume cycles and signal to the driver
self.cycles += OpCode::FrameSync.cycles();
return Err(LogicalFrameEndingReason::FrameSync);
}
}