implements PLN-0155

This commit is contained in:
2026-07-05 00:26:16 +01:00
parent 4e05daf280
commit e613ab43c9
12 changed files with 39 additions and 102 deletions
@@ -5,7 +5,6 @@ use crate::task::TaskId;
use crate::vm_session::{VmSession, VmSessionError};
use prometeu_hal::app_mode::AppMode;
use prometeu_hal::cartridge::Cartridge;
use prometeu_vm::VirtualMachine;
use std::sync::Arc;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -72,7 +71,6 @@ impl<'a> SessionsFacade<'a> {
pub fn load_vm_cartridge(
&mut self,
legacy_vm: &mut VirtualMachine,
cartridge: &Cartridge,
) -> Result<LoadedVmCartridge, CrashReport> {
let existing_game_task = if cartridge.app_mode == AppMode::Game {
@@ -100,7 +98,6 @@ impl<'a> SessionsFacade<'a> {
if !reused_existing_session {
self.initialize_session_cartridge(task_id, cartridge)?;
self.initialize_legacy_active_vm(legacy_vm, cartridge)?;
}
Ok(LoadedVmCartridge { task_id, app_mode: cartridge.app_mode, reused_existing_session })
@@ -122,6 +119,10 @@ impl<'a> SessionsFacade<'a> {
self.os.vm_sessions.len()
}
pub fn clear_vm_sessions(&mut self) {
self.os.vm_sessions.clear();
}
fn create_vm_session_for_task(&mut self, task_id: TaskId) -> Result<(), VmSessionError> {
let task = self.os.task_manager.get(task_id).expect("session task should exist").clone();
let process = self
@@ -157,13 +158,4 @@ impl<'a> SessionsFacade<'a> {
session.clear_cartridge_service_state();
session.runtime.initialize_vm(&mut self.os.log_service, &mut session.vm, cartridge)
}
fn initialize_legacy_active_vm(
&mut self,
legacy_vm: &mut VirtualMachine,
cartridge: &Cartridge,
) -> Result<(), CrashReport> {
self.os.clear_cartridge_service_state();
self.os.vm_runtime.initialize_vm(&mut self.os.log_service, legacy_vm, cartridge)
}
}
@@ -5,13 +5,11 @@ use crate::vm_session::VmSession;
use crate::{RenderWorkerConfig, RenderWorkerController};
use prometeu_bytecode::Value;
use prometeu_hal::app_mode::AppMode;
use prometeu_hal::cartridge::Cartridge;
use prometeu_hal::telemetry::{CertificationConfig, TelemetryFrame};
use prometeu_hal::{
FrameId, InputSignals, RenderOwnership, RenderWorkerBackend, RenderWorkerError,
RenderWorkerFrameSink, RuntimePlatform,
};
use prometeu_vm::VirtualMachine;
use std::sync::atomic::Ordering;
pub struct VmFacade<'a> {
@@ -19,36 +17,6 @@ pub struct VmFacade<'a> {
}
impl<'a> VmFacade<'a> {
pub fn initialize(
&mut self,
vm: &mut VirtualMachine,
cartridge: &Cartridge,
) -> Result<(), CrashReport> {
self.os.clear_cartridge_service_state();
self.os.vm_runtime.initialize_vm(&mut self.os.log_service, vm, cartridge)
}
pub fn tick(
&mut self,
vm: &mut VirtualMachine,
signals: &InputSignals,
platform: &mut dyn RuntimePlatform,
) -> Option<CrashReport> {
self.deliver_pending_game_lifecycle_events();
self.os.vm_runtime.tick(
&mut self.os.log_service,
&mut self.os.fs,
&mut self.os.fs_state,
&mut self.os.memcard,
&mut self.os.open_files,
&mut self.os.next_handle,
vm,
signals,
platform,
)
}
pub fn tick_session(
&mut self,
task_id: TaskId,
@@ -77,25 +45,6 @@ impl<'a> VmFacade<'a> {
)
}
pub fn deliver_pending_game_lifecycle_events(&mut self) {
if self.os.vm_runtime.current_cartridge_app_mode == AppMode::Game {
let resident_game_task = self.os.foreground_stack.resident_game_task();
let mut retained = Vec::new();
let mut delivered = Vec::new();
for event in self.os.game_lifecycle_events.drain(..) {
if Some(event.task_id) == resident_game_task {
delivered.push(event);
} else {
retained.push(event);
}
}
self.os.game_lifecycle_events = retained;
self.os.vm_runtime.deliver_game_lifecycle_events(delivered);
}
}
fn deliver_pending_game_lifecycle_events_to_session(&mut self, task_id: TaskId) {
let Some(session) = self.os.vm_sessions.for_task(task_id) else {
return;
@@ -122,16 +71,9 @@ impl<'a> VmFacade<'a> {
}
}
pub fn reset(&mut self, vm: &mut VirtualMachine) {
self.os.vm_runtime.reset(vm);
}
pub fn debug_step_instruction(
&mut self,
vm: &mut VirtualMachine,
platform: &mut dyn RuntimePlatform,
) -> Option<CrashReport> {
self.os.vm_runtime.debug_step_instruction(&mut self.os.log_service, vm, platform)
pub fn reset_global_runtime_state(&mut self) {
self.os.clear_cartridge_service_state();
self.os.vm_runtime.clear_cartridge_state();
}
pub fn debug_step_active_session(
@@ -6,7 +6,6 @@ use prometeu_hal::{
FrameId, GfxUiCommand, InputPlatform, InputSignals, RenderSubmission, RuntimePlatform,
ShellUiFramePacket,
};
use prometeu_vm::VirtualMachine;
use std::path::PathBuf;
const SHELL_A_BUTTON: Rect = Rect { x: 112, y: 172, w: 112, h: 32 };
@@ -175,24 +174,17 @@ impl PrometeuHub {
pub fn update_shell_profile(
&mut self,
os: &mut SystemOS,
vm: &mut VirtualMachine,
signals: &InputSignals,
platform: &mut dyn RuntimePlatform,
) -> SystemProfileUpdate {
let mut crash = None;
let mut action = self.gui_update(os, platform);
if os.windows().focused_window().is_some() {
if platform.input().pad().start().down {
action = Some(SystemProfileAction::CloseShell);
} else if action != Some(SystemProfileAction::CloseShell) {
crash = os.vm().tick(vm, signals, platform);
}
if os.windows().focused_window().is_some() && platform.input().pad().start().down {
action = Some(SystemProfileAction::CloseShell);
}
self.render(os, platform);
SystemProfileUpdate { crash, action }
SystemProfileUpdate { crash: None, action }
}
pub fn update_vm_shell_profile(
@@ -138,6 +138,10 @@ impl VmSessionRegistry {
pub fn is_empty(&self) -> bool {
self.sessions.is_empty()
}
pub fn clear(&mut self) {
self.sessions.clear();
}
}
fn app_mode_for_task_and_process(