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

!679 内核codex清零 

Merge pull request !679 from Kiita/0421_codex
This commit is contained in:
openharmony_ci 2022-04-25 04:36:10 +00:00 committed by Gitee
parent b62463abc5 1bf61bb4b0
commit 4491d561c7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
18 changed files with 110 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/backtrace/los_backtrace.c
View File

@ -151,7 +151,7 @@ STATIC INLINE UINT32 OsStackAddrGet(UINTPTR *stackStart, UINTPTR *stackEnd, UINT
LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID); LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
*stackEnd = (UINTPTR)taskCB->topOfStack + taskCB->stackSize; *stackEnd = (UINTPTR)taskCB->topOfStack + taskCB->stackSize;
if ((*stackStart < (UINTPTR)taskCB->topOfStack) || (*stackStart >= *stackEnd)) { if ((*stackStart < (UINTPTR)taskCB->topOfStack) || (*stackStart >= *stackEnd)) {
PRINT_ERR("psp stack [0x%x, 0x%x], cur sp(0x%x) is overflow, cur task id is %d!\n", PRINT_ERR("psp stack [0x%x, 0x%x], cur sp(0x%x) is overflow, cur task id is %u!\n",
taskCB->topOfStack, *stackEnd, *stackStart, taskID); taskCB->topOfStack, *stackEnd, *stackStart, taskID);
return LOS_NOK; return LOS_NOK;
} }
@ -413,7 +413,7 @@ VOID LOS_BackTrace(VOID)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("traceback %d -- lr = 0x%x\r\n", index, LR[index]); PRINTK("traceback %u -- lr = 0x%x\r\n", index, LR[index]);
} }
PRINTK("----- traceback end -----\r\n"); PRINTK("----- traceback end -----\r\n");
} }

8
components/cpup/los_cpup.c
View File

@ -481,7 +481,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E
PRINTK("\nSysCpuUsage in <1s: "); PRINTK("\nSysCpuUsage in <1s: ");
} }
ret = LOS_HistorySysCpuUsage(mode); ret = LOS_HistorySysCpuUsage(mode);
PRINTK("%d.%d", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT); PRINTK("%u.%u", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT);
break; break;
case TASK_CPU_USAGE: case TASK_CPU_USAGE:
@ -495,11 +495,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E
return OS_ERROR; return OS_ERROR;
} }
if (mode == CPUP_IN_10S) { if (mode == CPUP_IN_10S) {
PRINTK("\nCPUusage of taskID %d in 10s: ", taskID); PRINTK("\nCPUusage of taskID %u in 10s: ", taskID);
} else if (mode == CPUP_IN_1S) { } else if (mode == CPUP_IN_1S) {
PRINTK("\nCPUusage of taskID %d in 1s: ", taskID); PRINTK("\nCPUusage of taskID %u in 1s: ", taskID);
} else { } else {
PRINTK("\nCPUusage of taskID %d in <1s: ", taskID); PRINTK("\nCPUusage of taskID %u in <1s: ", taskID);
} }
ret = LOS_HistoryTaskCpuUsage(taskID, mode); ret = LOS_HistoryTaskCpuUsage(taskID, mode);
PRINTK("%u.%u", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT); PRINTK("%u.%u", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT);

21
kernel/arch/arm/arm9/gcc/los_interrupt.c
View File

