yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix print format compilation warning 

fix print format compilation warning by changing 0x%x to 0x%p

close https://gitee.com/openharmony/kernel_liteos_m/issues/I3OFSQ

Signed-off-by: kenneth <459864689@qq.com>
This commit is contained in:
kenneth 2021-06-07 14:36:33 +08:00
parent 7ab7ae7ae7
commit ef12c89c7a
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/arch/arm/cortex-m3/keil/los_interrupt.c
View File

@ -320,7 +320,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -349,7 +349,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
View File

@ -310,7 +310,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -339,7 +339,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
View File

@ -319,7 +319,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -348,7 +348,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
View File

@ -319,7 +319,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -348,7 +348,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
View File

@ -320,7 +320,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -349,7 +349,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m4/iar/los_interrupt.c
View File

@ -323,7 +323,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -352,7 +352,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
View File

@ -310,7 +310,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -339,7 +339,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

4
kernel/arch/arm/cortex-m7/iar/los_interrupt.c
View File

@ -319,7 +319,7 @@ STATIC VOID OsExcNvicDump(VOID)
for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) { for (i = 0; i < OS_NR_NVIC_EXC_DUMP_TYPES; i++) {
base = (UINT32 *)rgNvicBases[i]; base = (UINT32 *)rgNvicBases[i];
len = rgNvicLens[i]; len = rgNvicLens[i];
PRINTK("interrupt %s register, base address: 0x%x, size: 0x%x\n", strRgs[i], base, len); PRINTK("interrupt %s register, base address: %p, size: 0x%x\n", strRgs[i], base, len);
len = (len >> 2); /* 2: Gets the next register offset */ len = (len >> 2); /* 2: Gets the next register offset */
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PRINTK("0x%x ", *(base + j)); PRINTK("0x%x ", *(base + j));
@ -348,7 +348,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
PRINTK("Task name = %s\n", taskCB->taskName); PRINTK("Task name = %s\n", taskCB->taskName);
PRINTK("Task ID = %d\n", taskCB->taskID); PRINTK("Task ID = %d\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = %p\n", taskCB->stackPointer);
PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack);
PRINTK("Task SS = 0x%x\n", taskCB->stackSize); PRINTK("Task SS = 0x%x\n", taskCB->stackSize);
} else if (excInfo->phase == OS_EXC_IN_HWI) { } else if (excInfo->phase == OS_EXC_IN_HWI) {

8
kernel/src/mm/los_membox.c
View File

@ -231,18 +231,18 @@ VOID LOS_ShowBox(VOID *pool)
return; return;
} }
MEMBOX_LOCK(intSave); MEMBOX_LOCK(intSave);
PRINT_INFO("membox(0x%x,0x%x,0x%x):\r\n", pool, boxInfo->uwBlkSize, boxInfo->uwBlkNum); PRINT_INFO("membox(%p, 0x%x, 0x%x):\r\n", pool, boxInfo->uwBlkSize, boxInfo->uwBlkNum);
PRINT_INFO("free node list:\r\n"); PRINT_INFO("free node list:\r\n");
for (node = boxInfo->stFreeList.pstNext, index = 0; node != NULL; for (node = boxInfo->stFreeList.pstNext, index = 0; node != NULL;
node = node->pstNext, ++index) { node = node->pstNext, ++index) {
PRINT_INFO("(%u,0x%x)\r\n", index, node); PRINT_INFO("(%u, %p)\r\n", index, node);
} }
PRINT_INFO("all node list:\r\n"); PRINT_INFO("all node list:\r\n");
node = (LOS_MEMBOX_NODE *)(boxInfo + 1); node = (LOS_MEMBOX_NODE *)(boxInfo + 1);
for (index = 0; index < boxInfo->uwBlkNum; ++index, node = OS_MEMBOX_NEXT(node, boxInfo->uwBlkSize)) { for (index = 0; index < boxInfo->uwBlkNum; ++index, node = OS_MEMBOX_NEXT(node, boxInfo->uwBlkSize)) {
PRINT_INFO("(%u,0x%x,0x%x)\r\n", index, node, node->pstNext); PRINT_INFO("(%u, %p, %p)\r\n", index, node, node->pstNext);
} }
MEMBOX_UNLOCK(intSave); MEMBOX_UNLOCK(intSave);
} }

26
kernel/src/mm/los_memory.c
View File

