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

🚀 update makefile to choose different compilers by users & fix some codes for MSVC to compile.

Browse Source
This commit is contained in:
ValKmjolnir
2022-07-16 16:53:11 +08:00
parent 2f89c95307
commit 7c1d45a200
13 changed files with 110 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nasal_vm.h
+10 -5
View File
@@ -732,7 +732,11 @@ inline void nasal_vm::opr_callfv()
for(uint32_t i=psize;i<argc;++i)
dynamic.vec().elems.push_back(local[i]);
}
#ifdef _MSC_VER
uint32_t min_size=(std::min)(psize,argc);
#else
uint32_t min_size=std::min(psize,argc);
#endif
for(uint32_t i=min_size;i>=1;--i)// load arguments
local[i]=local[i-1];
local[0]=func.local[0];// load "me"
@@ -1040,15 +1044,16 @@ void nasal_vm::run(
&nasal_vm::opr_mcallv, &nasal_vm::opr_mcallh,
&nasal_vm::opr_ret
};
std::vector<const nafunc> code;
typedef struct{nafunc ptr;uint32_t type;} naf;
std::vector<naf> code;
for(auto& i:gen.get_code())
{
code.push_back(oprs[i.op]);
code.push_back({oprs[i.op],i.op});
imm.push_back(i.num);
}
while(code[pc]){
(this->*code[pc])();
++count[num];
while(code[pc].ptr){
++count[code[pc].type];
(this->*code[pc].ptr)();
if(top>=canary)
break;
++pc;