@ -49,7 +49,7 @@
#define OS_INT_STATUS_ADDR (OS_INT_REG_BASE + 12) #define OS_INT_STATUS_ADDR (OS_INT_REG_BASE + 12)
#define OS_INT_ENABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR) |= (1U << (num))) #define OS_INT_ENABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR) |= (1U << (num)))
#define OS_INT_DISABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR ) &= ~(1U << (num))) #define OS_INT_DISABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR) &= ~(1U << (num)))
#define OS_INSTR_SET_MASK 0x01000020U #define OS_INSTR_SET_MASK 0x01000020U
#define OS_ARM_INSTR_LEN 4 #define OS_ARM_INSTR_LEN 4
@ -123,7 +123,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID)
UINT32 status; UINT32 status;
READ_UINT32(status, OS_INT_STATUS_ADDR); READ_UINT32(status, OS_INT_STATUS_ADDR);
return (31 - CLZ(status)); return (31 - CLZ(status)); /* 31 bit map of int */
} }
inline UINT32 HalIsIntActive(VOID) inline UINT32 HalIsIntActive(VOID)
@ -140,8 +140,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -272,8 +271,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -284,7 +283,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); PRINTK("Task SP = 0x%x\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);
@ -328,7 +327,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -354,15 +353,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -133,8 +133,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -332,8 +331,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -344,7 +343,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -390,7 +389,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -416,15 +415,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -322,8 +321,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -334,7 +333,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -380,7 +379,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -406,15 +405,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

19
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
View File

@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -322,8 +321,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -334,7 +333,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -380,7 +379,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -406,15 +405,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);
@ -489,7 +488,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
UINT32 index; UINT32 index;
g_hwiForm[0] = 0; /* [0] Top of Stack */ g_hwiForm[0] = 0; /* [0] Top of Stack */
g_hwiForm[1] = 0; /* [1] reset */ g_hwiForm[1] = 0; /* [1] reset */
for (index = 2; index < OS_VECTOR_CNT; index++) { for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2 Default hw handler stack start from index 2 */
g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler; g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
} }
/* Exception handler register */ /* Exception handler register */

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

@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -322,8 +321,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -334,7 +333,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -380,7 +379,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -406,15 +405,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);
@ -489,7 +488,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
UINT32 index; UINT32 index;
g_hwiForm[0] = 0; /* [0] Top of Stack */ g_hwiForm[0] = 0; /* [0] Top of Stack */
g_hwiForm[1] = 0; /* [1] reset */ g_hwiForm[1] = 0; /* [1] reset */
for (index = 2; index < OS_VECTOR_CNT; index++) { for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler; g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
} }
/* Exception handler register */ /* Exception handler register */

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

@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -330,8 +329,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -342,7 +341,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -388,7 +387,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -414,15 +413,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -330,8 +329,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -342,7 +341,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -388,7 +387,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -414,15 +413,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -133,8 +133,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -332,8 +331,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -344,7 +343,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -390,7 +389,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -416,15 +415,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -134,8 +134,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -335,8 +334,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -347,7 +346,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -393,7 +392,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -419,15 +418,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -322,8 +321,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -334,7 +333,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -380,7 +379,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -406,15 +405,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

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

@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID)
/*lint -e529*/ /*lint -e529*/
LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
{ {
UINT32 irqNum = HalIntNumGet(); PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet());
PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum);
while (1) {} while (1) {}
} }
@ -331,8 +330,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
{ {
CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"};
PRINTK("Type = %d\n", excInfo->type); PRINTK("Type = %u\n", excInfo->type);
PRINTK("ThrdPid = %d\n", excInfo->thrdPid); PRINTK("ThrdPid = %u\n", excInfo->thrdPid);
PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]);
PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr);
} }
@ -343,7 +342,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo)
if (excInfo->phase == OS_EXC_IN_TASK) { if (excInfo->phase == OS_EXC_IN_TASK) {
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 = %u\n", taskCB->taskID);
PRINTK("Task SP = %p\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);
@ -389,7 +388,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo)
if (LR[index] == 0) { if (LR[index] == 0) {
break; break;
} }
PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]);
} }
PRINTK("----- backtrace end -----\n"); PRINTK("----- backtrace end -----\n");
} }
@ -415,15 +414,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID)
} }
for (i = 0; i < errCnt; i++) { for (i = 0; i < errCnt; i++) {
PRINTK("pool num = %d\n", i); PRINTK("pool num = %u\n", i);
PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool type = %d\n", memExcInfo[i].type);
PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr);
PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool size = 0x%x\n", memExcInfo[i].size);
PRINTK("pool free = 0x%x\n", memExcInfo[i].free); PRINTK("pool free = 0x%x\n", memExcInfo[i].free);
PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize);
PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr);
PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen);
PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner);
} }
#endif #endif
UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR);

2
kernel/src/los_init.c
View File

