From 0c081ba91299281b8a8c03ccb35d70c1fc306ee8 Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Mon, 5 Aug 2024 13:52:04 +0800 Subject: [PATCH] fix closure --- include/pocketpy/interpreter/modules.h | 1 + src/interpreter/frame.c | 10 +- src/interpreter/vm.c | 1 + src/modules/dis.c | 127 +++++++++++++++++++++++++ src/public/internal.c | 107 --------------------- 5 files changed, 134 insertions(+), 112 deletions(-) create mode 100644 src/modules/dis.c diff --git a/include/pocketpy/interpreter/modules.h b/include/pocketpy/interpreter/modules.h index b8edfb7b..ac33c008 100644 --- a/include/pocketpy/interpreter/modules.h +++ b/include/pocketpy/interpreter/modules.h @@ -7,6 +7,7 @@ extern "C" { void pk__add_module_pkpy(); void pk__add_module_os(); void pk__add_module_math(); +void pk__add_module_dis(); #ifdef __cplusplus } diff --git a/src/interpreter/frame.c b/src/interpreter/frame.c index 68a5d5a0..5ef8ae86 100644 --- a/src/interpreter/frame.c +++ b/src/interpreter/frame.c @@ -1,4 +1,5 @@ #include "pocketpy/interpreter/frame.h" +#include "pocketpy/objects/codeobject.h" #include "pocketpy/objects/object.h" void ValueStack__ctor(ValueStack* self) { @@ -131,9 +132,8 @@ void Frame__set_unwind_target(Frame* self, py_TValue* sp) { } py_TValue* Frame__f_closure_try_get(Frame* self, py_Name name) { - // if(self->function == NULL) return NULL; - // pkpy::Function* fn = PyObject__as(pkpy::Function, self->function); - // if(fn->_closure == nullptr) return nullptr; - // return NameDict__try_get(fn->_closure, name); - return NULL; + if(self->function == NULL) return NULL; + Function* ud = PyObject__userdata(self->function); + if(ud->closure == NULL) return NULL; + return NameDict__try_get(ud->closure, name); } \ No newline at end of file diff --git a/src/interpreter/vm.c b/src/interpreter/vm.c index 51c43f1e..222e4606 100644 --- a/src/interpreter/vm.c +++ b/src/interpreter/vm.c @@ -180,6 +180,7 @@ void VM__ctor(VM* self) { pk__add_module_pkpy(); pk__add_module_os(); pk__add_module_math(); + pk__add_module_dis(); self->main = *py_newmodule("__main__"); } diff --git a/src/modules/dis.c b/src/modules/dis.c new file mode 100644 index 00000000..527383b6 --- /dev/null +++ b/src/modules/dis.c @@ -0,0 +1,127 @@ +#include "pocketpy/pocketpy.h" + +#include "pocketpy/common/utils.h" +#include "pocketpy/objects/object.h" +#include "pocketpy/common/sstream.h" +#include "pocketpy/interpreter/vm.h" + +static void disassemble(CodeObject* co) { + c11_vector /*T=int*/ jumpTargets; + c11_vector__ctor(&jumpTargets, sizeof(int)); + for(int i = 0; i < co->codes.count; i++) { + Bytecode* bc = c11__at(Bytecode, &co->codes, i); + if(Bytecode__is_forward_jump(bc)) { + int target = (int16_t)bc->arg + i; + c11_vector__push(int, &jumpTargets, target); + } + } + + c11_sbuf ss; + c11_sbuf__ctor(&ss); + + int prev_line = -1; + for(int i = 0; i < co->codes.count; i++) { + Bytecode byte = c11__getitem(Bytecode, &co->codes, i); + BytecodeEx ex = c11__getitem(BytecodeEx, &co->codes_ex, i); + + char line[8] = ""; + if(ex.lineno == prev_line) { + // do nothing + } else { + snprintf(line, sizeof(line), "%d", ex.lineno); + if(prev_line != -1) c11_sbuf__write_char(&ss, '\n'); + prev_line = ex.lineno; + } + + char pointer[4] = ""; + c11__foreach(int, &jumpTargets, it) { + if(*it == i) { + snprintf(pointer, sizeof(pointer), "->"); + break; + } + } + + char buf[32]; + snprintf(buf, sizeof(buf), "%-8s%-3s%-3d ", line, pointer, i); + c11_sbuf__write_cstr(&ss, buf); + + c11_sbuf__write_cstr(&ss, pk_opname(byte.op)); + c11_sbuf__write_char(&ss, ex.is_virtual ? '*' : ' '); + int padding = 24 - strlen(pk_opname(byte.op)); + for(int j = 0; j < padding; j++) + c11_sbuf__write_char(&ss, ' '); + + do { + if(Bytecode__is_forward_jump(&byte)) { + pk_sprintf(&ss, "%d (to %d)", (int16_t)byte.arg, (int16_t)byte.arg + i); + break; + } + + c11_sbuf__write_int(&ss, byte.arg); + switch(byte.op) { + case OP_LOAD_CONST: + case OP_FORMAT_STRING: + case OP_IMPORT_PATH: { + py_Ref path = c11__at(py_TValue, &co->consts, byte.arg); + pk_sprintf(&ss, " (%q)", py_tosv(path)); + break; + } + case OP_LOAD_NAME: + case OP_LOAD_GLOBAL: + case OP_LOAD_NONLOCAL: + case OP_STORE_GLOBAL: + case OP_LOAD_ATTR: + case OP_LOAD_METHOD: + case OP_STORE_ATTR: + case OP_DELETE_ATTR: + case OP_BEGIN_CLASS: + case OP_GOTO: + case OP_DELETE_GLOBAL: + case OP_STORE_CLASS_ATTR: { + pk_sprintf(&ss, " (%n)", byte.arg); + break; + } + case OP_LOAD_FAST: + case OP_STORE_FAST: + case OP_DELETE_FAST: { + py_Name name = c11__getitem(py_Name, &co->varnames, byte.arg); + pk_sprintf(&ss, " (%n)", name); + break; + } + case OP_LOAD_FUNCTION: { + const FuncDecl* decl = c11__getitem(FuncDecl*, &co->func_decls, byte.arg); + pk_sprintf(&ss, " (%s)", decl->code.name->data); + break; + } + case OP_BINARY_OP: { + py_Name name = byte.arg & 0xFF; + pk_sprintf(&ss, " (%n)", name); + break; + } + } + } while(0); + + if(i != co->codes.count - 1) c11_sbuf__write_char(&ss, '\n'); + } + + c11_string* output = c11_sbuf__submit(&ss); + pk_current_vm->print(output->data); + pk_current_vm->print("\n"); + c11_string__delete(output); + c11_vector__dtor(&jumpTargets); +} + +static bool dis_dis(int argc, py_Ref argv) { + PY_CHECK_ARGC(1); + PY_CHECK_ARG_TYPE(0, tp_function); + Function* ud = py_touserdata(argv); + disassemble(&ud->decl->code); + py_newnone(py_retval()); + return true; +} + +void pk__add_module_dis() { + py_Ref mod = py_newmodule("dis"); + + py_bindfunc(mod, "dis", dis_dis); +} \ No newline at end of file diff --git a/src/public/internal.c b/src/public/internal.c index ed669c58..025dc3b5 100644 --- a/src/public/internal.c +++ b/src/public/internal.c @@ -77,112 +77,6 @@ const char* pk_opname(Opcode op) { return OP_NAMES[op]; } -static void disassemble(CodeObject* co) { - c11_vector /*T=int*/ jumpTargets; - c11_vector__ctor(&jumpTargets, sizeof(int)); - for(int i = 0; i < co->codes.count; i++) { - Bytecode* bc = c11__at(Bytecode, &co->codes, i); - if(Bytecode__is_forward_jump(bc)) { - int target = (int16_t)bc->arg + i; - c11_vector__push(int, &jumpTargets, target); - } - } - - c11_sbuf ss; - c11_sbuf__ctor(&ss); - - int prev_line = -1; - for(int i = 0; i < co->codes.count; i++) { - Bytecode byte = c11__getitem(Bytecode, &co->codes, i); - BytecodeEx ex = c11__getitem(BytecodeEx, &co->codes_ex, i); - - char line[8] = ""; - if(ex.lineno == prev_line) { - // do nothing - } else { - snprintf(line, sizeof(line), "%d", ex.lineno); - if(prev_line != -1) c11_sbuf__write_char(&ss, '\n'); - prev_line = ex.lineno; - } - - char pointer[4] = ""; - c11__foreach(int, &jumpTargets, it) { - if(*it == i) { - snprintf(pointer, sizeof(pointer), "->"); - break; - } - } - - char buf[32]; - snprintf(buf, sizeof(buf), "%-8s%-3s%-3d ", line, pointer, i); - c11_sbuf__write_cstr(&ss, buf); - - c11_sbuf__write_cstr(&ss, pk_opname(byte.op)); - c11_sbuf__write_char(&ss, ex.is_virtual ? '*' : ' '); - int padding = 24 - strlen(pk_opname(byte.op)); - for(int j = 0; j < padding; j++) - c11_sbuf__write_char(&ss, ' '); - - do { - if(Bytecode__is_forward_jump(&byte)) { - pk_sprintf(&ss, "%d (to %d)", (int16_t)byte.arg, (int16_t)byte.arg + i); - break; - } - - c11_sbuf__write_int(&ss, byte.arg); - switch(byte.op) { - case OP_LOAD_CONST: - case OP_FORMAT_STRING: - case OP_IMPORT_PATH: { - py_Ref path = c11__at(py_TValue, &co->consts, byte.arg); - pk_sprintf(&ss, " (%q)", py_tosv(path)); - break; - } - case OP_LOAD_NAME: - case OP_LOAD_GLOBAL: - case OP_LOAD_NONLOCAL: - case OP_STORE_GLOBAL: - case OP_LOAD_ATTR: - case OP_LOAD_METHOD: - case OP_STORE_ATTR: - case OP_DELETE_ATTR: - case OP_BEGIN_CLASS: - case OP_GOTO: - case OP_DELETE_GLOBAL: - case OP_STORE_CLASS_ATTR: { - pk_sprintf(&ss, " (%n)", byte.arg); - break; - } - case OP_LOAD_FAST: - case OP_STORE_FAST: - case OP_DELETE_FAST: { - py_Name name = c11__getitem(py_Name, &co->varnames, byte.arg); - pk_sprintf(&ss, " (%n)", name); - break; - } - case OP_LOAD_FUNCTION: { - const FuncDecl* decl = c11__getitem(FuncDecl*, &co->func_decls, byte.arg); - pk_sprintf(&ss, " (%s)", decl->code.name->data); - break; - } - case OP_BINARY_OP: { - py_Name name = byte.arg & 0xFF; - pk_sprintf(&ss, " (%n)", name); - break; - } - } - } while(0); - - if(i != co->codes.count - 1) c11_sbuf__write_char(&ss, '\n'); - } - - c11_string* output = c11_sbuf__submit(&ss); - pk_current_vm->print(output->data); - pk_current_vm->print("\n"); - c11_string__delete(output); - c11_vector__dtor(&jumpTargets); -} - bool py_exec(const char* source, const char* filename, enum py_CompileMode mode, py_Ref module) { VM* vm = pk_current_vm; CodeObject co; @@ -197,7 +91,6 @@ bool py_exec(const char* source, const char* filename, enum py_CompileMode mode, return false; } - // disassemble(&co); if(!module) module = &vm->main; Frame* frame = Frame__new(&co, module, NULL, vm->stack.sp, vm->stack.sp, &co);