fix: 将 VM 步数上限改为 KernelConfig 可配置项

This commit is contained in:
爱特每羊队
2026-06-08 21:46:08 +08:00
parent 43c7151c54
commit 2e09beaf65
3 changed files with 43 additions and 3 deletions
+4 -3
View File
@@ -556,11 +556,12 @@ impl Vm {
fn dispatch(&mut self) -> Result<JsValue, String> {
let mut steps: u64 = 0;
const MAX_STEPS: u64 = 100_000_000;
loop {
steps += 1;
if steps > MAX_STEPS {
return Err(format!("VM step limit exceeded at pc={}", self.pc));
if let Some(max_steps) = self.kernel.config.max_steps {
if steps > max_steps {
return Err(format!("VM step limit exceeded at pc={}", self.pc));
}
}
if self.pc >= self.bytecode.len() {
return Err("program counter out of bounds".into());
+32
View File
@@ -1,4 +1,7 @@
use std::sync::Arc;
use oxide_compiler::compiler::Compiler;
use oxide_kernel::kernel::{KernelConfig, OxideKernel};
use oxide_parser::Allocator;
use oxide_vm::vm::Vm;
@@ -19,6 +22,23 @@ fn eval(source: &str) -> String {
}
}
fn eval_with_kernel(source: &str, kernel: Arc<OxideKernel>) -> String {
let allocator = Allocator::default();
let program = match oxide_parser::parse(&allocator, source) {
Ok(p) => p,
Err(e) => return format!("parse error: {}", e[0].message),
};
let module = match Compiler::new().compile(&program) {
Ok(m) => m,
Err(e) => return format!("compile error: {e}"),
};
let mut vm = Vm::with_kernel(kernel);
match vm.run(&module) {
Ok(result) => format!("{result}"),
Err(e) => format!("vm error: {e}"),
}
}
#[test]
fn regression_to_boolean_empty_string() {
assert_eq!(eval("!''"), "true", "NOT empty string should be true");
@@ -74,3 +94,15 @@ fn regression_for_in_prototype_chain() {
"for-in should include inherited constructor from prototype"
);
}
#[test]
fn regression_vm_step_limit_is_configurable() {
let mut config = KernelConfig::minimal();
config.max_steps = Some(5);
let kernel = Arc::new(OxideKernel::new(config));
let result = eval_with_kernel("while (true) {}", kernel);
assert!(
result.contains("VM step limit exceeded"),
"expected configurable step limit error, got: {result}"
);
}