Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-15 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

restore multi queue

Browse Source
This commit is contained in:
lyon1998 2022-03-29 16:42:39 +08:00
parent 53c5535c12
commit 7c48496fdb
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/PikaVM.c
View File

@ -204,11 +204,7 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self, VMState* vs, char* data) {
char* sys_out;
Arg* call_arg = NULL;
uint8_t call_arg_index = 0;
uint8_t call_arg_num = 0;
ByteCodeFrame* method_bytecodeFrame;
InstructUnit *this_ins, *super_ins;
this_ins = VMState_getInstructNow(vs);
uint8_t this_invoke_deepth = instructUnit_getInvokeDeepth(this_ins);
/* return arg directly */
if (strEqu(data, "")) {
return_arg = queue_popArg_notDeinitArg(vs->qSuper);
@ -258,29 +254,17 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self, VMState* vs, char* data) {
sub_locals = New_PikaObj();
/* load pars */
super_ins = this_ins;
while (1) {
super_ins--;
if (instructUnit_getInvokeDeepth(super_ins) !=
(this_invoke_deepth + 1)) {
break;
}
if (instructUnit_getIsNewLine(super_ins)) {
break;
}
call_arg_num++;
}
if (method_type == ARG_TYPE_OBJECT_METHOD) {
call_arg_num++;
}
for (uint8_t i = 0; i < call_arg_num; i++) {
/* load 'self' as the first arg when call object method */
if ((method_type == ARG_TYPE_OBJECT_METHOD) && (call_arg_index == 0)) {
call_arg = arg_setPtr(NULL, "", ARG_TYPE_POINTER, method_host_obj);
} else {
call_arg = queue_popArg_notDeinitArg(vs->qSuper);
}
/* exit when there is no arg in queue */
if (NULL == call_arg) {
break;
}
char* argDef = strsPopToken(&buffs, type_list, ',');
char* argName = strsGetFirstToken(&buffs, argDef, ':');
call_arg = arg_setName(call_arg, argName);
@ -760,23 +744,22 @@ static int pikaVM_runInstructUnit(PikaObj* self,
__clearInvokeQueues(vs->locals);
}
invode_deepth0_str[0] = '0';
// invode_deepth1_str[0] = invode_deepth0_str[0] + 1;
invode_deepth0_str[0] = instructUnit_getInvokeDeepth(ins_unit) + '0';
invode_deepth1_str[0] = invode_deepth0_str[0] + 1;
char* data = VMState_getConstWithInstructUnit(vs, ins_unit);
vs->qThis = args_getPtr(vs->locals->list, invode_deepth0_str);
// vs->qSuper = args_getPtr(vs->locals->list, "0");
vs->qSuper = args_getPtr(vs->locals->list, invode_deepth1_str);
if (NULL == vs->qThis) {
vs->qThis = New_queue();
args_setPtr(vs->locals->list, invode_deepth0_str, vs->qThis);
}
// if (NULL == vs->qSuper) {
// vs->qSuper = New_queue();
// args_setPtr(vs->locals->list, invode_deepth1_str, vs->qSuper);
// }
vs->qSuper = vs->qThis;
if (NULL == vs->qSuper) {
vs->qSuper = New_queue();
args_setPtr(vs->locals->list, invode_deepth1_str, vs->qSuper);
}
/* run instruct */
resArg = VM_instruct_handler_table[instruct](self, vs, data);
if (NULL != resArg) {