|
|
|
@@ -148,14 +148,13 @@ impl VirtualMachine {
|
|
|
|
|
return Err(VmInitError::InvalidFormat);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Resolve the entrypoint: empty (defaults to 0), numeric PC, or symbol name.
|
|
|
|
|
// Resolve the entrypoint: empty (defaults to func 0), numeric func_idx, or symbol name.
|
|
|
|
|
let pc = if entrypoint.is_empty() {
|
|
|
|
|
0
|
|
|
|
|
} else if let Ok(addr) = entrypoint.parse::<usize>() {
|
|
|
|
|
if addr >= program.rom.len() && (addr > 0 || !program.rom.is_empty()) {
|
|
|
|
|
return Err(VmInitError::EntrypointNotFound);
|
|
|
|
|
}
|
|
|
|
|
addr
|
|
|
|
|
program.functions.get(0).map(|f| f.code_offset as usize).unwrap_or(0)
|
|
|
|
|
} else if let Ok(func_idx) = entrypoint.parse::<usize>() {
|
|
|
|
|
program.functions.get(func_idx)
|
|
|
|
|
.map(|f| f.code_offset as usize)
|
|
|
|
|
.ok_or(VmInitError::EntrypointNotFound)?
|
|
|
|
|
} else {
|
|
|
|
|
// Try to resolve as a symbol name from the exports map
|
|
|
|
|
if let Some(&func_idx) = program.exports.get(entrypoint) {
|
|
|
|
@@ -163,18 +162,7 @@ impl VirtualMachine {
|
|
|
|
|
.map(|f| f.code_offset as usize)
|
|
|
|
|
.ok_or(VmInitError::EntrypointNotFound)?
|
|
|
|
|
} else {
|
|
|
|
|
// Suffix match fallback (e.g. "frame" matches "src/main/modules/main:frame")
|
|
|
|
|
let suffix = format!(":{}", entrypoint);
|
|
|
|
|
let found = program.exports.iter()
|
|
|
|
|
.find(|(name, _)| name == &entrypoint || name.ends_with(&suffix));
|
|
|
|
|
|
|
|
|
|
if let Some((_, &func_idx)) = found {
|
|
|
|
|
program.functions.get(func_idx as usize)
|
|
|
|
|
.map(|f| f.code_offset as usize)
|
|
|
|
|
.ok_or(VmInitError::EntrypointNotFound)?
|
|
|
|
|
} else {
|
|
|
|
|
return Err(VmInitError::EntrypointNotFound);
|
|
|
|
|
}
|
|
|
|
|
return Err(VmInitError::EntrypointNotFound);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@@ -189,33 +177,18 @@ impl VirtualMachine {
|
|
|
|
|
/// 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) {
|
|
|
|
|
let (addr, func_idx) = if let Ok(addr) = entrypoint.parse::<usize>() {
|
|
|
|
|
let idx = self.program.functions.iter().position(|f| {
|
|
|
|
|
addr >= f.code_offset as usize && addr < (f.code_offset + f.code_len) as usize
|
|
|
|
|
}).unwrap_or(0);
|
|
|
|
|
(addr, idx)
|
|
|
|
|
let func_idx = if let Ok(idx) = entrypoint.parse::<usize>() {
|
|
|
|
|
idx
|
|
|
|
|
} else {
|
|
|
|
|
// Try to resolve as a symbol name
|
|
|
|
|
let found = self.program.exports.get(entrypoint)
|
|
|
|
|
.map(|&idx| (idx, entrypoint.to_string()))
|
|
|
|
|
.or_else(|| {
|
|
|
|
|
let suffix = format!(":{}", entrypoint);
|
|
|
|
|
self.program.exports.iter()
|
|
|
|
|
.find(|(name, _)| name == &entrypoint || name.ends_with(&suffix))
|
|
|
|
|
.map(|(name, &idx)| (idx, name.clone()))
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if let Some((func_idx, _)) = found {
|
|
|
|
|
let addr = self.program.functions.get(func_idx as usize)
|
|
|
|
|
.map(|f| f.code_offset as usize)
|
|
|
|
|
.unwrap_or(0);
|
|
|
|
|
(addr, func_idx as usize)
|
|
|
|
|
} else {
|
|
|
|
|
// Default to 0 for non-numeric entrypoints that aren't found.
|
|
|
|
|
(0, 0)
|
|
|
|
|
}
|
|
|
|
|
self.program.exports.get(entrypoint)
|
|
|
|
|
.map(|&idx| idx as usize)
|
|
|
|
|
.ok_or(()).unwrap_or(0) // Default to 0 if not found
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let callee = self.program.functions.get(func_idx).cloned().unwrap_or_default();
|
|
|
|
|
let addr = callee.code_offset as usize;
|
|
|
|
|
|
|
|
|
|
self.pc = addr;
|
|
|
|
|
self.halted = false;
|
|
|
|
|
|
|
|
|
@@ -943,6 +916,17 @@ impl VirtualMachine {
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
fn new_test_vm(rom: Vec<u8>, constant_pool: Vec<Value>) -> VirtualMachine {
|
|
|
|
|
let rom_len = rom.len() as u32;
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, constant_pool);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![prometeu_bytecode::FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom_len,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}]);
|
|
|
|
|
vm
|
|
|
|
|
}
|
|
|
|
|
use crate::hardware::HardwareBridge;
|
|
|
|
|
use crate::virtual_machine::{expect_int, HostReturn, Value, VmFault};
|
|
|
|
|
use prometeu_bytecode::abi::SourceSpan;
|
|
|
|
@@ -993,7 +977,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Mod as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(vm.pop().unwrap(), Value::Int32(0));
|
|
|
|
@@ -1012,7 +996,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Div as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -1035,7 +1019,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::IntToBoundChecked as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -1060,7 +1044,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Add as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -1086,7 +1070,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Lt as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
assert_eq!(vm.pop().unwrap(), Value::Boolean(true));
|
|
|
|
|
}
|
|
|
|
@@ -1098,7 +1082,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&42i64.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1113,7 +1097,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&3.14f64.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1132,7 +1116,7 @@ mod tests {
|
|
|
|
|
rom.push(0);
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1328,7 +1312,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::PopScope as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1427,7 +1411,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&42i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1449,7 +1433,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::BitAnd as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
@@ -1464,7 +1448,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::BitOr as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
@@ -1485,7 +1469,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Lte as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
@@ -1500,7 +1484,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Gte as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
@@ -1518,7 +1502,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Neg as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap();
|
|
|
|
|
assert_eq!(vm.pop().unwrap(), Value::Int32(-42));
|
|
|
|
@@ -1549,7 +1533,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&100i32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap(); // PushBool
|
|
|
|
|
vm.step(&mut native, &mut hw).unwrap(); // JmpIfTrue
|
|
|
|
|
assert_eq!(vm.pc, 11);
|
|
|
|
@@ -1568,7 +1552,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Trap as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(report.reason, LogicalFrameEndingReason::Breakpoint);
|
|
|
|
@@ -1592,7 +1576,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&2u32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(vm.pop().unwrap(), Value::Int32(1));
|
|
|
|
@@ -1614,7 +1598,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&1u32.to_le_bytes()); // offset 1
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -1641,7 +1625,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&0u32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -1662,7 +1646,12 @@ mod tests {
|
|
|
|
|
0x11, 0x00, // Pop
|
|
|
|
|
0x51, 0x00 // Ret
|
|
|
|
|
];
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = VirtualMachine::new(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![prometeu_bytecode::FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}]);
|
|
|
|
|
let mut hw = crate::Hardware::new();
|
|
|
|
|
struct TestNative;
|
|
|
|
|
impl NativeInterface for TestNative {
|
|
|
|
@@ -1692,7 +1681,12 @@ mod tests {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = VirtualMachine::new(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![prometeu_bytecode::FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}]);
|
|
|
|
|
let mut native = MultiReturnNative;
|
|
|
|
|
let mut hw = crate::Hardware::new();
|
|
|
|
|
|
|
|
|
@@ -1718,7 +1712,12 @@ mod tests {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = VirtualMachine::new(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![prometeu_bytecode::FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}]);
|
|
|
|
|
let mut native = VoidReturnNative;
|
|
|
|
|
let mut hw = crate::Hardware::new();
|
|
|
|
|
|
|
|
|
@@ -1748,7 +1747,12 @@ mod tests {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = VirtualMachine::new(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![prometeu_bytecode::FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: rom.len() as u32,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}]);
|
|
|
|
|
let mut native = ArgCheckNative;
|
|
|
|
|
let mut hw = crate::Hardware::new();
|
|
|
|
|
|
|
|
|
@@ -1770,7 +1774,7 @@ mod tests {
|
|
|
|
|
0x70, 0x00, // Syscall + Reserved
|
|
|
|
|
0xEF, 0xBE, 0xAD, 0xDE, // 0xDEADBEEF
|
|
|
|
|
];
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1795,7 +1799,7 @@ mod tests {
|
|
|
|
|
0x70, 0x00, // Syscall + Reserved
|
|
|
|
|
0x01, 0x10, 0x00, 0x00, // Syscall ID 0x1001
|
|
|
|
|
];
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = MockNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1832,7 +1836,7 @@ mod tests {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let mut native = BadNative;
|
|
|
|
|
let mut hw = MockHardware;
|
|
|
|
|
|
|
|
|
@@ -1962,7 +1966,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
let f1_len = rom.len() as u32 - f1_start;
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![
|
|
|
|
|
FunctionMeta {
|
|
|
|
|
code_offset: f0_start as u32,
|
|
|
|
@@ -2014,7 +2018,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
let f1_len = rom.len() as u32 - f1_start;
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![
|
|
|
|
|
FunctionMeta {
|
|
|
|
|
code_offset: f0_start as u32,
|
|
|
|
@@ -2065,7 +2069,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
let f1_len = rom.len() as u32 - f1_start;
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![
|
|
|
|
|
FunctionMeta {
|
|
|
|
|
code_offset: f0_start as u32,
|
|
|
|
@@ -2097,7 +2101,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Call as u16).to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&99u32.to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
let report = vm.run_budget(100, &mut native, &mut hw).unwrap();
|
|
|
|
|
|
|
|
|
|
match report.reason {
|
|
|
|
@@ -2130,7 +2134,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
let f1_len = rom.len() as u32 - f1_start;
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![
|
|
|
|
|
FunctionMeta {
|
|
|
|
|
code_offset: f0_start as u32,
|
|
|
|
@@ -2180,7 +2184,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&0u32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: 20,
|
|
|
|
@@ -2234,7 +2238,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Ret as u16).to_le_bytes());
|
|
|
|
|
let f1_len = rom.len() as u32 - f1_start;
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![
|
|
|
|
|
FunctionMeta {
|
|
|
|
|
code_offset: f0_start as u32,
|
|
|
|
@@ -2271,7 +2275,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&1u32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: 8,
|
|
|
|
@@ -2346,7 +2350,7 @@ mod tests {
|
|
|
|
|
// 48: HALT
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
// We need to set up the function meta for absolute jumps to work correctly
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
@@ -2385,7 +2389,7 @@ mod tests {
|
|
|
|
|
// 15-16: HALT
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: 17,
|
|
|
|
@@ -2413,7 +2417,7 @@ mod tests {
|
|
|
|
|
rom.extend_from_slice(&9u32.to_le_bytes());
|
|
|
|
|
rom.extend_from_slice(&(OpCode::Halt as u16).to_le_bytes());
|
|
|
|
|
|
|
|
|
|
let mut vm = VirtualMachine::new(rom, vec![]);
|
|
|
|
|
let mut vm = new_test_vm(rom.clone(), vec![]);
|
|
|
|
|
vm.program.functions = std::sync::Arc::from(vec![FunctionMeta {
|
|
|
|
|
code_offset: 0,
|
|
|
|
|
code_len: 14,
|
|
|
|
@@ -2454,7 +2458,11 @@ mod tests {
|
|
|
|
|
function_names: vec![(0, "main".to_string())],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let program = ProgramImage::new(rom, vec![], vec![], Some(debug_info), std::collections::HashMap::new());
|
|
|
|
|
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()
|
|
|
|
|