@ -127,7 +127,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
OsRegister(); OsRegister();
ret = OsMemSystemInit(); ret = OsMemSystemInit();
if (ret != LOS_OK) { if (ret != LOS_OK) {
PRINT_ERR("OsMemSystemInit error %d\n", ret); PRINT_ERR("OsMemSystemInit error %u\n", ret);
return ret; return ret;
} }

4
kernel/src/los_queue.c
View File

@ -243,7 +243,7 @@ static INLINE VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType,
msgDataSize = *((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32))); msgDataSize = *((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32)));
rc = memcpy_s((VOID *)bufferAddr, *bufferSize, (VOID *)queueNode, msgDataSize); rc = memcpy_s((VOID *)bufferAddr, *bufferSize, (VOID *)queueNode, msgDataSize);
if (rc != EOK) { if (rc != EOK) {
PRINT_ERR("%s[%d] memcpy failed, error type = %u\n", __FUNCTION__, __LINE__, rc); PRINT_ERR("%s[%d] memcpy failed, error type = %d\n", __FUNCTION__, __LINE__, rc);
return; return;
} }
@ -252,7 +252,7 @@ static INLINE VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType,
*((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32))) = *bufferSize; *((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32))) = *bufferSize;
rc = memcpy_s((VOID *)queueNode, queueCB->queueSize, (VOID *)bufferAddr, *bufferSize); rc = memcpy_s((VOID *)queueNode, queueCB->queueSize, (VOID *)bufferAddr, *bufferSize);
if (rc != EOK) { if (rc != EOK) {
PRINT_ERR("%s[%d] memcpy failed, error type = %u\n", __FUNCTION__, __LINE__, rc); PRINT_ERR("%s[%d] memcpy failed, error type = %d\n", __FUNCTION__, __LINE__, rc);
return; return;
} }
} }

2
kernel/src/los_swtmr.c
View File

@ -88,7 +88,7 @@ LITE_OS_SEC_TEXT VOID OsSwtmrTask(VOID)
tick = LOS_TickCountGet() - tick; tick = LOS_TickCountGet() - tick;
if (tick >= SWTMR_MAX_RUNNING_TICKS) { if (tick >= SWTMR_MAX_RUNNING_TICKS) {
PRINT_WARN("timer_handler(%p) cost too many ms(%d)\n", PRINT_WARN("timer_handler(%p) cost too many ms(%u)\n",
swtmrHandle.handler, swtmrHandle.handler,
(UINT32)((tick * OS_SYS_MS_PER_SECOND) / LOSCFG_BASE_CORE_TICK_PER_SECOND)); (UINT32)((tick * OS_SYS_MS_PER_SECOND) / LOSCFG_BASE_CORE_TICK_PER_SECOND));
} }

10
kernel/src/los_task.c
View File

