From 1b2fae94ebff1aac5bc300eb512f620d0105fc94 Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveTH@foxmail.com>
Date: Fri, 24 May 2024 23:18:36 +0800
Subject: [PATCH] some fix

---
 include/pocketpy/vm.h | 6 ++++--
 src/ceval.cpp         | 2 +-
 src/vm.cpp            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/pocketpy/vm.h b/include/pocketpy/vm.h
index 154416a9..4c29fce1 100644
--- a/include/pocketpy/vm.h
+++ b/include/pocketpy/vm.h
@@ -287,14 +287,16 @@ public:
 
     template<typename... Args>
     PyVar call(PyVar callable, Args&&... args){
-        PUSH(callable); PUSH(PY_NULL);
+        s_data.push(callable);
+        s_data.emplace(PY_NULL);
         __push_varargs(args...);
         return vectorcall(sizeof...(args));
     }
 
     template<typename... Args>
     PyVar call_method(PyVar self, PyVar callable, Args&&... args){
-        PUSH(callable); PUSH(self);
+        s_data.push(callable);
+        s_data.push(self);
         __push_varargs(args...);
         return vectorcall(sizeof...(args));
     }
diff --git a/src/ceval.cpp b/src/ceval.cpp
index 0a167874..952b3a5c 100644
--- a/src/ceval.cpp
+++ b/src/ceval.cpp
@@ -173,7 +173,7 @@ __NEXT_STEP:
         }
         PUSH(obj);
     } DISPATCH()
-    case OP_LOAD_NULL: PUSH(PY_NULL); DISPATCH()
+    case OP_LOAD_NULL: s_data.emplace(PY_NULL); DISPATCH()
     /*****************************************/
     case OP_LOAD_FAST: {
         PyVar _0 = frame->_locals[byte.arg];
diff --git a/src/vm.cpp b/src/vm.cpp
index 22e0e64a..1fcf1608 100644
--- a/src/vm.cpp
+++ b/src/vm.cpp
@@ -1107,7 +1107,7 @@ PyVar VM::vectorcall(int ARGC, int KWARGC, bool op_call){
             obj = vm->new_object<DummyInstance>(PK_OBJ_GET(Type, callable));
         }else{
             PUSH(new_f);
-            PUSH(PY_NULL);
+            s_data.emplace(PY_NULL);
             PUSH(callable);    // cls
             for(PyVar o: args) PUSH(o);
             for(PyVar o: kwargs) PUSH(o);