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

use uintptr_t instead of long

Browse Source
This commit is contained in:
lyon 2021-12-30 16:29:12 +08:00
parent cd71944770
commit 084da065e5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PikaObj.c
View File

@ -425,7 +425,7 @@ void* methodArg_getPtr(Arg* method_arg) {
char* methodArg_getDec(Arg* method_arg) {
uint32_t size_ptr = sizeof(void*);
void* info = arg_getContent(method_arg);
return (char*)((long)info + size_ptr);
return (char*)((uintptr_t)info + size_ptr);
}
void obj_saveMethodInfo(PikaObj* self,
@ -441,7 +441,7 @@ void obj_saveMethodInfo(PikaObj* self,
void* info = args_getBuff(buffs, size_info);
__platform_memcpy(info, &method_ptr, size_ptr);
/* +1 to add \0 */
__platform_memcpy((void*)((long)info + size_ptr), pars, size_pars + 1);
__platform_memcpy((void*)((uintptr_t)info + size_ptr), pars, size_pars + 1);
arg = arg_setName(arg, method_name);
arg = arg_setType(arg, TYPE_METHOD);
arg = arg_setContent(arg, info, size_info);

10
src/dataArg.c
View File

@ -54,7 +54,7 @@ uint16_t content_getSize(uint8_t* self) {
void content_setNext(uint8_t* self, uint8_t* next) {
uint8_t* nextDir = self + content_nextOffset(self);
uint64_t pointerTemp = (long)next;
uint64_t pointerTemp = (uintptr_t)next;
for (uint32_t i = 0; i < sizeof(uint8_t*); i++) {
// aboid \0
nextDir[i] = pointerTemp;
@ -101,7 +101,7 @@ uint8_t* content_init_hash(Hash nameHash,
__platform_memset(contentDir, 0, size);
}
uint64_t pointerTemp = (long)next;
uint64_t pointerTemp = (uintptr_t)next;
for (uint32_t i = 0; i < sizeof(uint8_t*); i++) {
// aboid \0
nextDir[i] = pointerTemp;
@ -258,7 +258,7 @@ uint8_t* content_getNext(uint8_t* self) {
pointerTemp = (pointerTemp << 8);
pointerTemp += val;
}
next = (uint8_t*)(long)pointerTemp;
next = (uint8_t*)(uintptr_t)pointerTemp;
return next;
}
@ -310,7 +310,7 @@ float arg_getFloat(Arg* self) {
}
Arg* arg_setPtr(Arg* self, char* name, ArgType type, void* pointer) {
uint64_t pointerTemp = (long)pointer;
uint64_t pointerTemp = (uintptr_t)pointer;
uint8_t contentBuff[8];
for (uint32_t i = 0; i < sizeof(uint8_t*); i++) {
// aboid \0
@ -351,7 +351,7 @@ void* arg_getPtr(Arg* self) {
pointerTemp = (pointerTemp << 8);
pointerTemp += val;
}
pointer = (void*)(long)pointerTemp;
pointer = (void*)(uintptr_t)pointerTemp;
return pointer;
}
char* arg_getStr(Arg* self) {

2
src/dataArgs.c
View File

@ -294,7 +294,7 @@ char* getPrintStringFromFloat(Args* self, char* name, float val) {
char* getPrintStringFromPtr(Args* self, char* name, void* val) {
Args* buffs = New_strBuff();
char* res = NULL;
uint64_t intVal = (long)val;
uint64_t intVal = (uintptr_t)val;
char* valString = strsFormat(buffs, 32, "0x%llx", intVal);
res = getPrintSring(self, name, valString);
args_deinit(buffs);

2
src/dataMemory.c
View File

@ -107,7 +107,7 @@ void* pool_getMem_byBlockIndex(Pool* pool, uint32_t block_index) {
}
uint32_t pool_getBlockIndex_byMem(Pool* pool, void* mem) {
uint32_t mem_size = (long)mem - (long)pool->mem;
uint32_t mem_size = (uintptr_t)mem - (uintptr_t)pool->mem;
return pool_getBlockIndex_byMemSize(pool, mem_size);
}