implements PLN-0058
Intrepid/Prometeu/Runtime/pipeline/head This commit looks good
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good

This commit is contained in:
2026-05-15 06:55:26 +01:00
parent bfe900797f
commit 4d2ea6400d
19 changed files with 499 additions and 281 deletions
@@ -58,11 +58,7 @@ impl HostDebugger {
// Pre-load cartridge metadata so the Handshake message can contain
// valid information about the App being debugged.
if let Ok(cartridge) = CartridgeLoader::load(path) {
let _ = firmware.os.vm_runtime.initialize_vm(
&mut firmware.os.log_service,
&mut firmware.vm,
&cartridge,
);
let _ = firmware.os.vm().initialize(&mut firmware.vm, &cartridge);
}
match TcpListener::bind(format!("127.0.0.1:{}", debug_port)) {
@@ -121,10 +117,10 @@ impl HostDebugger {
protocol_version: DEVTOOLS_PROTOCOL_VERSION,
runtime_version: "0.1".to_string(),
cartridge: HandshakeCartridge {
app_id: firmware.os.vm_runtime.current_app_id,
title: firmware.os.vm_runtime.current_cartridge_title.clone(),
app_version: firmware.os.vm_runtime.current_cartridge_app_version.clone(),
app_mode: firmware.os.vm_runtime.current_cartridge_app_mode,
app_id: firmware.os.vm().current_app_id(),
title: firmware.os.vm().current_cartridge_title(),
app_version: firmware.os.vm().current_cartridge_app_version(),
app_mode: firmware.os.vm().current_cartridge_app_mode(),
},
};
self.send_response(handshake);
@@ -142,7 +138,7 @@ impl HostDebugger {
println!("[Debugger] Connection closed by remote.");
self.stream = None;
// Resume VM execution if it was paused waiting for the debugger.
firmware.os.vm_runtime.paused = false;
firmware.os.vm().set_paused(false);
self.waiting_for_start = false;
}
Ok(n) => {
@@ -169,7 +165,7 @@ impl HostDebugger {
Err(e) => {
eprintln!("[Debugger] Connection error: {}", e);
self.stream = None;
firmware.os.vm_runtime.paused = false;
firmware.os.vm().set_paused(false);
self.waiting_for_start = false;
}
}
@@ -194,27 +190,23 @@ impl HostDebugger {
println!("[Debugger] Starting execution...");
self.waiting_for_start = false;
}
firmware.os.vm_runtime.paused = false;
firmware.os.vm().set_paused(false);
}
DebugCommand::Pause => {
firmware.os.vm_runtime.paused = true;
firmware.os.vm().set_paused(true);
}
DebugCommand::Resume => {
firmware.os.vm_runtime.paused = false;
firmware.os.vm().set_paused(false);
}
DebugCommand::Step => {
// Execute exactly one instruction and keep paused.
firmware.os.vm_runtime.paused = true;
let _ = firmware.os.vm_runtime.debug_step_instruction(
&mut firmware.os.log_service,
&mut firmware.vm,
hardware,
);
firmware.os.vm().set_paused(true);
let _ = firmware.os.vm().debug_step_instruction(&mut firmware.vm, hardware);
}
DebugCommand::StepFrame => {
// Execute until the end of the current logical frame.
firmware.os.vm_runtime.paused = false;
firmware.os.vm_runtime.debug_step_request = true;
firmware.os.vm().set_paused(false);
firmware.os.vm().request_debug_step();
}
DebugCommand::GetState => {
// Return detailed VM register and stack state.
@@ -223,8 +215,8 @@ impl HostDebugger {
let resp = DebugResponse::GetState {
pc: firmware.vm.pc(),
stack_top,
frame_index: firmware.os.vm_runtime.logical_frame_index,
app_id: firmware.os.vm_runtime.current_app_id,
frame_index: firmware.os.vm().logical_frame_index(),
app_id: firmware.os.vm().current_app_id(),
};
self.send_response(resp);
}
@@ -309,14 +301,14 @@ impl HostDebugger {
/// Scans the system for new information to push to the debugger client.
fn stream_events(&mut self, firmware: &mut Firmware) {
if let Some(report) = firmware.os.vm_runtime.last_crash_report.as_ref() {
if let Some(report) = firmware.os.vm().last_crash_report() {
self.stream_fault(report);
} else {
self.last_fault_summary = None;
}
// 1. Process and send new log entries.
let new_events = firmware.os.log_service.get_after(self.last_log_seq);
let new_events = firmware.os.logs_after(self.last_log_seq);
for event in new_events {
self.last_log_seq = event.seq;
@@ -324,17 +316,17 @@ impl HostDebugger {
if event.tag == 0xDEB1 {
self.send_event(DebugEvent::BreakpointHit {
pc: firmware.vm.pc(),
frame_index: firmware.os.vm_runtime.logical_frame_index,
frame_index: firmware.os.vm().logical_frame_index(),
});
}
if (0xCA01..=0xCA07).contains(&event.tag)
&& let Some(cert_event) = Self::cert_event_from_snapshot(
event.tag,
firmware.os.vm_runtime.atomic_telemetry.snapshot(),
&firmware.os.vm_runtime.certifier.config,
firmware.os.vm_runtime.logical_frame_index,
)
&& let Some(cert_event) = {
let telemetry = firmware.os.vm().telemetry_snapshot();
let cert_config = *firmware.os.vm().cert_config();
let frame_index = firmware.os.vm().logical_frame_index();
Self::cert_event_from_snapshot(event.tag, telemetry, &cert_config, frame_index)
}
{
self.send_event(cert_event);
}
@@ -347,9 +339,9 @@ impl HostDebugger {
}
// 2. Send telemetry snapshots at the completion of every frame.
let current_frame = firmware.os.vm_runtime.logical_frame_index;
let current_frame = firmware.os.vm().logical_frame_index();
if current_frame > self.last_telemetry_frame {
let tel = firmware.os.vm_runtime.atomic_telemetry.snapshot();
let tel = firmware.os.vm().telemetry_snapshot();
self.send_event(Self::telemetry_event_from_snapshot(tel));
self.last_telemetry_frame = current_frame;
}
@@ -407,14 +399,14 @@ mod tests {
let mut hardware = Hardware::new();
debugger.handle_command(DebugCommand::Pause, &mut firmware, &mut hardware);
assert!(firmware.os.vm_runtime.paused);
assert!(firmware.os.vm().paused());
debugger.handle_command(DebugCommand::Resume, &mut firmware, &mut hardware);
assert!(!firmware.os.vm_runtime.paused);
assert!(!firmware.os.vm().paused());
debugger.handle_command(DebugCommand::StepFrame, &mut firmware, &mut hardware);
assert!(!firmware.os.vm_runtime.paused);
assert!(firmware.os.vm_runtime.debug_step_request);
assert!(!firmware.os.vm().paused());
assert!(firmware.os.vm().debug_step_requested());
}
#[test]
@@ -424,11 +416,11 @@ mod tests {
let mut hardware = Hardware::new();
debugger.waiting_for_start = true;
firmware.os.vm_runtime.paused = true;
firmware.os.vm().set_paused(true);
debugger.handle_command(DebugCommand::Start, &mut firmware, &mut hardware);
assert!(!debugger.waiting_for_start);
assert!(!firmware.os.vm_runtime.paused);
assert!(!firmware.os.vm().paused());
}
}