xxq250/Nasal-Interpreter
1
0
Fork 1
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git synced 2026-05-02 19:00:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Web: Fix timeout

Browse Source
This commit is contained in:
Sidi Liang
2025-02-05 14:46:07 +08:00
parent 9cbefa1003
commit 699c5f7af4
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nasal_vm.cpp
View File

@@ -559,6 +559,14 @@ void vm::run(const codegen& gen,
#ifndef _MSC_VER
// using labels as values/computed goto
// Define an interrupt check macro for computed goto mode.
#define CHECK_INTERRUPT { \
if (interrupt_ptr && interrupt_ptr->load()) { \
throw std::runtime_error("VM execution interrupted by timeout"); \
} \
}
const void* oprs[] = {
&&vmexit,
&&repl,
@@ -654,7 +662,7 @@ void vm::run(const codegen& gen,
code.push_back(oprs[i.op]);
imm.push_back(i.num);
}
// goto the first operand
CHECK_INTERRUPT;
goto *code[ctx.pc];
#else
std::vector<nasal_vm_func> code;
@@ -663,6 +671,9 @@ void vm::run(const codegen& gen,
imm.push_back(i.num);
}
while(code[ctx.pc]) {
if (interrupt_ptr && interrupt_ptr->load()) {
throw std::runtime_error("VM execution interrupted by timeout");
}
(this->*code[ctx.pc])();
if (ctx.top>=ctx.canary) {
die("stack overflow");
@@ -693,6 +704,7 @@ vmexit:
// do not cause stackoverflow
#define exec_nodie(op) {\
op();\
CHECK_INTERRUPT;\
goto *code[++ctx.pc];\
}