support pks_vm_exit()

pikasTech · pikasTech · commit 8acef2efde34 · 2022-09-14T13:46:19.000+08:00
diff --git a/package/PikaStdLib/PikaStdLib.pyi b/package/PikaStdLib/PikaStdLib.pyi
@@ -1,5 +1,6 @@
 from PikaObj import *
 
+
 class MemChecker:
     def max(self): ...
     def now(self): ...
@@ -102,6 +103,10 @@ class SysObj:
     @PIKA_C_MACRO_IF("!PIKA_NANO_ENABLE")
     def setattr(obj: object, name: str, val: any): ...
 
+    @staticmethod
+    @PIKA_C_MACRO_IF("!PIKA_NANO_ENABLE")
+    def exit(): ...
+
 
 @PIKA_C_MACRO_IF("0")
 class RangeObj:
@@ -111,4 +116,3 @@ class RangeObj:
 @PIKA_C_MACRO_IF("0")
 class StringObj:
     def __next__(self) -> any: ...
-
diff --git a/package/PikaStdLib/PikaStdLib_SysObj.c b/package/PikaStdLib/PikaStdLib_SysObj.c
@@ -538,3 +538,7 @@ void PikaStdLib_SysObj_setattr(PikaObj* self,
 exit:
     return;
 }
+
+void PikaStdLib_SysObj_exit(PikaObj *self){
+    pks_vm_exit();
+}
diff --git a/port/linux/package/pikascript/PikaStdLib.pyi b/port/linux/package/pikascript/PikaStdLib.pyi
@@ -1,5 +1,6 @@
 from PikaObj import *
 
+
 class MemChecker:
     def max(self): ...
     def now(self): ...
@@ -102,6 +103,10 @@ class SysObj:
     @PIKA_C_MACRO_IF("!PIKA_NANO_ENABLE")
     def setattr(obj: object, name: str, val: any): ...
 
+    @staticmethod
+    @PIKA_C_MACRO_IF("!PIKA_NANO_ENABLE")
+    def exit(): ...
+
 
 @PIKA_C_MACRO_IF("0")
 class RangeObj:
@@ -111,4 +116,3 @@ class RangeObj:
 @PIKA_C_MACRO_IF("0")
 class StringObj:
     def __next__(self) -> any: ...
-
diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c
@@ -538,3 +538,7 @@ void PikaStdLib_SysObj_setattr(PikaObj* self,
 exit:
     return;
 }
+
+void PikaStdLib_SysObj_exit(PikaObj *self){
+    pks_vm_exit();
+}
diff --git a/port/linux/test/VM-test.cpp b/port/linux/test/VM-test.cpp
@@ -1612,3 +1612,57 @@ TEST(vm, test64) {
     obj_deinit(pikaMain);
     EXPECT_EQ(pikaMemNow(), 0);
 }
+
+#if !PIKA_NANO_ENABLE
+TEST(vm, exit) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "i = 0\n"
+            "while True:\n"
+            "    i += 1\n"
+            "    print(i)\n"
+            "    if i == 10:\n"
+            "        exit()\n");
+    /* collect */
+    int i = obj_getInt(pikaMain, "i");
+    /* assert */
+    EXPECT_EQ(i, 10);
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(vm, exit_fn) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "i = 0\n"
+            "def test():\n"
+            "    global i\n"
+            "    while True:\n"
+            "        i += 1\n"
+            "        print(i)\n"
+            "        if i == 10:\n"
+            "            exit()\n"
+            "while True:\n"
+            "    test()\n");
+    /* collect */
+    int i = obj_getInt(pikaMain, "i");
+    /* assert */
+    EXPECT_EQ(i, 10);
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+#endif
diff --git a/src/PikaVM.c b/src/PikaVM.c
@@ -36,6 +36,23 @@
 #include <math.h>
 #endif
 
+static volatile VMSignal PikaVMSignal = {
+    .signal_ctrl = VM_SIGNAL_CTRL_NONE,
+    .vm_cnt = 0,
+};
+
+VM_SIGNAL_CTRL VMSignal_getCtrl(void) {
+    return PikaVMSignal.signal_ctrl;
+}
+
+void pks_vm_exit(void) {
+    PikaVMSignal.signal_ctrl = VM_SIGNAL_CTRL_EXIT;
+}
+
+void pks_vmSignal_setCtrlElear(void) {
+    PikaVMSignal.signal_ctrl = VM_SIGNAL_CTRL_NONE;
+}
+
 /* head declare start */
 static uint8_t VMState_getInputArgNum(VMState* vm);
 static VMParameters* __pikaVM_runByteCodeFrameWithState(
@@ -1009,35 +1026,35 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self,
         goto exit;
     }
 
-    #if !PIKA_NANO_ENABLE
+#if !PIKA_NANO_ENABLE
     /* support for super() */
     if (strEqu(run_path, "super")) {
         run_path = _find_super_class_name(vm);
         vm->in_super = 1;
         skip_init = 1;
     }
-    #endif
+#endif
 
     /* return tiny obj */
     if (strEqu(run_path, "TinyObj")) {
         return_arg = arg_newMetaObj(New_TinyObj);
         goto exit;
     }
 
-    #if !PIKA_NANO_ENABLE
+#if !PIKA_NANO_ENABLE
     if (!skip_init && vm->in_super) {
         vm->in_super = PIKA_FALSE;
         obj_this = obj_getPtr(vm->locals, _find_self_name(vm));
     }
-    #endif
+#endif
 
     /* get method host obj from reg */
     if (NULL == method_host && _checkLReg(run_path)) {
         uint8_t reg_index = _getLRegIndex(run_path);
         method_host = vm->lreg[reg_index];
     }
 
