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 void* in instructArray_getStart to correct offset

Browse Source
This commit is contained in:
lyon1998 2022-03-17 12:37:07 +08:00
parent 8c54801fd9
commit 0aab33f2b1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PikaObj.h
View File

@ -54,12 +54,14 @@ typedef struct ConstPool_t {
Arg* arg_buff;
uint16_t content_offset_now;
uint16_t size;
void* _;
} ConstPool;
typedef struct InstructArray_t {
Arg* arg_buff;
uint16_t content_offset_now;
uint16_t size;
void* _;
} InstructArray;
typedef struct ByteCodeFrame_t {

19
src/PikaVM.c
View File

@ -823,12 +823,11 @@ exit:
return globals;
}
char* constPool_getStart(ConstPool* self) {
return (char*)arg_getContent(self->arg_buff);
static void* constPool_getStart(ConstPool* self) {
return (void*)arg_getContent(self->arg_buff);
}
void constPool_update(ConstPool *self){
}
void constPool_update(ConstPool* self) {}
void constPool_init(ConstPool* self) {
self->arg_buff = arg_setStr(NULL, "", "");
@ -945,8 +944,8 @@ void instructUnit_init(InstructUnit* ins_unit) {
ins_unit->isNewLine_instruct = 0;
}
static InstructUnit* instructArray_getStart(InstructArray* self) {
return (InstructUnit*)(arg_getContent(self->arg_buff));
static void* instructArray_getStart(InstructArray* self) {
return (void*)(arg_getContent(self->arg_buff));
}
static InstructUnit* instructArray_getNow(InstructArray* self) {
@ -954,7 +953,8 @@ static InstructUnit* instructArray_getNow(InstructArray* self) {
/* is the end */
return NULL;
}
return instructArray_getStart(self) + (uintptr_t)(self->content_offset_now);
return (InstructUnit*)(instructArray_getStart(self) +
(uintptr_t)(self->content_offset_now));
}
static InstructUnit* instructArray_getNext(InstructArray* self) {
@ -1078,10 +1078,9 @@ VMParameters* pikaVM_runByteCodeFrame(PikaObj* self,
}
char* constPool_getByOffset(ConstPool* self, uint16_t offset) {
return (char*)((void*)constPool_getStart(self) + (uintptr_t)offset);
return (char*)(constPool_getStart(self) + (uintptr_t)offset);
}
InstructUnit* instructArray_getByOffset(InstructArray* self, int32_t offset) {
return (InstructUnit*)((void*)instructArray_getStart(self) +
(uintptr_t)offset);
return (InstructUnit*)(instructArray_getStart(self) + (uintptr_t)offset);
}