add trace back info
This commit is contained in:
Li Haokun
GitHub
parent
9da029b8fe
commit
9fe7a86a3b
|
|
@ -54,11 +54,11 @@ Input this command to run scripts directly:
|
|||
|
||||
Use these commands to get version of interpreter:
|
||||
|
||||
> ./nasal -v | -version
|
||||
> ./nasal -v | --version
|
||||
|
||||
Use these commands to get help:
|
||||
|
||||
> ./nasal -h | -help
|
||||
> ./nasal -h | --help
|
||||
|
||||
If your system is Windows and you want to output unicode,please use this command before running nasal interpreter:
|
||||
|
||||
|
|
|
|||
16
main.cpp
16
main.cpp
|
|
@ -5,7 +5,6 @@ void help_interact()
|
|||
std::cout
|
||||
<<">> [ ] input a file name to execute. \n"
|
||||
<<">> [help ] show help. \n"
|
||||
<<">> [lex ] view tokens. \n"
|
||||
<<">> [ast ] view abstract syntax tree. \n"
|
||||
<<">> [code ] view byte code. \n"
|
||||
<<">> [exec ] execute program on bytecode vm.\n"
|
||||
|
|
@ -65,13 +64,7 @@ void execute(std::string& file,std::string& command)
|
|||
die("lexer",file);
|
||||
return;
|
||||
}
|
||||
if(command=="lex")
|
||||
{
|
||||
lexer.print_token();
|
||||
return;
|
||||
}
|
||||
parse.set_toklist(lexer.get_token_list());
|
||||
lexer.get_token_list().clear();
|
||||
parse.main_process();
|
||||
if(parse.get_error())
|
||||
{
|
||||
|
|
@ -83,8 +76,8 @@ void execute(std::string& file,std::string& command)
|
|||
parse.get_root().print_ast(0);
|
||||
return;
|
||||
}
|
||||
import.link(parse.get_root());
|
||||
parse.get_root().clear();
|
||||
// first used file is itself
|
||||
import.link(parse.get_root(),file);
|
||||
if(import.get_error())
|
||||
{
|
||||
die("import",file);
|
||||
|
|
@ -103,7 +96,8 @@ void execute(std::string& file,std::string& command)
|
|||
}
|
||||
vm.init(
|
||||
codegen.get_str_table(),
|
||||
codegen.get_num_table()
|
||||
codegen.get_num_table(),
|
||||
import.get_file()
|
||||
);
|
||||
vm.run(codegen.get_exec_code());
|
||||
vm.clear();
|
||||
|
|
@ -128,7 +122,7 @@ void interact()
|
|||
logo();
|
||||
else if(command=="exit")
|
||||
return;
|
||||
else if(command=="lex" || command=="ast" || command=="code" || command=="exec")
|
||||
else if(command=="ast" || command=="code" || command=="exec")
|
||||
execute(file,command);
|
||||
else
|
||||
file=command;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ enum ast_node
|
|||
{
|
||||
ast_null=0,
|
||||
ast_root,ast_block,
|
||||
ast_file, // ast_file is only used to store which file the subtree is on,codegen will generate nothing
|
||||
ast_nil,ast_num,ast_str,ast_id,ast_func,ast_hash,ast_vec,
|
||||
ast_hashmember,ast_call,ast_callh,ast_callv,ast_callf,ast_subvec,
|
||||
ast_args,ast_default_arg,ast_dynamic_id,
|
||||
|
|
@ -27,6 +28,7 @@ const char* ast_name[]=
|
|||
{
|
||||
"null",
|
||||
"root","block",
|
||||
"file",
|
||||
"nil","num","str","id","func","hash","vec",
|
||||
"hashmember","call","callh","callv","callf","subvec",
|
||||
"args","deflt_arg","dyn_id",
|
||||
|
|
@ -131,7 +133,7 @@ void nasal_ast::print_ast(int depth)
|
|||
std::cout<<ast_name[type];
|
||||
if(type==ast_str || type==ast_id || type==ast_default_arg || type==ast_dynamic_id || type==ast_callh)
|
||||
std::cout<<":"<<str;
|
||||
else if(type==ast_num)
|
||||
else if(type==ast_num || type==ast_file)
|
||||
std::cout<<":"<<num;
|
||||
std::cout<<'\n';
|
||||
for(auto& i:children)
|
||||
|
|
|
|||
|
|
@ -54,11 +54,7 @@ nasal_val* builtin_right(std::vector<nasal_val*>&,nasal_gc&);
|
|||
nasal_val* builtin_cmp(std::vector<nasal_val*>&,nasal_gc&);
|
||||
nasal_val* builtin_chr(std::vector<nasal_val*>&,nasal_gc&);
|
||||
|
||||
void builtin_err(const char* func_name,std::string info)
|
||||
{
|
||||
std::cout<<">> [vm] "<<func_name<<": "<<info<<".\n";
|
||||
return;
|
||||
}
|
||||
#define builtin_err(func_name,info) std::cout<<">> [vm] "<<func_name<<": "<<info<<".\n"
|
||||
|
||||
// register builtin function's name and it's address here in this table below
|
||||
// this table must end with {"",nullptr}
|
||||
|
|
|
|||
|
|
@ -168,12 +168,14 @@ struct
|
|||
|
||||
struct opcode
|
||||
{
|
||||
uint8_t op;
|
||||
uint16_t op;
|
||||
uint16_t fidx;
|
||||
uint32_t num;
|
||||
uint32_t line;
|
||||
opcode(uint8_t _op=op_nop,uint32_t _num=0,uint32_t _line=0)
|
||||
opcode(uint8_t _op=op_nop,uint16_t _fidx=0,uint32_t _num=0,uint32_t _line=0)
|
||||
{
|
||||
op=_op;
|
||||
fidx=_fidx;
|
||||
num=_num;
|
||||
line=_line;
|
||||
return;
|
||||
|
|
@ -181,6 +183,7 @@ struct opcode
|
|||
opcode& operator=(const opcode& tmp)
|
||||
{
|
||||
op=tmp.op;
|
||||
fidx=tmp.fidx;
|
||||
num=tmp.num;
|
||||
line=tmp.line;
|
||||
return *this;
|
||||
|
|
@ -191,6 +194,7 @@ class nasal_codegen
|
|||
{
|
||||
private:
|
||||
int error;
|
||||
uint16_t fileindex;
|
||||
int in_forindex;
|
||||
int in_foreach;
|
||||
std::unordered_map<double,int> number_table;
|
||||
|
|
@ -316,7 +320,7 @@ int nasal_codegen::global_find(std::string& name)
|
|||
|
||||
void nasal_codegen::gen(uint8_t op,uint32_t num,uint32_t line)
|
||||
{
|
||||
exec_code.push_back({op,num,line});
|
||||
exec_code.push_back({op,fileindex,num,line});
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1136,6 +1140,7 @@ void nasal_codegen::main_progress(nasal_ast& ast)
|
|||
error=0;
|
||||
in_foreach=0;
|
||||
in_forindex=0;
|
||||
fileindex=0;
|
||||
|
||||
number_table.clear();
|
||||
string_table.clear();
|
||||
|
|
@ -1149,6 +1154,7 @@ void nasal_codegen::main_progress(nasal_ast& ast)
|
|||
switch(tmp.get_type())
|
||||
{
|
||||
case ast_null:case ast_nil:case ast_num:case ast_str:case ast_func:break;
|
||||
case ast_file:fileindex=tmp.get_num();break;
|
||||
case ast_def:def_gen(tmp);break;
|
||||
case ast_multi_assign:multi_assign_gen(tmp);break;
|
||||
case ast_conditional:conditional_gen(tmp);break;
|
||||
|
|
|
|||
|
|
@ -14,11 +14,12 @@ private:
|
|||
bool check_exist(std::string&);
|
||||
void linker(nasal_ast&,nasal_ast&&);
|
||||
nasal_ast file_import(nasal_ast&);
|
||||
nasal_ast load(nasal_ast&);
|
||||
nasal_ast load(nasal_ast&,uint16_t);
|
||||
public:
|
||||
int get_error(){return error;}
|
||||
void link(nasal_ast&);
|
||||
void link(nasal_ast&,std::string&);
|
||||
nasal_ast& get_root(){return import_ast;}
|
||||
std::vector<std::string>& get_file(){return filename_table;}
|
||||
};
|
||||
|
||||
void nasal_import::die(std::string& filename,const char* error_stage)
|
||||
|
|
@ -91,7 +92,6 @@ nasal_ast nasal_import::file_import(nasal_ast& node)
|
|||
return tmp;
|
||||
}
|
||||
import_par.set_toklist(import_lex.get_token_list());
|
||||
import_lex.get_token_list().clear();
|
||||
import_par.main_process();
|
||||
if(import_par.get_error())
|
||||
{
|
||||
|
|
@ -99,30 +99,34 @@ nasal_ast nasal_import::file_import(nasal_ast& node)
|
|||
return tmp;
|
||||
}
|
||||
tmp=std::move(import_par.get_root());
|
||||
import_par.get_root().clear();
|
||||
// check if tmp has 'import'
|
||||
return load(tmp);
|
||||
return load(tmp,filename_table.size()-1);
|
||||
}
|
||||
|
||||
nasal_ast nasal_import::load(nasal_ast& root)
|
||||
nasal_ast nasal_import::load(nasal_ast& root,uint16_t fileindex)
|
||||
{
|
||||
nasal_ast new_root(0,ast_root);
|
||||
for(auto& i:root.get_children())
|
||||
if(check_import(i))
|
||||
linker(new_root,file_import(i));
|
||||
// add root to the back of new_root
|
||||
nasal_ast file_head(0,ast_file);
|
||||
file_head.set_num(fileindex);
|
||||
new_root.add_child(std::move(file_head));
|
||||
linker(new_root,std::move(root));
|
||||
return new_root;
|
||||
}
|
||||
|
||||
void nasal_import::link(nasal_ast& root)
|
||||
void nasal_import::link(nasal_ast& root,std::string& self)
|
||||
{
|
||||
// initializing
|
||||
error=0;
|
||||
filename_table.clear();
|
||||
filename_table.push_back(self);
|
||||
import_ast.clear();
|
||||
// scan root and import files,then generate a new ast and return to import_ast
|
||||
import_ast=load(root);
|
||||
// the main file's index is 0
|
||||
import_ast=load(root,0);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
34
nasal_vm.h
34
nasal_vm.h
|
|
@ -15,6 +15,9 @@ private:
|
|||
std::vector<uint32_t> imm; // immediate number
|
||||
nasal_val** mem_addr; // used for mem_call
|
||||
nasal_gc gc; // garbage collector
|
||||
/* values used for debug */
|
||||
std::vector<opcode> bytecode; // bytecode
|
||||
std::vector<std::string> files; // files
|
||||
|
||||
void die(std::string);
|
||||
bool condition(nasal_val*);
|
||||
|
|
@ -97,19 +100,22 @@ public:
|
|||
nasal_vm():stack_top(gc.stack_top){};
|
||||
void init(
|
||||
std::vector<std::string>&,
|
||||
std::vector<double>&);
|
||||
std::vector<double>&,
|
||||
std::vector<std::string>&);
|
||||
void clear();
|
||||
void run(std::vector<opcode>&);
|
||||
};
|
||||
|
||||
void nasal_vm::init(
|
||||
std::vector<std::string>& strs,
|
||||
std::vector<double>& nums)
|
||||
std::vector<double>& nums,
|
||||
std::vector<std::string>& filenames)
|
||||
{
|
||||
gc.gc_init(nums,strs);
|
||||
gc.val_stack[STACK_MAX_DEPTH-1]=nullptr;
|
||||
num_table=nums; // get constant numbers
|
||||
str_table=strs; // get constant strings & symbols
|
||||
files=filenames;// get filenames for debugger
|
||||
return;
|
||||
}
|
||||
void nasal_vm::clear()
|
||||
|
|
@ -126,7 +132,22 @@ void nasal_vm::clear()
|
|||
}
|
||||
void nasal_vm::die(std::string str)
|
||||
{
|
||||
printf(">> [vm] 0x%.8x: %s\n",pc,str.c_str());
|
||||
printf(">> [vm] error: %s\ntrace back:\n",str.c_str());
|
||||
// add error pc into ret_stack
|
||||
ret.push(pc);
|
||||
// trace back will use ret_stack
|
||||
while(!ret.empty())
|
||||
{
|
||||
uint32_t point=ret.top();
|
||||
ret.pop();
|
||||
printf(
|
||||
"\tpc 0x%.8x: %s 0x%.8x (%s line %d)\n",
|
||||
point,
|
||||
code_table[bytecode[point].op].name,
|
||||
bytecode[point].num,
|
||||
files[bytecode[point].fidx].c_str(),
|
||||
bytecode[point].line);
|
||||
}
|
||||
gc.val_stack[STACK_MAX_DEPTH-1]=(nasal_val*)0xffff;
|
||||
return;
|
||||
}
|
||||
|
|
@ -735,7 +756,8 @@ inline void nasal_vm::opr_callfh()
|
|||
inline void nasal_vm::opr_callb()
|
||||
{
|
||||
(++stack_top)[0]=(*builtin_func[imm[pc]].func)(gc.local.back(),gc);
|
||||
gc.val_stack[STACK_MAX_DEPTH-1]=(stack_top[0]?nullptr:(nasal_val*)0xffff);
|
||||
if(!stack_top[0])
|
||||
die("native function error.");
|
||||
return;
|
||||
}
|
||||
inline void nasal_vm::opr_slcbegin()
|
||||
|
|
@ -898,6 +920,8 @@ void nasal_vm::run(std::vector<opcode>& exec)
|
|||
&&slcend, &&slc, &&slc2, &&mcallg,
|
||||
&&mcalll, &&mcallv, &&mcallh, &&ret
|
||||
};
|
||||
|
||||
bytecode=exec;
|
||||
std::vector<void*> code;
|
||||
for(auto& i:exec)
|
||||
{
|
||||
|
|
@ -912,7 +936,7 @@ void nasal_vm::run(std::vector<opcode>& exec)
|
|||
|
||||
nop:
|
||||
if(canary[0] && canary[0]!=(nasal_val*)0xffff)
|
||||
std::cout<<">> [vm] stack overflow.\n";
|
||||
die("stack overflow");
|
||||
std::cout<<">> [vm] process exited after "<<((double)(clock()-begin))/CLOCKS_PER_SEC<<"s.\n";
|
||||
// debug
|
||||
// for(int i=0;i<15;++i)
|
||||
|
|
|
|||
Loading…
Reference in New Issue