-    #if !PIKA_NANO_ENABLE
+#if !PIKA_NANO_ENABLE
     /* get method host obj from stack */
     if (NULL == method_host && run_path[0] == '.') {
         /* get method host obj from stack */
@@ -1063,7 +1080,7 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self,
             stack_pushArg(&(vm->stack), stack_tmp[i]);
         }
     }
-    #endif
+#endif
 
     /* get method host obj from self */
     if (NULL == method_host) {
@@ -1978,9 +1995,9 @@ static Arg* VM_instruction_handler_RIS(PikaObj* self,
                                        VMState* vm,
                                        char* data,
                                        Arg* arg_ret_reg) {
-    #if PIKA_NANO_ENABLE
+#if PIKA_NANO_ENABLE
     return NULL;
-    #endif
+#endif
     Arg* err_arg = stack_popArg_alloc(&(vm->stack));
     PIKA_RES err = (PIKA_RES)arg_getInt(err_arg);
     VMState_setErrorCode(vm, err);
@@ -1992,9 +2009,9 @@ static Arg* VM_instruction_handler_ASS(PikaObj* self,
                                        VMState* vm,
                                        char* data,
                                        Arg* arg_ret_reg) {
-    #if PIKA_NANO_ENABLE
+#if PIKA_NANO_ENABLE
     return NULL;
-    #endif
+#endif
     arg_newReg(reg1, PIKA_ARG_BUFF_SIZE);
     arg_newReg(reg2, PIKA_ARG_BUFF_SIZE);
     Arg* arg1 = NULL;
@@ -2169,7 +2186,7 @@ static int pikaVM_runInstructUnit(PikaObj* self,
         /* raise jmp */
         if (vm->run_state->try_state == TRY_STATE_INNER) {
             vm->jmp = VM_JMP_RAISE;
-        }else{
+        } else {
             /* exit */
             vm->jmp = VM_JMP_EXIT;
         }
@@ -2195,8 +2212,8 @@ static int pikaVM_runInstructUnit(PikaObj* self,
         pc_next = vm->pc + VMState_getAddrOffsetOfContinue(vm);
         goto exit;
     }
-    /* raise */
-    #if !PIKA_NANO_ENABLE
+/* raise */
+#if !PIKA_NANO_ENABLE
     if (VM_JMP_RAISE == vm->jmp) {
         int offset = VMState_getAddrOffsetOfRaise(vm);
         if (0 == offset) {
@@ -2208,7 +2225,7 @@ static int pikaVM_runInstructUnit(PikaObj* self,
         pc_next = vm->pc + offset;
         goto exit;
     }
-    #endif
+#endif
     /* static jmp */
     if (vm->jmp != 0) {
         pc_next = vm->pc + VMState_getAddrOffsetFromJmp(vm);
@@ -2668,7 +2685,14 @@ static VMParameters* __pikaVM_runByteCodeFrameWithState(
     };
     stack_init(&(vm.stack));
     VMState_initReg(&vm);
+    if (PikaVMSignal.vm_cnt == 0) {
+        pks_vmSignal_setCtrlElear();
+    }
+    PikaVMSignal.vm_cnt++;
     while (vm.pc < size) {
+        if (VMSignal_getCtrl() == VM_SIGNAL_CTRL_EXIT) {
+            vm.pc = VM_PC_EXIT;
+        }
         if (vm.pc == VM_PC_EXIT) {
             break;
         }
@@ -2721,6 +2745,7 @@ static VMParameters* __pikaVM_runByteCodeFrameWithState(
     }
     VMState_solveUnusedStack(&vm);
     stack_deinit(&(vm.stack));
+    PikaVMSignal.vm_cnt--;
     return locals;
 }
 
diff --git a/src/PikaVM.h b/src/PikaVM.h
@@ -98,6 +98,17 @@ struct OperatorInfo {
     VMState* vm;
 };
 
+typedef enum VM_SIGNAL_CTRL {
+    VM_SIGNAL_CTRL_NONE = 0,
+    VM_SIGNAL_CTRL_EXIT,
+} VM_SIGNAL_CTRL;
+
+typedef struct VMSignal VMSignal;
+struct VMSignal {
+    VM_SIGNAL_CTRL signal_ctrl;
+    int vm_cnt;
+};
+
 VMParameters* pikaVM_run(PikaObj* self, char* pyLine);
 VMParameters* pikaVM_runAsm(PikaObj* self, char* pikaAsm);
 VMParameters* pikaVM_runByteCodeFrame(PikaObj* self,
@@ -193,5 +204,8 @@ void __vm_List_append(PikaObj* self, Arg* arg);
 void __vm_List___init__(PikaObj* self);
 void __vm_Dict_set(PikaObj* self, Arg* arg, char* key);
 void __vm_Dict___init__(PikaObj* self);
+VM_SIGNAL_CTRL VMSignal_getCtrl(void);
+void pks_vm_exit(void);
+void pks_vmSignal_setCtrlElear(void);
 
 #endif
diff --git a/src/dataMemory.c b/src/dataMemory.c
@@ -29,7 +29,7 @@
 #include "dataMemory.h"
 #include "PikaPlatform.h"
 
-PikaMemInfo pikaMemInfo = {0};
+volatile PikaMemInfo pikaMemInfo = {0};
 
 void* pikaMalloc(uint32_t size) {
     /* pika memory lock */

Original file line number	Diff line number	Diff line change
`@@ -538,3 +538,7 @@ void PikaStdLib_SysObj_setattr(PikaObj* self,`
`538`	`538`	`exit:`
`539`	`539`	`return;`
`540`	`540`	`}`
	`541`	`+`
	`542`	`+void PikaStdLib_SysObj_exit(PikaObj *self){`
	`543`	`+ pks_vm_exit();`
	`544`	`+}`