xxq250/Nasal-Interpreter
1
0
Fork 1
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git synced 2026-07-26 12:59:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bug fixed

Browse Source 
add operand op_offset to make sure arguments are loaded at correct places,before this commit,arguments are not loaded from a correct offset,which will cause SIGSEGV when calling a function that has complex closure
This commit is contained in:
Valk Richard Li
2021-05-17 21:15:57 +08:00
parent 20cfbfecd9
commit a499c75932
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nasal_vm.h
+9 -4
View File
@@ -21,6 +21,7 @@ private:
void opr_nop();
void opr_intg();
void opr_intl();
void opr_offset();
void opr_loadg();
void opr_loadl();
void opr_pnum();
@@ -146,15 +147,19 @@ void nasal_vm::opr_nop()
}
void nasal_vm::opr_intg()
{
gc.global.resize(exec_code[pc].num);
gc.global.resize(exec_code[pc].num,gc.nil_addr);
return;
}
void nasal_vm::opr_intl()
{
(*stack_top)->ptr.func->closure.resize(exec_code[pc].num);
(*stack_top)->ptr.func->closure.resize(exec_code[pc].num,gc.nil_addr);
(*stack_top)->ptr.func->closure[0]=gc.nil_addr;// me
return;
}
void nasal_vm::opr_offset()
{
(*stack_top)->ptr.func->offset=exec_code[pc].num;
}
void nasal_vm::opr_loadg()
{
gc.global[exec_code[pc].num]=*stack_top--;
@@ -209,8 +214,7 @@ void nasal_vm::opr_newf()
if(!gc.local.empty())
val->ptr.func->closure=gc.local.back();
else
val->ptr.func->closure.push_back(gc.nil_addr);
val->ptr.func->offset=val->ptr.func->closure.size();
val->ptr.func->closure.push_back(gc.nil_addr);// me
*(++stack_top)=val;
return;
}
@@ -868,6 +872,7 @@ void nasal_vm::run()
&nasal_vm::opr_nop,
&nasal_vm::opr_intg,
&nasal_vm::opr_intl,
&nasal_vm::opr_offset,
&nasal_vm::opr_loadg,
&nasal_vm::opr_loadl,
&nasal_vm::opr_pnum,