@ -1556,13 +1556,13 @@ STATIC UINT32 OsMemAddrValidCheckPrint(const VOID *pool, struct OsMemFreeNodeHea
{ {
if (((*tmpNode)->prev != NULL) && !OsMemAddrValidCheck(pool, (*tmpNode)->prev)) { if (((*tmpNode)->prev != NULL) && !OsMemAddrValidCheck(pool, (*tmpNode)->prev)) {
PRINT_ERR("[%s], %d, memory check error!\n" PRINT_ERR("[%s], %d, memory check error!\n"
" freeNode.prev: 0x%x is out of legal mem range\n", " freeNode.prev: %p is out of legal mem range\n",
__FUNCTION__, __LINE__, (*tmpNode)->prev); __FUNCTION__, __LINE__, (*tmpNode)->prev);
return LOS_NOK; return LOS_NOK;
} }
if (((*tmpNode)->next != NULL) && !OsMemAddrValidCheck(pool, (*tmpNode)->next)) { if (((*tmpNode)->next != NULL) && !OsMemAddrValidCheck(pool, (*tmpNode)->next)) {
PRINT_ERR("[%s], %d, memory check error!\n" PRINT_ERR("[%s], %d, memory check error!\n"
" freeNode.next: 0x%x is out of legal mem range\n", " freeNode.next: %p is out of legal mem range\n",
__FUNCTION__, __LINE__, (*tmpNode)->next); __FUNCTION__, __LINE__, (*tmpNode)->next);
return LOS_NOK; return LOS_NOK;
} }
@ -1579,7 +1579,7 @@ STATIC UINT32 OsMemIntegrityCheckSub(struct OsMemNodeHead **tmpNode, const VOID
if (!OsMemAddrValidCheck(pool, (*tmpNode)->ptr.prev)) { if (!OsMemAddrValidCheck(pool, (*tmpNode)->ptr.prev)) {
PRINT_ERR("[%s], %d, memory check error!\n" PRINT_ERR("[%s], %d, memory check error!\n"
" node prev: 0x%x is out of legal mem range\n", " node prev: %p is out of legal mem range\n",
__FUNCTION__, __LINE__, (*tmpNode)->ptr.next); __FUNCTION__, __LINE__, (*tmpNode)->ptr.next);
return LOS_NOK; return LOS_NOK;
} }
@ -1620,7 +1620,7 @@ STATIC VOID OsMemPoolHeadCheck(const struct OsMemPoolHead *pool)
UINT32 flag = 0; UINT32 flag = 0;
if ((pool->info.pool != pool) || !OS_MEM_IS_ALIGNED(pool, sizeof(VOID *))) { if ((pool->info.pool != pool) || !OS_MEM_IS_ALIGNED(pool, sizeof(VOID *))) {
PRINT_ERR("wrong mem pool addr: 0x%x, func: %s, line: %d\n", pool, __FUNCTION__, __LINE__); PRINT_ERR("wrong mem pool addr: %p, func: %s, line: %d\n", pool, __FUNCTION__, __LINE__);
return; return;
} }
@ -1628,14 +1628,14 @@ STATIC VOID OsMemPoolHeadCheck(const struct OsMemPoolHead *pool)
for (tmpNode = pool->freeList[index]; tmpNode != NULL; tmpNode = tmpNode->next) { for (tmpNode = pool->freeList[index]; tmpNode != NULL; tmpNode = tmpNode->next) {
if (OsMemFreeListNodeCheck(pool, tmpNode)) { if (OsMemFreeListNodeCheck(pool, tmpNode)) {
flag = 1; flag = 1;
PRINT_ERR("FreeListIndex: %u, node: 0x%x, bNode: 0x%x, prev: 0x%x, next: 0x%x\n", PRINT_ERR("FreeListIndex: %u, node: %p, bNode: %p, prev:%p, next: %p\n",
index, tmpNode, tmpNode->header.ptr.prev, tmpNode->prev, tmpNode->next); index, tmpNode, tmpNode->header.ptr.prev, tmpNode->prev, tmpNode->next);
} }
} }
} }
if (flag) { if (flag) {
PRINTK("mem pool info: poolAddr: 0x%x, poolSize: 0x%x\n", pool, pool->info.totalSize); PRINTK("mem pool info: poolAddr: %p, poolSize: 0x%x\n", pool, pool->info.totalSize);
#if (LOSCFG_MEM_WATERLINE == 1) #if (LOSCFG_MEM_WATERLINE == 1)
PRINTK("mem pool info: poolWaterLine: 0x%x, poolCurUsedSize: 0x%x\n", pool->info.waterLine, PRINTK("mem pool info: poolWaterLine: 0x%x, poolCurUsedSize: 0x%x\n", pool->info.waterLine,
pool->info.curUsedSize); pool->info.curUsedSize);
@ -1695,7 +1695,7 @@ STATIC VOID OsMemNodeInfo(const struct OsMemNodeHead *tmpNode,
if (OS_MEM_NODE_GET_USED_FLAG(tmpNode->sizeAndFlag)) { if (OS_MEM_NODE_GET_USED_FLAG(tmpNode->sizeAndFlag)) {
usedNode = (struct OsMemUsedNodeHead *)tmpNode; usedNode = (struct OsMemUsedNodeHead *)tmpNode;
PRINTK("\n broken node head: 0x%x " PRINTK("\n broken node head: %p "
#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1) #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
"0x%x " "0x%x "
#endif #endif
@ -1707,7 +1707,7 @@ STATIC VOID OsMemNodeInfo(const struct OsMemNodeHead *tmpNode,
usedNode->header.sizeAndFlag); usedNode->header.sizeAndFlag);
} else { } else {
freeNode = (struct OsMemFreeNodeHead *)tmpNode; freeNode = (struct OsMemFreeNodeHead *)tmpNode;
PRINTK("\n broken node head: 0x%x 0x%x 0x%x " PRINTK("\n broken node head: %p %p %p "
#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1) #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
"0x%x " "0x%x "
#endif #endif
@ -1721,7 +1721,7 @@ STATIC VOID OsMemNodeInfo(const struct OsMemNodeHead *tmpNode,
if (OS_MEM_NODE_GET_USED_FLAG(preNode->sizeAndFlag)) { if (OS_MEM_NODE_GET_USED_FLAG(preNode->sizeAndFlag)) {
usedNode = (struct OsMemUsedNodeHead *)preNode; usedNode = (struct OsMemUsedNodeHead *)preNode;
PRINTK("prev node head: 0x%x " PRINTK("prev node head: %p "
#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1) #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
"0x%x " "0x%x "
#endif #endif
@ -1733,7 +1733,7 @@ STATIC VOID OsMemNodeInfo(const struct OsMemNodeHead *tmpNode,
usedNode->header.sizeAndFlag); usedNode->header.sizeAndFlag);
} else { } else {
freeNode = (struct OsMemFreeNodeHead *)preNode; freeNode = (struct OsMemFreeNodeHead *)preNode;
PRINTK("prev node head: 0x%x 0x%x 0x%x " PRINTK("prev node head: %p %p %p "
#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1) #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
"0x%x " "0x%x "
#endif #endif
@ -1942,7 +1942,7 @@ STATIC VOID OsMemInfoPrint(VOID *pool)
"max free node size used node num free node num UsageWaterLine\n"); "max free node size used node num free node num UsageWaterLine\n");
PRINTK("--------------- -------- ------- -------- " PRINTK("--------------- -------- ------- -------- "
"-------------- ------------- ------------ ------------\n"); "-------------- ------------- ------------ ------------\n");
PRINTK("0x%-16x 0x%-8x 0x%-8x 0x%-8x 0x%-16x 0x%-13x 0x%-13x 0x%-13x\n", PRINTK("%-16p 0x%-8x 0x%-8x 0x%-8x 0x%-16x 0x%-13x 0x%-13x 0x%-13x\n",
poolInfo->info.pool, LOS_MemPoolSizeGet(pool), status.totalUsedSize, poolInfo->info.pool, LOS_MemPoolSizeGet(pool), status.totalUsedSize,
status.totalFreeSize, status.maxFreeNodeSize, status.usedNodeNum, status.totalFreeSize, status.maxFreeNodeSize, status.usedNodeNum,
status.freeNodeNum, status.usageWaterLine); status.freeNodeNum, status.usageWaterLine);
@ -1951,7 +1951,7 @@ STATIC VOID OsMemInfoPrint(VOID *pool)
"max free node size used node num free node num\n"); "max free node size used node num free node num\n");
PRINTK("--------------- -------- ------- -------- " PRINTK("--------------- -------- ------- -------- "
"-------------- ------------- ------------\n"); "-------------- ------------- ------------\n");
PRINTK("0x%-16x 0x%-8x 0x%-8x 0x%-8x 0x%-16x 0x%-13x 0x%-13x\n", PRINTK("%-16p 0x%-8x 0x%-8x 0x%-8x 0x%-16x 0x%-13x 0x%-13x\n",
(UINTPTR)poolInfo->info.pool, LOS_MemPoolSizeGet(pool), status.totalUsedSize, (UINTPTR)poolInfo->info.pool, LOS_MemPoolSizeGet(pool), status.totalUsedSize,
status.totalFreeSize, status.maxFreeNodeSize, status.usedNodeNum, status.totalFreeSize, status.maxFreeNodeSize, status.usedNodeNum,
status.freeNodeNum); status.freeNodeNum);
@ -2025,7 +2025,7 @@ UINT32 OsMemSystemInit(VOID)
#endif #endif
ret = LOS_MemInit(m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE); ret = LOS_MemInit(m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE);
PRINT_INFO("LiteOS heap memory address:0x%x,size:0x%x\n", m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE); PRINT_INFO("LiteOS heap memory address:%p, size:0x%lx\n", m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE);
return ret; return ret;
} }