@ -343,7 +343,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
continue; continue;
} }
PRINTK("%d %d %s 0x%x 0x%x 0x%x 0x%x 0x%x ", PRINTK("%u %u %s 0x%x 0x%x 0x%x 0x%x 0x%x ",
taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus), taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus),
taskCB->stackSize, OsGetTaskWaterLine(taskCB->taskID), taskCB->stackSize, OsGetTaskWaterLine(taskCB->taskID),
(UINT32)(UINTPTR)taskCB->stackPointer, taskCB->topOfStack, taskCB->eventMask); (UINT32)(UINTPTR)taskCB->stackPointer, taskCB->topOfStack, taskCB->eventMask);
@ -352,7 +352,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
PRINTK("0x%x ", semID); PRINTK("0x%x ", semID);
#if (LOSCFG_BASE_CORE_CPUP == 1) #if (LOSCFG_BASE_CORE_CPUP == 1)
PRINTK("%d.%d %d.%d %d.%d ", PRINTK("%u.%u %u.%u %u.%u ",
cpuLessOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, cpuLessOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT,
cpuLessOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, cpuLessOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT,
cpuTenSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, cpuTenSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT,
@ -498,7 +498,7 @@ LITE_OS_SEC_TEXT CHAR *LOS_CurTaskNameGet(VOID)
*****************************************************************************/ *****************************************************************************/
LITE_OS_SEC_TEXT STATIC VOID OsHandleRunTaskStackOverflow(VOID) LITE_OS_SEC_TEXT STATIC VOID OsHandleRunTaskStackOverflow(VOID)
{ {
PRINT_ERR("CURRENT task ID: %s:%d stack overflow!\n", PRINT_ERR("CURRENT task ID: %s:%u stack overflow!\n",
g_losTask.runTask->taskName, g_losTask.runTask->taskID); g_losTask.runTask->taskName, g_losTask.runTask->taskID);
OsDoExcHook(EXC_STACKOVERFLOW); OsDoExcHook(EXC_STACKOVERFLOW);
} }
@ -514,7 +514,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsHandleNewTaskStackOverflow(VOID)
{ {
LosTaskCB *tmp = NULL; LosTaskCB *tmp = NULL;
PRINT_ERR("HIGHEST task ID: %s:%d SP error!\n", PRINT_ERR("HIGHEST task ID: %s:%u SP error!\n",
g_losTask.newTask->taskName, g_losTask.newTask->taskID); g_losTask.newTask->taskName, g_losTask.newTask->taskID);
PRINT_ERR("HIGHEST task StackPointer: 0x%x TopOfStack: 0x%x\n", PRINT_ERR("HIGHEST task StackPointer: 0x%x TopOfStack: 0x%x\n",
(UINT32)(UINTPTR)(g_losTask.newTask->stackPointer), g_losTask.newTask->topOfStack); (UINT32)(UINTPTR)(g_losTask.newTask->stackPointer), g_losTask.newTask->topOfStack);
@ -633,7 +633,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsTaskEntry(UINT32 taskID)
taskCB->joinRetval = (UINTPTR)taskCB->taskEntry(taskCB->arg); taskCB->joinRetval = (UINTPTR)taskCB->taskEntry(taskCB->arg);
retVal = LOS_TaskDelete(taskCB->taskID); retVal = LOS_TaskDelete(taskCB->taskID);
if (retVal != LOS_OK) { if (retVal != LOS_OK) {
PRINT_ERR("Delete Task[TID: %d] Failed!\n", taskCB->taskID); PRINT_ERR("Delete Task[TID: %u] Failed!\n", taskCB->taskID);
} }
} }

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

@ -952,7 +952,7 @@ UINT32 LOS_MemInit(VOID *pool, UINT32 size)
if (((UINTPTR)pool & (OS_MEM_ALIGN_SIZE - 1)) || \ if (((UINTPTR)pool & (OS_MEM_ALIGN_SIZE - 1)) || \
(size & (OS_MEM_ALIGN_SIZE - 1))) { (size & (OS_MEM_ALIGN_SIZE - 1))) {
PRINT_ERR("LiteOS heap memory address or size configured not aligned:address:0x%x,size:0x%x, alignsize:%d\n", \ PRINT_ERR("LiteOS heap memory address or size configured not aligned:address:0x%x,size:0x%x, alignsize:%u\n", \
(UINTPTR)pool, size, OS_MEM_ALIGN_SIZE); (UINTPTR)pool, size, OS_MEM_ALIGN_SIZE);
return OS_ERROR; return OS_ERROR;
} }
@ -1788,8 +1788,8 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
PRINTK("The prev node is free\n"); PRINTK("The prev node is free\n");
} }
MEM_UNLOCK(pool, intSave); MEM_UNLOCK(pool, intSave);
PRINT_ERR("cur node: 0x%x, pre node: 0x%x, pre node was allocated by task: %d, %s\n", PRINT_ERR("cur node: 0x%x, pre node: 0x%x, pre node was allocated by task: %u, %s\n",
tmpNode, preNode, taskCB->taskID, taskCB->taskName); (UINTPTR)tmpNode, (UINTPTR)preNode, taskCB->taskID, taskCB->taskName);
LOS_Panic("Memory integrity check error!\n"); LOS_Panic("Memory integrity check error!\n");
#else #else
MEM_UNLOCK(pool, intSave); MEM_UNLOCK(pool, intSave);