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

supporting no const bytecode

Browse Source
This commit is contained in:
pikastech 2022-11-15 22:16:52 +08:00
parent 9418eceb9e
commit 157638a4f1
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/PikaVM.c
View File

@ -414,7 +414,7 @@ Arg* __vm_get(VMState* vm, PikaObj* self, Arg* key, Arg* obj) {
}; };
if (NULL != vm) { if (NULL != vm) {
_do_pikaVM_runByteCode(arg_obj, arg_obj, arg_obj, (uint8_t*)bytes, _do_pikaVM_runByteCode(arg_obj, arg_obj, arg_obj, (uint8_t*)bytes,
vm->run_state); vm->run_state, PIKA_TRUE);
} else { } else {
pikaVM_runByteCode(arg_obj, (uint8_t*)bytes); pikaVM_runByteCode(arg_obj, (uint8_t*)bytes);
} }
@ -2808,11 +2808,11 @@ VMParameters* _do_pikaVM_runByteCode(PikaObj* self,
VMParameters* locals, VMParameters* locals,
VMParameters* globals, VMParameters* globals,
uint8_t* bytecode, uint8_t* bytecode,
RunState* run_state) { RunState* run_state,
PIKA_BOOL is_const_bytecode) {
ByteCodeFrame bytecode_frame_stack = {0}; ByteCodeFrame bytecode_frame_stack = {0};
ByteCodeFrame* bytecode_frame_p = NULL; ByteCodeFrame* bytecode_frame_p = NULL;
uint8_t is_use_heap_bytecode = 1; uint8_t is_use_heap_bytecode = 1;
/* /*
* the first obj_run, cache bytecode to heap, to support 'def' and * the first obj_run, cache bytecode to heap, to support 'def' and
* 'class' * 'class'
@ -2825,11 +2825,14 @@ VMParameters* _do_pikaVM_runByteCode(PikaObj* self,
is_use_heap_bytecode = 0; is_use_heap_bytecode = 0;
/* get bytecode_ptr from stack */ /* get bytecode_ptr from stack */
bytecode_frame_p = &bytecode_frame_stack; bytecode_frame_p = &bytecode_frame_stack;
/* no def/class ins, no need cache bytecode */
is_const_bytecode = 1;
} }
/* load or generate byte code frame */ /* load or generate byte code frame */
/* load bytecode */ /* load bytecode */
byteCodeFrame_loadByteCode(bytecode_frame_p, bytecode); _do_byteCodeFrame_loadByteCode(bytecode_frame_p, bytecode,
is_const_bytecode);
/* run byteCode */ /* run byteCode */
@ -2862,10 +2865,18 @@ VMParameters* pikaVM_run(PikaObj* self, char* py_lines) {
return __pikaVM_runPyLines(self, py_lines); return __pikaVM_runPyLines(self, py_lines);
} }
VMParameters* pikaVM_runByteCode(PikaObj* self, uint8_t* bytecode) { VMParameters* pikaVM_runByteCode(PikaObj* self, const uint8_t* bytecode) {
RunState run_state = {.try_state = TRY_STATE_NONE, RunState run_state = {.try_state = TRY_STATE_NONE,
.try_result = TRY_RESULT_NONE}; .try_result = TRY_RESULT_NONE};
return _do_pikaVM_runByteCode(self, self, self, bytecode, &run_state); return _do_pikaVM_runByteCode(self, self, self, (uint8_t*)bytecode,
&run_state, PIKA_TRUE);
}
VMParameters* pikaVM_runByteCodeInconstant(PikaObj* self, uint8_t* bytecode) {
RunState run_state = {.try_state = TRY_STATE_NONE,
.try_result = TRY_RESULT_NONE};
return _do_pikaVM_runByteCode(self, self, self, (uint8_t*)bytecode,
&run_state, PIKA_FALSE);
} }
void constPool_update(ConstPool* self) { void constPool_update(ConstPool* self) {
@ -2971,7 +2982,9 @@ void byteCodeFrame_init(ByteCodeFrame* self) {
} }
extern const char magic_code_pyo[4]; extern const char magic_code_pyo[4];
void byteCodeFrame_loadByteCode(ByteCodeFrame* self, uint8_t* bytes) { void _do_byteCodeFrame_loadByteCode(ByteCodeFrame* self,
uint8_t* bytes,
PIKA_BOOL is_const) {
if (bytes[0] == magic_code_pyo[0] && bytes[1] == magic_code_pyo[1] && if (bytes[0] == magic_code_pyo[0] && bytes[1] == magic_code_pyo[1] &&
bytes[2] == magic_code_pyo[2] && bytes[3] == magic_code_pyo[3]) { bytes[2] == magic_code_pyo[2] && bytes[3] == magic_code_pyo[3]) {
/* load from file, found magic code, skip head */ /* load from file, found magic code, skip head */
@ -2986,6 +2999,23 @@ void byteCodeFrame_loadByteCode(ByteCodeFrame* self, uint8_t* bytes) {
self->const_pool.size = *const_size_p; self->const_pool.size = *const_size_p;
self->const_pool.content_start = self->const_pool.content_start =
(char*)((uintptr_t)const_size_p + sizeof(*const_size_p)); (char*)((uintptr_t)const_size_p + sizeof(*const_size_p));
if (!is_const) {
if (NULL != self->instruct_array.arg_buff) {
arg_deinit(self->instruct_array.arg_buff);
}
if (NULL != self->instruct_array.arg_buff) {
arg_deinit(self->const_pool.arg_buff);
}
}
}
static void byteCodeFrame_loadByteCodeInconst(ByteCodeFrame* self,
uint8_t* bytes) {
_do_byteCodeFrame_loadByteCode(self, bytes, PIKA_FALSE);
}
void byteCodeFrame_loadByteCode(ByteCodeFrame* self, uint8_t* bytes) {
_do_byteCodeFrame_loadByteCode(self, bytes, PIKA_TRUE);
} }
void byteCodeFrame_deinit(ByteCodeFrame* self) { void byteCodeFrame_deinit(ByteCodeFrame* self) {

9
src/PikaVM.h
View File

@ -254,7 +254,8 @@ void instructArray_printAsArray(InstructArray* self);
void byteCodeFrame_loadByteCode(ByteCodeFrame* self, uint8_t* bytes); void byteCodeFrame_loadByteCode(ByteCodeFrame* self, uint8_t* bytes);
void byteCodeFrame_printAsArray(ByteCodeFrame* self); void byteCodeFrame_printAsArray(ByteCodeFrame* self);
void byteCodeFrame_init(ByteCodeFrame* self); void byteCodeFrame_init(ByteCodeFrame* self);
VMParameters* pikaVM_runByteCode(PikaObj* self, uint8_t* bytecode); VMParameters* pikaVM_runByteCode(PikaObj* self, const uint8_t* bytecode);
VMParameters* pikaVM_runByteCodeInconstant(PikaObj* self, uint8_t* bytecode);
InstructUnit* instructArray_getNow(InstructArray* self); InstructUnit* instructArray_getNow(InstructArray* self);
InstructUnit* instructArray_getNext(InstructArray* self); InstructUnit* instructArray_getNext(InstructArray* self);
VMParameters* pikaVM_runSingleFile(PikaObj* self, char* filename); VMParameters* pikaVM_runSingleFile(PikaObj* self, char* filename);
@ -270,7 +271,11 @@ VMParameters* _do_pikaVM_runByteCode(PikaObj* self,
VMParameters* locals, VMParameters* locals,
VMParameters* globals, VMParameters* globals,
uint8_t* bytecode, uint8_t* bytecode,
RunState* run_state); RunState* run_state,
PIKA_BOOL is_const_bytecode);
void _do_byteCodeFrame_loadByteCode(ByteCodeFrame* self,
uint8_t* bytes,
PIKA_BOOL is_const);
Arg* __vm_get(VMState* vm, PikaObj* self, Arg* key, Arg* obj); Arg* __vm_get(VMState* vm, PikaObj* self, Arg* key, Arg* obj);
void __vm_List_append(PikaObj* self, Arg* arg); void __vm_List_append(PikaObj* self, Arg* arg);
void __vm_List___init__(PikaObj* self); void __vm_List___init__(PikaObj* self);