fix a bug

This commit is contained in:
blueloveTH 2023-04-15 18:18:02 +08:00
parent ee0489b8d6
commit 37db7bc29b
6 changed files with 12 additions and 7 deletions

View File

@ -63,6 +63,9 @@ goto *OP_LABELS[byte.op];
__NEXT_STEP:; __NEXT_STEP:;
#if DEBUG_CEVAL_STEP #if DEBUG_CEVAL_STEP
std::cout << frame->stack_info() << " " << OP_NAMES[byte.op] << std::endl; std::cout << frame->stack_info() << " " << OP_NAMES[byte.op] << std::endl;
#endif
#if DEBUG_CEVAL_STEP_MIN
std::cout << OP_NAMES[byte.op] << std::endl;
#endif #endif
switch (byte.op) switch (byte.op)
{ {
@ -213,14 +216,14 @@ __NEXT_STEP:;
} DISPATCH(); } DISPATCH();
TARGET(BUILD_DICT) { TARGET(BUILD_DICT) {
PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple()); PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple());
STACK_SHRINK(byte.arg);
PyObject* obj = call(builtins->attr(m_dict), Args{t}); PyObject* obj = call(builtins->attr(m_dict), Args{t});
STACK_SHRINK(byte.arg);
PUSH(obj); PUSH(obj);
} DISPATCH(); } DISPATCH();
TARGET(BUILD_SET) { TARGET(BUILD_SET) {
PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple()); PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple());
STACK_SHRINK(byte.arg);
PyObject* obj = call(builtins->attr(m_set), Args{t}); PyObject* obj = call(builtins->attr(m_set), Args{t});
STACK_SHRINK(byte.arg);
PUSH(obj); PUSH(obj);
} DISPATCH(); } DISPATCH();
TARGET(BUILD_SLICE) { TARGET(BUILD_SLICE) {

View File

@ -36,6 +36,7 @@
#define DEBUG_EXTRA_CHECK 0 #define DEBUG_EXTRA_CHECK 0
#define DEBUG_DIS_EXEC 0 #define DEBUG_DIS_EXEC 0
#define DEBUG_CEVAL_STEP 0 #define DEBUG_CEVAL_STEP 0
#define DEBUG_CEVAL_STEP_MIN 0
#define DEBUG_FULL_EXCEPTION 0 #define DEBUG_FULL_EXCEPTION 0
#define DEBUG_MEMORY_POOL 0 #define DEBUG_MEMORY_POOL 0
#define DEBUG_NO_MEMORY_POOL 0 #define DEBUG_NO_MEMORY_POOL 0

View File

@ -619,8 +619,7 @@ struct CallExpr: Expr{
void emit(CodeEmitContext* ctx) override { void emit(CodeEmitContext* ctx) override {
VM* vm = ctx->vm; VM* vm = ctx->vm;
// TODO: if callable is a AttrExpr, we should try to use `fast_call` // if callable is a AttrExpr, we should try to use `fast_call` instead of use `boundmethod` proxy
// instead of use `boundmethod` proxy
if(callable->is_attrib()){ if(callable->is_attrib()){
auto p = static_cast<AttribExpr*>(callable.get()); auto p = static_cast<AttribExpr*>(callable.get());
p->emit_method(ctx); p->emit_method(ctx);

View File

@ -254,7 +254,7 @@ struct Frame {
void _gc_mark() const { void _gc_mark() const {
// do return if this frame has been moved // do return if this frame has been moved
if(!_locals.is_valid()) return; if(_s.data() == nullptr) return;
for(PyObject* obj: _s) OBJ_MARK(obj); for(PyObject* obj: _s) OBJ_MARK(obj);
OBJ_MARK(_module); OBJ_MARK(_module);
_locals._gc_mark(); _locals._gc_mark();

View File

@ -752,7 +752,7 @@ inline PyObject* VM::call(PyObject* callable, Args args, const Args& kwargs, boo
} }
if(is_type(callable, tp_type)){ if(is_type(callable, tp_type)){
// TODO: use get_unbound_method here // TODO: derived __new__ ?
PyObject* new_f = callable->attr().try_get(__new__); PyObject* new_f = callable->attr().try_get(__new__);
PyObject* obj; PyObject* obj;
if(new_f != nullptr){ if(new_f != nullptr){

File diff suppressed because one or more lines are too long