adjustments on capabilities on cartridges

This commit is contained in:
2026-03-24 13:40:44 +00:00
parent cfdca93160
commit d5ef8a2003
19 changed files with 1570 additions and 205 deletions
+4 -4
View File
@@ -1,22 +1,22 @@
mod abi;
pub mod assembler;
mod decoder;
mod disassembler;
pub mod isa; // canonical ISA boundary (core and future profiles)
mod layout;
pub mod model;
mod opcode;
mod opcode_spec;
mod program_image;
mod value;
pub mod isa; // canonical ISA boundary (core and future profiles)
mod disassembler;
pub mod assembler;
pub use abi::{
TrapInfo, TRAP_BAD_RET_SLOTS, TRAP_DIV_ZERO, TRAP_ILLEGAL_INSTRUCTION, TRAP_INVALID_FUNC,
TRAP_INVALID_LOCAL, TRAP_INVALID_SYSCALL, TRAP_OOB, TRAP_STACK_UNDERFLOW, TRAP_TYPE,
};
pub use assembler::{assemble, AsmError};
pub use decoder::{decode_next, DecodeError};
pub use disassembler::disassemble;
pub use assembler::{assemble, AsmError};
pub use layout::{compute_function_layouts, FunctionLayout};
pub use model::{BytecodeLoader, FunctionMeta, LoadError};
pub use program_image::ProgramImage;
@@ -1,9 +1,11 @@
use prometeu_bytecode::{assemble, disassemble};
use prometeu_bytecode::isa::core::CoreOpCode;
use prometeu_bytecode::{assemble, disassemble};
fn emit(op: CoreOpCode, imm: Option<&[u8]>, out: &mut Vec<u8>) {
out.extend_from_slice(&(op as u16).to_le_bytes());
if let Some(bytes) = imm { out.extend_from_slice(bytes); }
if let Some(bytes) = imm {
out.extend_from_slice(bytes);
}
}
#[test]
@@ -3,7 +3,9 @@ use prometeu_bytecode::isa::core::CoreOpCode;
fn emit(op: CoreOpCode, imm: Option<&[u8]>, out: &mut Vec<u8>) {
out.extend_from_slice(&(op as u16).to_le_bytes());
if let Some(bytes) = imm { out.extend_from_slice(bytes); }
if let Some(bytes) = imm {
out.extend_from_slice(bytes);
}
}
#[test]
@@ -1,4 +1,5 @@
use crate::asset::{AssetEntry, PreloadEntry};
use crate::syscalls::CapFlags;
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
@@ -14,6 +15,7 @@ pub struct Cartridge {
pub app_version: String,
pub app_mode: AppMode,
pub entrypoint: String,
pub capabilities: CapFlags,
pub program: Vec<u8>,
pub assets: Vec<u8>,
pub asset_table: Vec<AssetEntry>,
@@ -27,6 +29,7 @@ pub struct CartridgeDTO {
pub app_version: String,
pub app_mode: AppMode,
pub entrypoint: String,
pub capabilities: CapFlags,
pub program: Vec<u8>,
pub assets: Vec<u8>,
#[serde(default)]
@@ -43,6 +46,7 @@ impl From<CartridgeDTO> for Cartridge {
app_version: dto.app_version,
app_mode: dto.app_mode,
entrypoint: dto.entrypoint,
capabilities: dto.capabilities,
program: dto.program,
assets: dto.assets,
asset_table: dto.asset_table,
@@ -61,6 +65,21 @@ pub enum CartridgeError {
IoError,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum Capability {
None,
System,
Gfx,
Input,
Audio,
Fs,
Log,
Asset,
Bank,
All,
}
#[derive(Deserialize)]
pub struct CartridgeManifest {
pub magic: String,
@@ -71,6 +90,8 @@ pub struct CartridgeManifest {
pub app_mode: AppMode,
pub entrypoint: String,
#[serde(default)]
pub capabilities: Vec<Capability>,
#[serde(default)]
pub asset_table: Vec<AssetEntry>,
#[serde(default)]
pub preload: Vec<PreloadEntry>,
@@ -1,4 +1,6 @@
use crate::cartridge::{Cartridge, CartridgeDTO, CartridgeError, CartridgeManifest};
use crate::cartridge::{Capability, Cartridge, CartridgeDTO, CartridgeError, CartridgeManifest};
use crate::syscalls::{CapFlags, caps};
use std::collections::HashSet;
use std::fs;
use std::path::Path;
@@ -43,6 +45,8 @@ impl DirectoryCartridgeLoader {
return Err(CartridgeError::UnsupportedVersion);
}
let capabilities = normalize_capabilities(&manifest.capabilities)?;
let program_path = path.join("program.pbx");
if !program_path.exists() {
return Err(CartridgeError::MissingProgram);
@@ -63,6 +67,7 @@ impl DirectoryCartridgeLoader {
app_version: manifest.app_version,
app_mode: manifest.app_mode,
entrypoint: manifest.entrypoint,
capabilities,
program,
assets,
asset_table: manifest.asset_table,
@@ -80,3 +85,157 @@ impl PackedCartridgeLoader {
Err(CartridgeError::InvalidFormat)
}
}
fn normalize_capabilities(capabilities: &[Capability]) -> Result<CapFlags, CartridgeError> {
let mut seen = HashSet::new();
let mut normalized = caps::NONE;
for capability in capabilities {
if !seen.insert(*capability) {
return Err(CartridgeError::InvalidManifest);
}
normalized |= match capability {
Capability::None => caps::NONE,
Capability::System => caps::SYSTEM,
Capability::Gfx => caps::GFX,
Capability::Input => caps::INPUT,
Capability::Audio => caps::AUDIO,
Capability::Fs => caps::FS,
Capability::Log => caps::LOG,
Capability::Asset => caps::ASSET,
Capability::Bank => caps::BANK,
Capability::All => caps::ALL,
};
}
Ok(normalized)
}
#[cfg(test)]
mod tests {
use super::*;
use serde_json::json;
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicU64, Ordering};
use std::time::{SystemTime, UNIX_EPOCH};
static TEST_DIR_COUNTER: AtomicU64 = AtomicU64::new(0);
struct TestCartridgeDir {
path: PathBuf,
}
impl TestCartridgeDir {
fn new(manifest: serde_json::Value) -> Self {
let unique = TEST_DIR_COUNTER.fetch_add(1, Ordering::Relaxed);
let timestamp = SystemTime::now()
.duration_since(UNIX_EPOCH)
.expect("system time must be after unix epoch")
.as_nanos();
let path = std::env::temp_dir()
.join(format!("prometeu-hal-cartridge-loader-{}-{}", timestamp, unique));
fs::create_dir_all(&path).expect("must create temporary cartridge directory");
fs::write(
path.join("manifest.json"),
serde_json::to_vec_pretty(&manifest).expect("manifest must serialize"),
)
.expect("must write manifest.json");
fs::write(path.join("program.pbx"), [0x01_u8, 0x02, 0x03]).expect("must write program");
Self { path }
}
fn path(&self) -> &Path {
&self.path
}
}
impl Drop for TestCartridgeDir {
fn drop(&mut self) {
let _ = fs::remove_dir_all(&self.path);
}
}
fn manifest_with_capabilities(capabilities: Option<Vec<&str>>) -> serde_json::Value {
let mut manifest = json!({
"magic": "PMTU",
"cartridge_version": 1,
"app_id": 1001,
"title": "Example",
"app_version": "1.0.0",
"app_mode": "Game",
"entrypoint": "main"
});
if let Some(capabilities) = capabilities {
manifest["capabilities"] = json!(capabilities);
}
manifest
}
#[test]
fn load_without_capabilities_defaults_to_none() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(None));
let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load");
assert_eq!(cartridge.capabilities, caps::NONE);
}
#[test]
fn load_with_single_capability_normalizes_to_flag() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["gfx"])));
let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load");
assert_eq!(cartridge.capabilities, caps::GFX);
}
#[test]
fn load_with_multiple_capabilities_combines_flags() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["gfx", "input"])));
let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load");
assert_eq!(cartridge.capabilities, caps::GFX | caps::INPUT);
}
#[test]
fn load_with_all_capability_normalizes_to_all_flags() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["all"])));
let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load");
assert_eq!(cartridge.capabilities, caps::ALL);
}
#[test]
fn load_with_none_capability_keeps_zero_flags() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["none"])));
let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load");
assert_eq!(cartridge.capabilities, caps::NONE);
}
#[test]
fn load_with_duplicate_capabilities_fails() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["gfx", "gfx"])));
let error = DirectoryCartridgeLoader::load(dir.path()).unwrap_err();
assert!(matches!(error, CartridgeError::InvalidManifest));
}
#[test]
fn load_with_unknown_capability_fails() {
let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["network"])));
let error = DirectoryCartridgeLoader::load(dir.path()).unwrap_err();
assert!(matches!(error, CartridgeError::InvalidManifest));
}
}
+813 -70
View File
@@ -226,11 +226,7 @@ pub struct SyscallResolved {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum LoadError {
/// The (module, name, version) triple is not known by the host.
UnknownSyscall {
module: &'static str,
name: &'static str,
version: u16,
},
UnknownSyscall { module: &'static str, name: &'static str, version: u16 },
/// The cartridge lacks required capabilities for the syscall.
MissingCapability {
required: CapFlags,
@@ -244,7 +240,11 @@ pub enum LoadError {
/// Resolve a canonical syscall identity to its numeric id and metadata.
///
/// Returns `None` if the identity is unknown.
pub fn resolve_syscall(module: &'static str, name: &'static str, version: u16) -> Option<SyscallResolved> {
pub fn resolve_syscall(
module: &'static str,
name: &'static str,
version: u16,
) -> Option<SyscallResolved> {
for entry in SYSCALL_TABLE {
if entry.meta.module == module && entry.meta.name == name && entry.meta.version == version {
return Some(SyscallResolved { id: entry.meta.id, meta: entry.meta });
@@ -266,7 +266,11 @@ pub fn resolve_program_syscalls(
let mut out = Vec::with_capacity(declared.len());
for ident in declared {
let Some(res) = resolve_syscall(ident.module, ident.name, ident.version) else {
return Err(LoadError::UnknownSyscall { module: ident.module, name: ident.name, version: ident.version });
return Err(LoadError::UnknownSyscall {
module: ident.module,
name: ident.name,
version: ident.version,
});
};
// Capability gating: required must be subset of provided
let missing = res.meta.caps & !caps;
@@ -291,74 +295,808 @@ pub fn resolve_program_syscalls(
/// this table.
pub const SYSCALL_TABLE: &[SyscallRegistryEntry] = &[
// --- System ---
SyscallRegistryEntry { syscall: Syscall::SystemHasCart, meta: SyscallMeta { id: 0x0001, module: "system", name: "has_cart", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::SYSTEM, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::SystemRunCart, meta: SyscallMeta { id: 0x0002, module: "system", name: "run_cart", version: 1, arg_slots: 0, ret_slots: 0, caps: caps::SYSTEM, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 50 } },
SyscallRegistryEntry {
syscall: Syscall::SystemHasCart,
meta: SyscallMeta {
id: 0x0001,
module: "system",
name: "has_cart",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::SYSTEM,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::SystemRunCart,
meta: SyscallMeta {
id: 0x0002,
module: "system",
name: "run_cart",
version: 1,
arg_slots: 0,
ret_slots: 0,
caps: caps::SYSTEM,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 50,
},
},
// --- GFX ---
SyscallRegistryEntry { syscall: Syscall::GfxClear, meta: SyscallMeta { id: 0x1001, module: "gfx", name: "clear", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::GfxFillRect, meta: SyscallMeta { id: 0x1002, module: "gfx", name: "fill_rect", version: 1, arg_slots: 5, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::GfxDrawLine, meta: SyscallMeta { id: 0x1003, module: "gfx", name: "draw_line", version: 1, arg_slots: 5, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::GfxDrawCircle, meta: SyscallMeta { id: 0x1004, module: "gfx", name: "draw_circle", version: 1, arg_slots: 4, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::GfxDrawDisc, meta: SyscallMeta { id: 0x1005, module: "gfx", name: "draw_disc", version: 1, arg_slots: 5, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::GfxDrawSquare, meta: SyscallMeta { id: 0x1006, module: "gfx", name: "draw_square", version: 1, arg_slots: 6, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::GfxSetSprite, meta: SyscallMeta { id: 0x1007, module: "gfx", name: "set_sprite", version: 1, arg_slots: 10, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::GfxDrawText, meta: SyscallMeta { id: 0x1008, module: "gfx", name: "draw_text", version: 1, arg_slots: 4, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::GfxClear565, meta: SyscallMeta { id: 0x1010, module: "gfx", name: "clear_565", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::GFX, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry {
syscall: Syscall::GfxClear,
meta: SyscallMeta {
id: 0x1001,
module: "gfx",
name: "clear",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxFillRect,
meta: SyscallMeta {
id: 0x1002,
module: "gfx",
name: "fill_rect",
version: 1,
arg_slots: 5,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxDrawLine,
meta: SyscallMeta {
id: 0x1003,
module: "gfx",
name: "draw_line",
version: 1,
arg_slots: 5,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxDrawCircle,
meta: SyscallMeta {
id: 0x1004,
module: "gfx",
name: "draw_circle",
version: 1,
arg_slots: 4,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxDrawDisc,
meta: SyscallMeta {
id: 0x1005,
module: "gfx",
name: "draw_disc",
version: 1,
arg_slots: 5,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxDrawSquare,
meta: SyscallMeta {
id: 0x1006,
module: "gfx",
name: "draw_square",
version: 1,
arg_slots: 6,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxSetSprite,
meta: SyscallMeta {
id: 0x1007,
module: "gfx",
name: "set_sprite",
version: 1,
arg_slots: 10,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxDrawText,
meta: SyscallMeta {
id: 0x1008,
module: "gfx",
name: "draw_text",
version: 1,
arg_slots: 4,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::GfxClear565,
meta: SyscallMeta {
id: 0x1010,
module: "gfx",
name: "clear_565",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::GFX,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 20,
},
},
// --- Input ---
SyscallRegistryEntry { syscall: Syscall::InputGetPad, meta: SyscallMeta { id: 0x2001, module: "input", name: "get_pad", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::InputGetPadPressed, meta: SyscallMeta { id: 0x2002, module: "input", name: "get_pad_pressed", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::InputGetPadReleased, meta: SyscallMeta { id: 0x2003, module: "input", name: "get_pad_released", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::InputGetPadHold, meta: SyscallMeta { id: 0x2004, module: "input", name: "get_pad_hold", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::InputPadSnapshot, meta: SyscallMeta { id: 0x2010, module: "input", name: "pad_snapshot", version: 1, arg_slots: 0, ret_slots: 48, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::InputTouchSnapshot, meta: SyscallMeta { id: 0x2011, module: "input", name: "touch_snapshot", version: 1, arg_slots: 0, ret_slots: 6, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchGetX, meta: SyscallMeta { id: 0x2101, module: "input", name: "touch_get_x", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchGetY, meta: SyscallMeta { id: 0x2102, module: "input", name: "touch_get_y", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchIsDown, meta: SyscallMeta { id: 0x2103, module: "input", name: "touch_is_down", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchIsPressed, meta: SyscallMeta { id: 0x2104, module: "input", name: "touch_is_pressed", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchIsReleased, meta: SyscallMeta { id: 0x2105, module: "input", name: "touch_is_released", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchGetHold, meta: SyscallMeta { id: 0x2106, module: "input", name: "touch_get_hold", version: 1, arg_slots: 0, ret_slots: 1, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::TouchGetFinger, meta: SyscallMeta { id: 0x2107, module: "input", name: "touch_get_finger", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry {
syscall: Syscall::InputGetPad,
meta: SyscallMeta {
id: 0x2001,
module: "input",
name: "get_pad",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::InputGetPadPressed,
meta: SyscallMeta {
id: 0x2002,
module: "input",
name: "get_pad_pressed",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::InputGetPadReleased,
meta: SyscallMeta {
id: 0x2003,
module: "input",
name: "get_pad_released",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::InputGetPadHold,
meta: SyscallMeta {
id: 0x2004,
module: "input",
name: "get_pad_hold",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::InputPadSnapshot,
meta: SyscallMeta {
id: 0x2010,
module: "input",
name: "pad_snapshot",
version: 1,
arg_slots: 0,
ret_slots: 48,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::InputTouchSnapshot,
meta: SyscallMeta {
id: 0x2011,
module: "input",
name: "touch_snapshot",
version: 1,
arg_slots: 0,
ret_slots: 6,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchGetX,
meta: SyscallMeta {
id: 0x2101,
module: "input",
name: "touch_get_x",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchGetY,
meta: SyscallMeta {
id: 0x2102,
module: "input",
name: "touch_get_y",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchIsDown,
meta: SyscallMeta {
id: 0x2103,
module: "input",
name: "touch_is_down",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchIsPressed,
meta: SyscallMeta {
id: 0x2104,
module: "input",
name: "touch_is_pressed",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchIsReleased,
meta: SyscallMeta {
id: 0x2105,
module: "input",
name: "touch_is_released",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchGetHold,
meta: SyscallMeta {
id: 0x2106,
module: "input",
name: "touch_get_hold",
version: 1,
arg_slots: 0,
ret_slots: 1,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::TouchGetFinger,
meta: SyscallMeta {
id: 0x2107,
module: "input",
name: "touch_get_finger",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
// --- Input (Pad service-based) ---
SyscallRegistryEntry { syscall: Syscall::PadGetUp, meta: SyscallMeta { id: 0x2200, module: "input", name: "pad_get_up", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetDown, meta: SyscallMeta { id: 0x2201, module: "input", name: "pad_get_down", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetLeft, meta: SyscallMeta { id: 0x2202, module: "input", name: "pad_get_left", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetRight, meta: SyscallMeta { id: 0x2203, module: "input", name: "pad_get_right", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetA, meta: SyscallMeta { id: 0x2204, module: "input", name: "pad_get_a", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetB, meta: SyscallMeta { id: 0x2205, module: "input", name: "pad_get_b", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetX, meta: SyscallMeta { id: 0x2206, module: "input", name: "pad_get_x", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetY, meta: SyscallMeta { id: 0x2207, module: "input", name: "pad_get_y", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetL, meta: SyscallMeta { id: 0x2208, module: "input", name: "pad_get_l", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetR, meta: SyscallMeta { id: 0x2209, module: "input", name: "pad_get_r", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetStart, meta: SyscallMeta { id: 0x220A, module: "input", name: "pad_get_start", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::PadGetSelect, meta: SyscallMeta { id: 0x220B, module: "input", name: "pad_get_select", version: 1, arg_slots: 0, ret_slots: 4, caps: caps::INPUT, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry {
syscall: Syscall::PadGetUp,
meta: SyscallMeta {
id: 0x2200,
module: "input",
name: "pad_get_up",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetDown,
meta: SyscallMeta {
id: 0x2201,
module: "input",
name: "pad_get_down",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetLeft,
meta: SyscallMeta {
id: 0x2202,
module: "input",
name: "pad_get_left",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetRight,
meta: SyscallMeta {
id: 0x2203,
module: "input",
name: "pad_get_right",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetA,
meta: SyscallMeta {
id: 0x2204,
module: "input",
name: "pad_get_a",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetB,
meta: SyscallMeta {
id: 0x2205,
module: "input",
name: "pad_get_b",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetX,
meta: SyscallMeta {
id: 0x2206,
module: "input",
name: "pad_get_x",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetY,
meta: SyscallMeta {
id: 0x2207,
module: "input",
name: "pad_get_y",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetL,
meta: SyscallMeta {
id: 0x2208,
module: "input",
name: "pad_get_l",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetR,
meta: SyscallMeta {
id: 0x2209,
module: "input",
name: "pad_get_r",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetStart,
meta: SyscallMeta {
id: 0x220A,
module: "input",
name: "pad_get_start",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::PadGetSelect,
meta: SyscallMeta {
id: 0x220B,
module: "input",
name: "pad_get_select",
version: 1,
arg_slots: 0,
ret_slots: 4,
caps: caps::INPUT,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
// --- Audio ---
SyscallRegistryEntry { syscall: Syscall::AudioPlaySample, meta: SyscallMeta { id: 0x3001, module: "audio", name: "play_sample", version: 1, arg_slots: 5, ret_slots: 0, caps: caps::AUDIO, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::AudioPlay, meta: SyscallMeta { id: 0x3002, module: "audio", name: "play", version: 1, arg_slots: 7, ret_slots: 0, caps: caps::AUDIO, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry {
syscall: Syscall::AudioPlaySample,
meta: SyscallMeta {
id: 0x3001,
module: "audio",
name: "play_sample",
version: 1,
arg_slots: 5,
ret_slots: 0,
caps: caps::AUDIO,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::AudioPlay,
meta: SyscallMeta {
id: 0x3002,
module: "audio",
name: "play",
version: 1,
arg_slots: 7,
ret_slots: 0,
caps: caps::AUDIO,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
// --- FS ---
SyscallRegistryEntry { syscall: Syscall::FsOpen, meta: SyscallMeta { id: 0x4001, module: "fs", name: "open", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::FS, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::FsRead, meta: SyscallMeta { id: 0x4002, module: "fs", name: "read", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::FS, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::FsWrite, meta: SyscallMeta { id: 0x4003, module: "fs", name: "write", version: 1, arg_slots: 2, ret_slots: 1, caps: caps::FS, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::FsClose, meta: SyscallMeta { id: 0x4004, module: "fs", name: "close", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::FS, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::FsListDir, meta: SyscallMeta { id: 0x4005, module: "fs", name: "list_dir", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::FS, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::FsExists, meta: SyscallMeta { id: 0x4006, module: "fs", name: "exists", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::FS, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::FsDelete, meta: SyscallMeta { id: 0x4007, module: "fs", name: "delete", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::FS, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry {
syscall: Syscall::FsOpen,
meta: SyscallMeta {
id: 0x4001,
module: "fs",
name: "open",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::FS,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsRead,
meta: SyscallMeta {
id: 0x4002,
module: "fs",
name: "read",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::FS,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsWrite,
meta: SyscallMeta {
id: 0x4003,
module: "fs",
name: "write",
version: 1,
arg_slots: 2,
ret_slots: 1,
caps: caps::FS,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsClose,
meta: SyscallMeta {
id: 0x4004,
module: "fs",
name: "close",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::FS,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsListDir,
meta: SyscallMeta {
id: 0x4005,
module: "fs",
name: "list_dir",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::FS,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsExists,
meta: SyscallMeta {
id: 0x4006,
module: "fs",
name: "exists",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::FS,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::FsDelete,
meta: SyscallMeta {
id: 0x4007,
module: "fs",
name: "delete",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::FS,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
// --- Log ---
SyscallRegistryEntry { syscall: Syscall::LogWrite, meta: SyscallMeta { id: 0x5001, module: "log", name: "write", version: 1, arg_slots: 2, ret_slots: 0, caps: caps::LOG, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry { syscall: Syscall::LogWriteTag, meta: SyscallMeta { id: 0x5002, module: "log", name: "write_tag", version: 1, arg_slots: 3, ret_slots: 0, caps: caps::LOG, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 5 } },
SyscallRegistryEntry {
syscall: Syscall::LogWrite,
meta: SyscallMeta {
id: 0x5001,
module: "log",
name: "write",
version: 1,
arg_slots: 2,
ret_slots: 0,
caps: caps::LOG,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 5,
},
},
SyscallRegistryEntry {
syscall: Syscall::LogWriteTag,
meta: SyscallMeta {
id: 0x5002,
module: "log",
name: "write_tag",
version: 1,
arg_slots: 3,
ret_slots: 0,
caps: caps::LOG,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 5,
},
},
// --- Asset/Bank ---
SyscallRegistryEntry { syscall: Syscall::AssetLoad, meta: SyscallMeta { id: 0x6001, module: "asset", name: "load", version: 1, arg_slots: 3, ret_slots: 1, caps: caps::ASSET, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::AssetStatus, meta: SyscallMeta { id: 0x6002, module: "asset", name: "status", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::ASSET, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::AssetCommit, meta: SyscallMeta { id: 0x6003, module: "asset", name: "commit", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::ASSET, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::AssetCancel, meta: SyscallMeta { id: 0x6004, module: "asset", name: "cancel", version: 1, arg_slots: 1, ret_slots: 0, caps: caps::ASSET, determinism: Determinism::NonDeterministic, may_allocate: false, cost_hint: 20 } },
SyscallRegistryEntry { syscall: Syscall::BankInfo, meta: SyscallMeta { id: 0x6101, module: "bank", name: "info", version: 1, arg_slots: 1, ret_slots: 1, caps: caps::BANK, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry { syscall: Syscall::BankSlotInfo, meta: SyscallMeta { id: 0x6102, module: "bank", name: "slot_info", version: 1, arg_slots: 2, ret_slots: 1, caps: caps::BANK, determinism: Determinism::Deterministic, may_allocate: false, cost_hint: 1 } },
SyscallRegistryEntry {
syscall: Syscall::AssetLoad,
meta: SyscallMeta {
id: 0x6001,
module: "asset",
name: "load",
version: 1,
arg_slots: 3,
ret_slots: 1,
caps: caps::ASSET,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::AssetStatus,
meta: SyscallMeta {
id: 0x6002,
module: "asset",
name: "status",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::ASSET,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::AssetCommit,
meta: SyscallMeta {
id: 0x6003,
module: "asset",
name: "commit",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::ASSET,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::AssetCancel,
meta: SyscallMeta {
id: 0x6004,
module: "asset",
name: "cancel",
version: 1,
arg_slots: 1,
ret_slots: 0,
caps: caps::ASSET,
determinism: Determinism::NonDeterministic,
may_allocate: false,
cost_hint: 20,
},
},
SyscallRegistryEntry {
syscall: Syscall::BankInfo,
meta: SyscallMeta {
id: 0x6101,
module: "bank",
name: "info",
version: 1,
arg_slots: 1,
ret_slots: 1,
caps: caps::BANK,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
SyscallRegistryEntry {
syscall: Syscall::BankSlotInfo,
meta: SyscallMeta {
id: 0x6102,
module: "bank",
name: "slot_info",
version: 1,
arg_slots: 2,
ret_slots: 1,
caps: caps::BANK,
determinism: Determinism::Deterministic,
may_allocate: false,
cost_hint: 1,
},
},
];
/// Returns the metadata associated with this syscall.
@@ -593,8 +1331,13 @@ mod tests {
// (module,name,version) must be unique
let key = (e.meta.module, e.meta.name, e.meta.version);
assert!(identities.insert(key), "duplicate canonical identity: ({}.{}, v{})",
e.meta.module, e.meta.name, e.meta.version);
assert!(
identities.insert(key),
"duplicate canonical identity: ({}.{}, v{})",
e.meta.module,
e.meta.name,
e.meta.version
);
}
// 3) Table and explicit list sizes must match (guard against omissions).
+62 -33
View File
@@ -1,5 +1,5 @@
use crate::object::{ObjectHeader, ObjectKind};
use crate::call_frame::CallFrame;
use crate::object::{ObjectHeader, ObjectKind};
use prometeu_bytecode::{HeapRef, Value};
/// Internal stored object: header plus opaque payload bytes.
@@ -50,14 +50,22 @@ pub struct Heap {
}
impl Heap {
pub fn new() -> Self { Self { objects: Vec::new() } }
pub fn new() -> Self {
Self { objects: Vec::new() }
}
/// Allocate a new object with the given kind and raw payload bytes.
/// Returns an opaque `HeapRef` handle.
#[cfg(test)]
pub fn allocate_object(&mut self, kind: ObjectKind, payload: &[u8]) -> HeapRef {
let header = ObjectHeader::new(kind, payload.len() as u32);
let obj = StoredObject { header, payload: payload.to_vec(), array_elems: None, closure_env: None, coroutine: None };
let obj = StoredObject {
header,
payload: payload.to_vec(),
array_elems: None,
closure_env: None,
coroutine: None,
};
let idx = self.objects.len();
// No free-list reuse in this PR: append and keep indices stable.
self.objects.push(Some(obj));
@@ -69,7 +77,13 @@ impl Heap {
#[cfg(test)]
pub fn allocate_array(&mut self, elements: Vec<Value>) -> HeapRef {
let header = ObjectHeader::new(ObjectKind::Array, elements.len() as u32);
let obj = StoredObject { header, payload: Vec::new(), array_elems: Some(elements), closure_env: None, coroutine: None };
let obj = StoredObject {
header,
payload: Vec::new(),
array_elems: Some(elements),
closure_env: None,
coroutine: None,
};
let idx = self.objects.len();
// No free-list reuse in this PR: append and keep indices stable.
self.objects.push(Some(obj));
@@ -125,7 +139,9 @@ impl Heap {
/// Returns true if this handle refers to an allocated object.
pub fn is_valid(&self, r: HeapRef) -> bool {
let idx = r.0 as usize;
if idx >= self.objects.len() { return false; }
if idx >= self.objects.len() {
return false;
}
self.objects[idx].is_some()
}
@@ -147,18 +163,12 @@ impl Heap {
/// Get immutable access to an object's header by handle.
pub fn header(&self, r: HeapRef) -> Option<&ObjectHeader> {
self.objects
.get(r.0 as usize)
.and_then(|slot| slot.as_ref())
.map(|o| &o.header)
self.objects.get(r.0 as usize).and_then(|slot| slot.as_ref()).map(|o| &o.header)
}
/// Internal: get mutable access to an object's header by handle.
fn header_mut(&mut self, r: HeapRef) -> Option<&mut ObjectHeader> {
self.objects
.get_mut(r.0 as usize)
.and_then(|slot| slot.as_mut())
.map(|o| &mut o.header)
self.objects.get_mut(r.0 as usize).and_then(|slot| slot.as_mut()).map(|o| &mut o.header)
}
// Internal: list inner `HeapRef` children of an object without allocating.
@@ -215,8 +225,12 @@ impl Heap {
pub fn closure_fn_id(&self, r: HeapRef) -> Option<u32> {
let idx = r.0 as usize;
let slot = self.objects.get(idx)?.as_ref()?;
if slot.header.kind != ObjectKind::Closure { return None; }
if slot.payload.len() < 8 { return None; }
if slot.header.kind != ObjectKind::Closure {
return None;
}
if slot.payload.len() < 8 {
return None;
}
debug_assert_eq!(slot.header.payload_len, 8);
let mut bytes = [0u8; 4];
bytes.copy_from_slice(&slot.payload[0..4]);
@@ -228,7 +242,9 @@ impl Heap {
pub fn closure_env_slice(&self, r: HeapRef) -> Option<&[Value]> {
let idx = r.0 as usize;
let slot = self.objects.get(idx)?.as_ref()?;
if slot.header.kind != ObjectKind::Closure { return None; }
if slot.header.kind != ObjectKind::Closure {
return None;
}
if slot.payload.len() >= 8 {
let mut nbytes = [0u8; 4];
nbytes.copy_from_slice(&slot.payload[4..8]);
@@ -246,17 +262,21 @@ impl Heap {
let mut stack: Vec<HeapRef> = roots.into_iter().collect();
while let Some(r) = stack.pop() {
if !self.is_valid(r) { continue; }
if !self.is_valid(r) {
continue;
}
// If already marked, skip.
let already_marked = self
.header(r)
.map(|h: &ObjectHeader| h.is_marked())
.unwrap_or(false);
if already_marked { continue; }
let already_marked =
self.header(r).map(|h: &ObjectHeader| h.is_marked()).unwrap_or(false);
if already_marked {
continue;
}
// Set mark bit.
if let Some(h) = self.header_mut(r) { h.set_marked(true); }
if let Some(h) = self.header_mut(r) {
h.set_marked(true);
}
// Push children by scanning payload directly (no intermediate Vec allocs).
let idx = r.0 as usize;
@@ -272,7 +292,9 @@ impl Heap {
.header(*child)
.map(|h: &ObjectHeader| h.is_marked())
.unwrap_or(false);
if !marked { stack.push(*child); }
if !marked {
stack.push(*child);
}
}
}
}
@@ -283,7 +305,11 @@ impl Heap {
nbytes.copy_from_slice(&obj.payload[4..8]);
let env_len = u32::from_le_bytes(nbytes) as usize;
if let Some(env) = obj.closure_env.as_ref() {
debug_assert_eq!(env.len(), env_len, "closure env len must match encoded env_len");
debug_assert_eq!(
env.len(),
env_len,
"closure env len must match encoded env_len"
);
for val in env[..env_len].iter() {
if let Value::HeapRef(child) = val
&& self.is_valid(*child)
@@ -292,7 +318,9 @@ impl Heap {
.header(*child)
.map(|h: &ObjectHeader| h.is_marked())
.unwrap_or(false);
if !marked { stack.push(*child); }
if !marked {
stack.push(*child);
}
}
}
}
@@ -307,7 +335,9 @@ impl Heap {
.header(*child)
.map(|h: &ObjectHeader| h.is_marked())
.unwrap_or(false);
if !marked { stack.push(*child); }
if !marked {
stack.push(*child);
}
}
}
}
@@ -336,7 +366,9 @@ impl Heap {
}
/// Current number of allocated (live) objects.
pub fn len(&self) -> usize { self.objects.iter().filter(|s| s.is_some()).count() }
pub fn len(&self) -> usize {
self.objects.iter().filter(|s| s.is_some()).count()
}
/// Enumerate handles of coroutines that are currently suspended (i.e., not running):
/// Ready or Sleeping. These must be treated as GC roots by the runtime so their
@@ -430,11 +462,8 @@ mod tests {
// Target object B (unreferenced yet)
let b = heap.allocate_object(ObjectKind::Bytes, &[9, 9, 9]);
// Array A that contains a reference to B among other primitives
let a = heap.allocate_array(vec![
Value::Int32(1),
Value::HeapRef(b),
Value::Boolean(false),
]);
let a =
heap.allocate_array(vec![Value::Int32(1), Value::HeapRef(b), Value::Boolean(false)]);
// Mark starting from root A
heap.mark_from_roots([a]);
+4 -4
View File
@@ -2,16 +2,16 @@ mod call_frame;
mod local_addressing;
// Keep the verifier internal in production builds, but expose it for integration tests
// so the golden verifier suite can exercise it without widening the public API in releases.
mod heap;
mod object;
mod roots;
mod scheduler;
#[cfg(not(test))]
mod verifier;
#[cfg(test)]
mod verifier;
mod virtual_machine;
mod vm_init_error;
mod object;
mod heap;
mod roots;
mod scheduler;
pub use prometeu_hal::{HostContext, HostReturn, NativeInterface, SyscallId};
pub use virtual_machine::{BudgetReport, LogicalFrameEndingReason, VirtualMachine};
+10 -4
View File
@@ -51,7 +51,8 @@
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
pub enum ObjectKind {
/// Reserved/unknown kind. Should not appear in valid allocations.
#[allow(dead_code)] // Kept for stable tag layout and persisted images, even if not constructed in this crate yet
#[allow(dead_code)]
// Kept for stable tag layout and persisted images, even if not constructed in this crate yet
Unknown = 0,
/// UTF-8 string. `payload_len` is the number of bytes.
@@ -87,7 +88,6 @@ pub enum ObjectKind {
/// contained `HeapRef`s directly.
/// - `payload_len` is 0 for this fixed-layout object.
Coroutine = 6,
// Future kinds must be appended here to keep tag numbers stable.
}
@@ -120,10 +120,16 @@ impl ObjectHeader {
}
/// Returns true if the GC mark bit is set.
pub fn is_marked(&self) -> bool { (self.flags & object_flags::MARKED) != 0 }
pub fn is_marked(&self) -> bool {
(self.flags & object_flags::MARKED) != 0
}
/// Sets or clears the GC mark bit. Note: actual GC logic lives elsewhere.
pub fn set_marked(&mut self, value: bool) {
if value { self.flags |= object_flags::MARKED; } else { self.flags &= !object_flags::MARKED; }
if value {
self.flags |= object_flags::MARKED;
} else {
self.flags &= !object_flags::MARKED;
}
}
}
+6 -2
View File
@@ -18,9 +18,13 @@ mod tests {
use super::*;
use crate::VirtualMachine;
struct CollectVisitor { pub seen: Vec<HeapRef> }
struct CollectVisitor {
pub seen: Vec<HeapRef>,
}
impl RootVisitor for CollectVisitor {
fn visit_heap_ref(&mut self, r: HeapRef) { self.seen.push(r); }
fn visit_heap_ref(&mut self, r: HeapRef) {
self.seen.push(r);
}
}
#[test]
+35 -21
View File
@@ -28,7 +28,9 @@ struct SleepEntry {
}
impl Scheduler {
pub fn new() -> Self { Self::default() }
pub fn new() -> Self {
Self::default()
}
// ---------- Ready queue operations ----------
@@ -43,15 +45,25 @@ impl Scheduler {
}
#[cfg(test)]
pub fn is_ready_empty(&self) -> bool { self.ready_queue.is_empty() }
pub fn is_ready_empty(&self) -> bool {
self.ready_queue.is_empty()
}
#[cfg(test)]
pub fn ready_len(&self) -> usize { self.ready_queue.len() }
pub fn ready_len(&self) -> usize {
self.ready_queue.len()
}
// ---------- Current tracking (no switching here) ----------
pub fn set_current(&mut self, coro: Option<HeapRef>) { self.current = coro; }
pub fn set_current(&mut self, coro: Option<HeapRef>) {
self.current = coro;
}
#[cfg(test)]
pub fn current(&self) -> Option<HeapRef> { self.current }
pub fn clear_current(&mut self) { self.current = None; }
pub fn current(&self) -> Option<HeapRef> {
self.current
}
pub fn clear_current(&mut self) {
self.current = None;
}
// ---------- Sleeping operations ----------
@@ -63,15 +75,13 @@ impl Scheduler {
self.next_seq = self.next_seq.wrapping_add(1);
// Binary search insertion point by wake_tick, then by seq to keep total order deterministic
let idx = match self
.sleeping
.binary_search_by(|e| {
if e.wake_tick == entry.wake_tick {
e.seq.cmp(&entry.seq)
} else {
e.wake_tick.cmp(&entry.wake_tick)
}
}) {
let idx = match self.sleeping.binary_search_by(|e| {
if e.wake_tick == entry.wake_tick {
e.seq.cmp(&entry.seq)
} else {
e.wake_tick.cmp(&entry.wake_tick)
}
}) {
Ok(i) => i, // equal element position; insert after to preserve FIFO among equals
Err(i) => i,
};
@@ -81,10 +91,10 @@ impl Scheduler {
/// Move all sleeping coroutines with `wake_tick <= current_tick` to ready queue (FIFO by wake order).
pub fn wake_ready(&mut self, current_tick: u64) {
// Find split point where wake_tick > current_tick
let split = self
.sleeping
.partition_point(|e| e.wake_tick <= current_tick);
if split == 0 { return; }
let split = self.sleeping.partition_point(|e| e.wake_tick <= current_tick);
if split == 0 {
return;
}
let mut ready_slice: Vec<SleepEntry> = self.sleeping.drain(0..split).collect();
// Already in order by (wake_tick, seq); push in that order to preserve determinism
for e in ready_slice.drain(..) {
@@ -93,14 +103,18 @@ impl Scheduler {
}
/// Returns true if there are any sleeping coroutines.
pub fn has_sleeping(&self) -> bool { !self.sleeping.is_empty() }
pub fn has_sleeping(&self) -> bool {
!self.sleeping.is_empty()
}
}
#[cfg(test)]
mod tests {
use super::*;
fn hr(id: u32) -> HeapRef { HeapRef(id) }
fn hr(id: u32) -> HeapRef {
HeapRef(id)
}
#[test]
fn fifo_ready_queue_is_deterministic() {