|
|
|
@@ -1,16 +1,13 @@
|
|
|
|
|
use crate::call_frame::CallFrame;
|
|
|
|
|
use crate::scope_frame::ScopeFrame;
|
|
|
|
|
use crate::{HostContext, NativeInterface};
|
|
|
|
|
use prometeu_bytecode::abi::{
|
|
|
|
|
TrapInfo, TRAP_BAD_RET_SLOTS, TRAP_DEAD_GATE, TRAP_DIV_ZERO, TRAP_INVALID_FUNC, TRAP_INVALID_GATE, TRAP_OOB,
|
|
|
|
|
TRAP_TYPE,
|
|
|
|
|
};
|
|
|
|
|
use prometeu_bytecode::opcode::OpCode;
|
|
|
|
|
use prometeu_bytecode::program_image::ProgramImage;
|
|
|
|
|
use prometeu_bytecode::Value;
|
|
|
|
|
use prometeu_hal::vm_fault::VmFault;
|
|
|
|
|
use crate::verifier::Verifier;
|
|
|
|
|
use crate::vm_init_error::VmInitError;
|
|
|
|
|
use crate::{HostContext, NativeInterface};
|
|
|
|
|
use prometeu_bytecode::{TrapInfo, TRAP_BAD_RET_SLOTS, TRAP_DEAD_GATE, TRAP_DIV_ZERO, TRAP_INVALID_FUNC, TRAP_INVALID_GATE, TRAP_INVALID_SYSCALL, TRAP_OOB, TRAP_STACK_UNDERFLOW, TRAP_TYPE};
|
|
|
|
|
use prometeu_bytecode::OpCode;
|
|
|
|
|
use prometeu_bytecode::ProgramImage;
|
|
|
|
|
use prometeu_bytecode::Value;
|
|
|
|
|
use prometeu_hal::vm_fault::VmFault;
|
|
|
|
|
|
|
|
|
|
/// Reason why the Virtual Machine stopped execution during a specific run.
|
|
|
|
|
/// This allows the system to decide if it should continue execution in the next tick
|
|
|
|
@@ -363,7 +360,7 @@ impl VirtualMachine {
|
|
|
|
|
let start_pc = self.pc;
|
|
|
|
|
|
|
|
|
|
// Fetch & Decode
|
|
|
|
|
let instr = prometeu_bytecode::decoder::decode_next(self.pc, &self.program.rom)
|
|
|
|
|
let instr = prometeu_bytecode::decode_next(self.pc, &self.program.rom)
|
|
|
|
|
.map_err(|e| LogicalFrameEndingReason::Panic(format!("{:?}", e)))?;
|
|
|
|
|
|
|
|
|
|
let opcode = instr.opcode;
|
|
|
|
@@ -884,7 +881,7 @@ impl VirtualMachine {
|
|
|
|
|
let pc_at_syscall = start_pc as u32;
|
|
|
|
|
let id = instr.imm_u32().map_err(|e| LogicalFrameEndingReason::Panic(format!("{:?}", e)))?;
|
|
|
|
|
let syscall = prometeu_hal::syscalls::Syscall::from_u32(id).ok_or_else(|| {
|
|
|
|
|
self.trap(prometeu_bytecode::abi::TRAP_INVALID_SYSCALL, OpCode::Syscall as u16, format!("Unknown syscall: 0x{:08X}", id), pc_at_syscall)
|
|
|
|
|
self.trap(TRAP_INVALID_SYSCALL, OpCode::Syscall as u16, format!("Unknown syscall: 0x{:08X}", id), pc_at_syscall)
|
|
|
|
|
})?;
|
|
|
|
|
|
|
|
|
|
let args_count = syscall.args_count();
|
|
|
|
@@ -892,7 +889,7 @@ impl VirtualMachine {
|
|
|
|
|
let mut args = Vec::with_capacity(args_count);
|
|
|
|
|
for _ in 0..args_count {
|
|
|
|
|
let v = self.pop().map_err(|_e| {
|
|
|
|
|
self.trap(prometeu_bytecode::abi::TRAP_STACK_UNDERFLOW, OpCode::Syscall as u16, "Syscall argument stack underflow".to_string(), pc_at_syscall)
|
|
|
|
|
self.trap(TRAP_STACK_UNDERFLOW, OpCode::Syscall as u16, "Syscall argument stack underflow".to_string(), pc_at_syscall)
|
|
|
|
|
})?;
|
|
|
|
|
args.push(v);
|
|
|
|
|
}
|
|
|
|
@@ -1007,9 +1004,8 @@ mod tests {
|
|
|
|
|
}]);
|
|
|
|
|
vm
|
|
|
|
|
}
|
|
|
|
|
use crate::{HostReturn};
|
|
|
|
|
use prometeu_bytecode::abi::SourceSpan;
|
|
|
|
|
use prometeu_bytecode::FunctionMeta;
|
|
|
|
|
use crate::HostReturn;
|
|
|
|
|
use prometeu_bytecode::{FunctionMeta, TRAP_INVALID_LOCAL, TRAP_STACK_UNDERFLOW};
|
|
|
|
|
use prometeu_hal::expect_int;
|
|
|
|
|
|
|
|
|
|
struct MockNative;
|
|
|
|
@@ -1669,7 +1665,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_OOB);
|
|
|
|
|
assert_eq!(trap.code, TRAP_OOB);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::GateLoad as u16);
|
|
|
|
|
assert!(trap.message.contains("Out-of-bounds"));
|
|
|
|
|
}
|
|
|
|
@@ -1696,7 +1692,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_TYPE);
|
|
|
|
|
assert_eq!(trap.code, TRAP_TYPE);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::GateLoad as u16);
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
@@ -1772,7 +1768,7 @@ mod tests {
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut ctx).unwrap();
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_INVALID_GATE);
|
|
|
|
|
assert_eq!(trap.code, TRAP_INVALID_GATE);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::GateLoad as u16);
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
@@ -1903,7 +1899,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_TYPE);
|
|
|
|
|
assert_eq!(trap.code, TRAP_TYPE);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::Syscall as u16);
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
@@ -1925,7 +1921,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_INVALID_SYSCALL);
|
|
|
|
|
assert_eq!(trap.code, TRAP_INVALID_SYSCALL);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::Syscall as u16);
|
|
|
|
|
assert!(trap.message.contains("Unknown syscall"));
|
|
|
|
|
assert_eq!(trap.pc, 0);
|
|
|
|
@@ -1950,7 +1946,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_STACK_UNDERFLOW);
|
|
|
|
|
assert_eq!(trap.code, TRAP_STACK_UNDERFLOW);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::Syscall as u16);
|
|
|
|
|
assert!(trap.message.contains("underflow"));
|
|
|
|
|
assert_eq!(trap.pc, 0);
|
|
|
|
@@ -1998,7 +1994,7 @@ mod tests {
|
|
|
|
|
assert!(res.is_err());
|
|
|
|
|
match res.err().unwrap() {
|
|
|
|
|
VmFault::Trap(code, _) => {
|
|
|
|
|
assert_eq!(code, prometeu_bytecode::abi::TRAP_OOB);
|
|
|
|
|
assert_eq!(code, TRAP_OOB);
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap"),
|
|
|
|
|
}
|
|
|
|
@@ -2430,7 +2426,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
|
LogicalFrameEndingReason::Trap(trap) => {
|
|
|
|
|
assert_eq!(trap.code, prometeu_bytecode::abi::TRAP_INVALID_LOCAL);
|
|
|
|
|
assert_eq!(trap.code, TRAP_INVALID_LOCAL);
|
|
|
|
|
assert_eq!(trap.opcode, OpCode::GetLocal as u16);
|
|
|
|
|
assert!(trap.message.contains("out of bounds"));
|
|
|
|
|
}
|
|
|
|
@@ -2577,97 +2573,4 @@ mod tests {
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_traceable_trap_with_span() {
|
|
|
|
|
let mut rom = Vec::new();
|
|
|
|
|
// 0: PUSH_I32 10 (6 bytes)
|
|
|
|
|
// 6: PUSH_I32 0 (6 bytes)
|
|
|
|
|
// 12: DIV (2 bytes)
|
|
|
|
|
rom.extend_from_slice(&(OpCode::PushI32 as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&10i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::PushI32 as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&0i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Div as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut pc_to_span = Vec::new();
|
|
|
|
|
pc_to_span.push((0, SourceSpan { file_id: 1, start: 10, end: 15 }));
|
|
|
|
|
pc_to_span.push((6, SourceSpan { file_id: 1, start: 16, end: 20 }));
|
|
|
|
|
pc_to_span.push((12, SourceSpan { file_id: 1, start: 21, end: 25 }));
|
|
|
|
|
|
|
|
|
|
let debug_info = prometeu_bytecode::DebugInfo {
|
|
|
|
|
pc_to_span,
|
|
|
|
|
function_names: vec![(0, "main".to_string())],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let program = ProgramImage::new(rom.clone(), vec![], vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}], Some(debug_info), std::collections::HashMap::new());
|
|
|
|
|
let mut vm = VirtualMachine {
|
|
|
|
|
program,
|
|
|
|
|
..Default::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
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_DIV_ZERO);
|
|
|
|
|
assert_eq!(trap.pc, 12);
|
|
|
|
|
assert_eq!(trap.span, Some(SourceSpan { file_id: 1, start: 21, end: 25 }));
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_traceable_trap_with_function_name() {
|
|
|
|
|
let mut rom = Vec::new();
|
|
|
|
|
// 0: PUSH_I32 10 (6 bytes)
|
|
|
|
|
// 6: PUSH_I32 0 (6 bytes)
|
|
|
|
|
// 12: DIV (2 bytes)
|
|
|
|
|
rom.extend_from_slice(&(OpCode::PushI32 as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&10i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::PushI32 as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&0i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Div as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let pc_to_span = vec![(12, SourceSpan { file_id: 1, start: 21, end: 25 })];
|
|
|
|
|
let function_names = vec![(0, "math_utils::divide".to_string())];
|
|
|
|
|
|
|
|
|
|
let debug_info = prometeu_bytecode::DebugInfo {
|
|
|
|
|
pc_to_span,
|
|
|
|
|
function_names,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let functions = vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
let program = ProgramImage::new(rom, vec![], functions, Some(debug_info), std::collections::HashMap::new());
|
|
|
|
|
let mut vm = VirtualMachine {
|
|
|
|
|
program,
|
|
|
|
|
..Default::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
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_DIV_ZERO);
|
|
|
|
|
assert!(trap.message.contains("math_utils::divide"));
|
|
|
|
|
}
|
|
|
|
|
_ => panic!("Expected Trap, got {:?}", report.reason),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|