implemented intrinsecs de input and specs adjustment
This commit is contained in:
@@ -1111,7 +1111,7 @@ impl VirtualMachine {
|
||||
}
|
||||
args.reverse();
|
||||
|
||||
let results = (intrinsic.implementation)(&args).map_err(|err| match err {
|
||||
let results = (intrinsic.implementation)(&args, ctx).map_err(|err| match err {
|
||||
crate::IntrinsicExecutionError::ArityMismatch { expected, got } => self.trap(
|
||||
TRAP_INVALID_INTRINSIC,
|
||||
OpCode::Intrinsic as u16,
|
||||
@@ -1130,6 +1130,22 @@ impl VirtualMachine {
|
||||
),
|
||||
pc_at_intrinsic,
|
||||
),
|
||||
crate::IntrinsicExecutionError::InvalidBuiltinCarrier {
|
||||
owner,
|
||||
name,
|
||||
carrier,
|
||||
} => self.trap(
|
||||
TRAP_INVALID_INTRINSIC,
|
||||
OpCode::Intrinsic as u16,
|
||||
format!(
|
||||
"Intrinsic {}.{} received invalid builtin carrier {} for {}.{}",
|
||||
intrinsic.owner, intrinsic.name, carrier, owner, name
|
||||
),
|
||||
pc_at_intrinsic,
|
||||
),
|
||||
crate::IntrinsicExecutionError::HardwareUnavailable => {
|
||||
LogicalFrameEndingReason::Panic("Host feature unavailable".into())
|
||||
}
|
||||
})?;
|
||||
|
||||
intrinsic.validate_result_values(&results).map_err(|err| match err {
|
||||
@@ -1151,6 +1167,24 @@ impl VirtualMachine {
|
||||
),
|
||||
pc_at_intrinsic,
|
||||
),
|
||||
crate::IntrinsicExecutionError::InvalidBuiltinCarrier {
|
||||
owner,
|
||||
name,
|
||||
carrier,
|
||||
} => self.trap(
|
||||
TRAP_INVALID_INTRINSIC,
|
||||
OpCode::Intrinsic as u16,
|
||||
format!(
|
||||
"Intrinsic {}.{} produced invalid builtin carrier {} for {}.{}",
|
||||
intrinsic.owner, intrinsic.name, carrier, owner, name
|
||||
),
|
||||
pc_at_intrinsic,
|
||||
),
|
||||
crate::IntrinsicExecutionError::HardwareUnavailable => {
|
||||
LogicalFrameEndingReason::Panic(
|
||||
"Host feature unavailable while validating intrinsic results".into(),
|
||||
)
|
||||
}
|
||||
})?;
|
||||
|
||||
for value in results {
|
||||
@@ -2331,6 +2365,34 @@ mod tests {
|
||||
assert_eq!(vm.operand_stack, vec![Value::Float(5.0)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_intrinsic_input_pad_returns_builtin_carrier() {
|
||||
let rom = assemble("INTRINSIC 0x2000\nHALT").expect("assemble");
|
||||
let mut vm = new_test_vm(rom, vec![]);
|
||||
let mut native = MockNative;
|
||||
let mut ctx = HostContext::new(None);
|
||||
|
||||
let report = vm.run_budget(100, &mut native, &mut ctx).unwrap();
|
||||
assert!(matches!(report.reason, LogicalFrameEndingReason::Halted));
|
||||
assert_eq!(vm.operand_stack, vec![Value::Int64(1)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_intrinsic_input_touch_x_requires_hardware_context() {
|
||||
let rom = assemble("INTRINSIC 0x2001\nINTRINSIC 0x2021\nHALT").expect("assemble");
|
||||
let mut vm = new_test_vm(rom, vec![]);
|
||||
let mut native = MockNative;
|
||||
let mut ctx = HostContext::new(None);
|
||||
|
||||
let report = vm.run_budget(100, &mut native, &mut ctx).unwrap();
|
||||
match report.reason {
|
||||
LogicalFrameEndingReason::Panic(msg) => {
|
||||
assert!(msg.contains("Host feature unavailable"));
|
||||
}
|
||||
other => panic!("Expected Panic due to missing hardware context, got {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_invalid_intrinsic_trap_is_distinct_from_syscall() {
|
||||
let rom = assemble("INTRINSIC 0xDEADBEEF\nHALT").expect("assemble");
|
||||
|
||||
Reference in New Issue
Block a user