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

use pc in intruct runner

Browse Source
This commit is contained in:
pikasTech 2021-10-29 16:30:05 +08:00
parent 6a67c819a2
commit ec7232703d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/PikaVM.c
View File

@ -100,6 +100,7 @@ Arg* pikaVM_runAsmInstruct(PikaObj* self,
Queue* invokeQuene0, Queue* invokeQuene0,
Queue* invokeQuene1, Queue* invokeQuene1,
int32_t* jmp, int32_t* jmp,
char* programConter,
Args* sysRes) { Args* sysRes) {
if (instruct == NUM) { if (instruct == NUM) {
Arg* numArg = New_arg(NULL); Arg* numArg = New_arg(NULL);
@ -147,7 +148,7 @@ Arg* pikaVM_runAsmInstruct(PikaObj* self,
return NULL; return NULL;
} }
if (instruct == DEF) { if (instruct == DEF) {
class_defineMethod(self, data, NULL); class_defineMethod(self, data, programConter);
return NULL; return NULL;
} }
if (instruct == JEZ) { if (instruct == JEZ) {
@ -481,8 +482,8 @@ int32_t pikaVM_runAsmLineWithArgs(PikaObj* self,
int32_t lineAddr, int32_t lineAddr,
Args* sysRes) { Args* sysRes) {
Args* buffs = New_strBuff(); Args* buffs = New_strBuff();
char* code = pikaAsm + lineAddr; char* programCounter = pikaAsm + lineAddr;
char* line = strs_getLine(buffs, code); char* line = strs_getLine(buffs, programCounter);
int32_t nextAddr = lineAddr + strGetSize(line) + 1; int32_t nextAddr = lineAddr + strGetSize(line) + 1;
int32_t jmp = 0; int32_t jmp = 0;
/* Found new script Line, clear the queues*/ /* Found new script Line, clear the queues*/
@ -513,7 +514,7 @@ int32_t pikaVM_runAsmLineWithArgs(PikaObj* self,
Arg* resArg = Arg* resArg =
pikaVM_runAsmInstruct(self, localArgs, instruct, data, invokeQuene0, pikaVM_runAsmInstruct(self, localArgs, instruct, data, invokeQuene0,
invokeQuene1, &jmp, sysRes); invokeQuene1, &jmp, programCounter, sysRes);
if (NULL != resArg) { if (NULL != resArg) {
queue_pushArg(invokeQuene0, resArg); queue_pushArg(invokeQuene0, resArg);
} }
@ -525,7 +526,7 @@ nextLine:
return -99999; return -99999;
} }
if (jmp != 0) { if (jmp != 0) {
return lineAddr + getAddrOffsetFromJmp(pikaAsm, code, jmp); return lineAddr + getAddrOffsetFromJmp(pikaAsm, programCounter, jmp);
} }
return nextAddr; return nextAddr;
} }