xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

⚡ maybe do not need o_intg anymore

This commit is contained in:
ValKmjolnir 2023-08-27 00:25:49 +08:00
parent 93528babdb
commit ae5c76ecd5
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nasal_opcode.h
View File

@ -7,7 +7,7 @@
enum op_code_type:u8 { enum op_code_type:u8 {
op_exit, // stop the virtual machine op_exit, // stop the virtual machine
op_intg, // global scope size, set stack top op_intg, // init global scope
op_intl, // local scope size op_intl, // local scope size
op_loadg, // load global value op_loadg, // load global value
op_loadl, // load local value op_loadl, // load local value

12
src/nasal_vm.cpp
View File

@ -13,6 +13,7 @@ void vm::init(
cstr = strs.data(); cstr = strs.data();
bytecode = code.data(); bytecode = code.data();
files = filenames.data(); files = filenames.data();
global_size = global_symbol.size();
/* set native functions */ /* set native functions */
native = natives; native = natives;
@ -24,7 +25,7 @@ void vm::init(
ctx.funcr = nil; ctx.funcr = nil;
ctx.upvalr = nil; ctx.upvalr = nil;
ctx.canary = ctx.stack+STACK_DEPTH-1; // stack[STACK_DEPTH-1] ctx.canary = ctx.stack+STACK_DEPTH-1; // stack[STACK_DEPTH-1]
ctx.top = ctx.stack; ctx.top = ctx.stack; // nothing is on stack
/* clear main stack and global */ /* clear main stack and global */
for(u32 i = 0; i<STACK_DEPTH; ++i) { for(u32 i = 0; i<STACK_DEPTH; ++i) {
@ -33,7 +34,7 @@ void vm::init(
} }
/* init gc */ /* init gc */
ngc.set(&ctx, global, global_symbol.size()); ngc.set(&ctx, global, global_size);
ngc.init(strs, argv); ngc.init(strs, argv);
/* init vm globals */ /* init vm globals */
@ -131,7 +132,7 @@ void vm::stackinfo(const u32 limit = 10) {
for(u32 i = 0; i<limit && top>=bottom; ++i, --top) { for(u32 i = 0; i<limit && top>=bottom; ++i, --top) {
std::clog << " 0x" << std::hex std::clog << " 0x" << std::hex
<< std::setw(6) << std::setfill('0') << std::setw(6) << std::setfill('0')
<< (u64)(top-ngc.rctx->stack) << std::dec << (u64)(top-bottom) << std::dec
<< " "; << " ";
valinfo(top[0]); valinfo(top[0]);
} }
@ -152,13 +153,12 @@ void vm::reginfo() {
} }
void vm::gstate() { void vm::gstate() {
// bytecode[0].op is op_intg if (!global_size || global[0].type==vm_none) {
if (!bytecode[0].num || global[0].type==vm_none) {
return; return;
} }
std::clog << "global (0x" << std::hex std::clog << "global (0x" << std::hex
<< (u64)global << ")\n" << std::dec; << (u64)global << ")\n" << std::dec;
for(u32 i = 0; i<bytecode[0].num; ++i) { for(usize i = 0; i<global_size; ++i) {
std::clog << " 0x" << std::hex << std::setw(6) std::clog << " 0x" << std::hex << std::setw(6)
<< std::setfill('0') << i << std::dec << std::setfill('0') << i << std::dec
<< " "; << " ";

5
src/nasal_vm.h
View File

@ -16,7 +16,7 @@
class vm { class vm {
protected: protected:
/* registers and constants of vm */ /* registers of vm */
context ctx; context ctx;
/* constants */ /* constants */
@ -30,6 +30,7 @@ protected:
/* main stack */ /* main stack */
var* global = nullptr; var* global = nullptr;
usize global_size = 0;
/* values used for debugger */ /* values used for debugger */
const std::string* files = nullptr; // file name list const std::string* files = nullptr; // file name list
@ -180,7 +181,7 @@ inline bool vm::cond(var& val) {
inline void vm::o_intg() { inline void vm::o_intg() {
// global values store on stack // global values store on stack
ctx.top += imm[ctx.pc]; // ctx.top += imm[ctx.pc];
// point to the top // point to the top
--ctx.top; --ctx.top;
} }