pr5
This commit is contained in:
@@ -80,6 +80,9 @@ pub struct VirtualMachine {
|
||||
pub gc_alloc_threshold: usize,
|
||||
/// GC: snapshot of live objects count after the last collection (or VM init).
|
||||
last_gc_live_count: usize,
|
||||
/// Capability flags granted to the currently running program/cart.
|
||||
/// Syscalls are capability-gated using `prometeu_hal::syscalls::SyscallMeta::caps`.
|
||||
pub capabilities: prometeu_hal::syscalls::CapFlags,
|
||||
}
|
||||
|
||||
|
||||
@@ -110,6 +113,9 @@ impl VirtualMachine {
|
||||
breakpoints: std::collections::HashSet::new(),
|
||||
gc_alloc_threshold: 1024, // conservative default; tests may override
|
||||
last_gc_live_count: 0,
|
||||
// Default to all capabilities allowed for backward compatibility.
|
||||
// Tests can narrow this via `set_capabilities`.
|
||||
capabilities: u64::MAX,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,6 +137,7 @@ impl VirtualMachine {
|
||||
self.cycles = 0;
|
||||
self.halted = true; // execution is impossible until a successful load
|
||||
self.last_gc_live_count = 0;
|
||||
// Preserve capabilities across loads; firmware may set them per cart.
|
||||
|
||||
// Only recognized format is loadable: PBS v0 industrial format
|
||||
let program = if program_bytes.starts_with(b"PBS\0") {
|
||||
@@ -191,6 +198,11 @@ impl VirtualMachine {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Sets the capability flags for the current program.
|
||||
pub fn set_capabilities(&mut self, caps: prometeu_hal::syscalls::CapFlags) {
|
||||
self.capabilities = caps;
|
||||
}
|
||||
|
||||
/// Prepares the VM to execute a specific entrypoint by setting the PC and
|
||||
/// pushing an initial call frame.
|
||||
pub fn prepare_call(&mut self, entrypoint: &str) {
|
||||
@@ -912,6 +924,20 @@ impl VirtualMachine {
|
||||
)
|
||||
})?;
|
||||
|
||||
// Capability check before any side effects or argument consumption.
|
||||
let meta = prometeu_hal::syscalls::meta_for(syscall);
|
||||
if (self.capabilities & meta.caps) != meta.caps {
|
||||
return Err(self.trap(
|
||||
TRAP_INVALID_SYSCALL,
|
||||
OpCode::Syscall as u16,
|
||||
format!(
|
||||
"Missing capability for syscall {} (required=0x{:X})",
|
||||
syscall.name(), meta.caps
|
||||
),
|
||||
pc_at_syscall,
|
||||
));
|
||||
}
|
||||
|
||||
let args_count = syscall.args_count();
|
||||
|
||||
let mut args = Vec::with_capacity(args_count);
|
||||
@@ -1846,6 +1872,59 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_syscall_missing_capability_trap() {
|
||||
// Program: directly call GfxClear (0x1001). We check caps before args, so no underflow.
|
||||
let rom = vec![
|
||||
0x70, 0x00, // Syscall + Reserved
|
||||
0x01, 0x10, 0x00, 0x00, // Syscall ID 0x1001 (LE)
|
||||
];
|
||||
|
||||
let mut vm = new_test_vm(rom.clone(), vec![]);
|
||||
// Remove all capabilities
|
||||
vm.set_capabilities(0);
|
||||
let mut native = MockNative;
|
||||
let mut ctx = HostContext::new(None);
|
||||
|
||||
vm.prepare_call("0");
|
||||
let report = vm.run_budget(100, &mut native, &mut ctx).unwrap();
|
||||
|
||||
match report.reason {
|
||||
LogicalFrameEndingReason::Trap(trap) => {
|
||||
assert_eq!(trap.code, TRAP_INVALID_SYSCALL);
|
||||
assert_eq!(trap.opcode, OpCode::Syscall as u16);
|
||||
assert!(trap.message.contains("Missing capability"));
|
||||
assert_eq!(trap.pc, 0);
|
||||
}
|
||||
other => panic!("Expected Trap, got {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_syscall_with_capability_success() {
|
||||
// Program: push arg 0; call GfxClear (0x1001)
|
||||
let mut rom = Vec::new();
|
||||
rom.extend_from_slice(&(OpCode::PushI32 as u16).to_le_bytes());
|
||||
rom.extend_from_slice(&0i32.to_le_bytes());
|
||||
rom.extend_from_slice(&(OpCode::Syscall as u16).to_le_bytes());
|
||||
rom.extend_from_slice(&0x1001u32.to_le_bytes()); // GfxClear
|
||||
|
||||
let mut vm = new_test_vm(rom.clone(), vec![]);
|
||||
// Grant only GFX capability
|
||||
vm.set_capabilities(prometeu_hal::syscalls::caps::GFX);
|
||||
let mut native = MockNative;
|
||||
let mut ctx = HostContext::new(None);
|
||||
|
||||
vm.prepare_call("0");
|
||||
let report = vm.run_budget(100, &mut native, &mut ctx).unwrap();
|
||||
|
||||
// Any non-trap outcome is considered success here
|
||||
match report.reason {
|
||||
LogicalFrameEndingReason::Trap(trap) => panic!("Unexpected trap: {:?}", trap),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_syscall_results_count_mismatch_panic() {
|
||||
// GfxClear565 (0x1010) expects 0 results
|
||||
|
||||
Reference in New Issue
Block a user