clean up, debugger, add comments
This commit is contained in:
@@ -32,7 +32,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_load_cap_config() {
|
||||
let content = "cycles_budget=500\nmax_syscalls=10\n# comentário\nmax_host_cpu_us=2000";
|
||||
let content = "cycles_budget=500\nmax_syscalls=10\n# comment\nmax_host_cpu_us=2000";
|
||||
let path = "test_cap.cfg";
|
||||
std::fs::write(path, content).unwrap();
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use prometeu_core::firmware::{BootTarget, Firmware};
|
||||
use prometeu_core::Hardware;
|
||||
use prometeu_core::model::CartridgeLoader;
|
||||
use prometeu_core::debugger_protocol::*;
|
||||
use std::net::{TcpListener, TcpStream};
|
||||
use prometeu_core::firmware::{BootTarget, Firmware};
|
||||
use prometeu_core::model::CartridgeLoader;
|
||||
use prometeu_core::Hardware;
|
||||
use std::io::{Read, Write};
|
||||
use std::net::{TcpListener, TcpStream};
|
||||
|
||||
/// Host-side implementation of the PROMETEU DevTools Protocol.
|
||||
///
|
||||
@@ -276,6 +276,7 @@ impl HostDebugger {
|
||||
vm_steps: tel.vm_steps,
|
||||
syscalls: tel.syscalls,
|
||||
cycles: tel.cycles_used,
|
||||
cycles_budget: tel.cycles_budget,
|
||||
host_cpu_time_us: tel.host_cpu_time_us,
|
||||
violations: tel.violations,
|
||||
gfx_used_bytes: tel.gfx_used_bytes,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use std::path::PathBuf;
|
||||
use std::fs;
|
||||
use prometeu_core::fs::{FsBackend, FsEntry, FsError};
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub struct HostDirBackend {
|
||||
root: PathBuf,
|
||||
@@ -85,8 +85,8 @@ impl FsBackend for HostDirBackend {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs;
|
||||
use std::env;
|
||||
use std::fs;
|
||||
|
||||
fn get_temp_dir(name: &str) -> PathBuf {
|
||||
let mut path = env::temp_dir();
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use prometeu_core::hardware::InputSignals;
|
||||
use prometeu_core::Hardware;
|
||||
use winit::event::{ElementState, MouseButton, WindowEvent};
|
||||
use winit::keyboard::{KeyCode, PhysicalKey};
|
||||
use winit::window::Window;
|
||||
use prometeu_core::hardware::InputSignals;
|
||||
use prometeu_core::Hardware;
|
||||
|
||||
pub struct HostInputHandler {
|
||||
pub signals: InputSignals,
|
||||
|
||||
@@ -8,11 +8,11 @@ pub mod input;
|
||||
pub mod cap;
|
||||
pub mod utilities;
|
||||
|
||||
use runner::HostRunner;
|
||||
use cap::load_cap_config;
|
||||
use winit::event_loop::EventLoop;
|
||||
use prometeu_core::firmware::BootTarget;
|
||||
use clap::Parser;
|
||||
use prometeu_core::firmware::BootTarget;
|
||||
use runner::HostRunner;
|
||||
use winit::event_loop::EventLoop;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(author, version, about, long_about = None)]
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use crate::audio::HostAudio;
|
||||
use crate::fs_backend::HostDirBackend;
|
||||
use crate::log_sink::HostConsoleSink;
|
||||
use crate::debugger::HostDebugger;
|
||||
use crate::stats::HostStats;
|
||||
use crate::fs_backend::HostDirBackend;
|
||||
use crate::input::HostInputHandler;
|
||||
use crate::log_sink::HostConsoleSink;
|
||||
use crate::stats::HostStats;
|
||||
use crate::utilities::draw_rgb565_to_rgba8;
|
||||
use pixels::{Pixels, PixelsBuilder, SurfaceTexture};
|
||||
use pixels::wgpu::PresentMode;
|
||||
use pixels::{Pixels, PixelsBuilder, SurfaceTexture};
|
||||
use prometeu_core::firmware::{BootTarget, Firmware};
|
||||
use prometeu_core::Hardware;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -128,12 +128,18 @@ impl HostRunner {
|
||||
let color_bg = prometeu_core::model::Color::INDIGO; // Dark blue to stand out
|
||||
let color_warn = prometeu_core::model::Color::RED;
|
||||
|
||||
self.hardware.gfx.fill_rect(5, 5, 140, 100, color_bg);
|
||||
self.hardware.gfx.fill_rect(5, 5, 175, 100, color_bg);
|
||||
self.hardware.gfx.draw_text(10, 10, &format!("FPS: {:.1}", self.stats.current_fps), color_text);
|
||||
self.hardware.gfx.draw_text(10, 18, &format!("HOST: {:.2}MS", tel.host_cpu_time_us as f64 / 1000.0), color_text);
|
||||
self.hardware.gfx.draw_text(10, 26, &format!("STEPS: {}", tel.vm_steps), color_text);
|
||||
self.hardware.gfx.draw_text(10, 34, &format!("SYSC: {}", tel.syscalls), color_text);
|
||||
self.hardware.gfx.draw_text(10, 42, &format!("CYC: {}", tel.cycles_used), color_text);
|
||||
|
||||
let cycles_pct = if tel.cycles_budget > 0 {
|
||||
(tel.cycles_used as f64 / tel.cycles_budget as f64) * 100.0
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
self.hardware.gfx.draw_text(10, 42, &format!("CYC: {}/{} ({:.1}%)", tel.cycles_used, tel.cycles_budget, cycles_pct), color_text);
|
||||
|
||||
self.hardware.gfx.draw_text(10, 50, &format!("GFX: {}K/16M ({}S)", tel.gfx_used_bytes / 1024, tel.gfx_slots_occupied), color_text);
|
||||
if tel.gfx_inflight_bytes > 0 {
|
||||
@@ -337,10 +343,10 @@ impl ApplicationHandler for HostRunner {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use prometeu_core::firmware::BootTarget;
|
||||
use prometeu_core::debugger_protocol::DEVTOOLS_PROTOCOL_VERSION;
|
||||
use std::net::TcpStream;
|
||||
use prometeu_core::firmware::BootTarget;
|
||||
use std::io::{Read, Write};
|
||||
use std::net::TcpStream;
|
||||
|
||||
#[test]
|
||||
fn test_debug_port_opens() {
|
||||
|
||||
Reference in New Issue
Block a user