p71924506
/
kernel_liteos_a1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!131 IsValidFP可读性优化 

Merge pull request !131 from zhangfanfan2/master
This commit is contained in:
openharmony_ci 2021-04-09 21:14:51 +08:00 committed by Gitee
parent 67b7f730d1 cd9c1d9789
commit 9dd5d56f9c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/arm/src/los_exc.c
View File

@ -574,8 +574,12 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
PrintExcInfo("User mode exception ends unscheduled!\n"); PrintExcInfo("User mode exception ends unscheduled!\n");
} }
/* this function is used to validate fp or validate the checking range start and end. */ /*
STATIC INLINE BOOL IsValidFP(UINTPTR regFP, UINTPTR start, UINTPTR end, vaddr_t *vaddr) * This function is used to determine whether the first input parameter is a valid virtual address.
* If it is, it is converted into a kernel virtual address and the converted kernel virtual address
* is used as an output parameter.
*/
STATIC INLINE BOOL IsValidVaddr(UINTPTR regFP, UINTPTR start, UINTPTR end, vaddr_t *vaddr)
{ {
VADDR_T kvaddr = regFP; VADDR_T kvaddr = regFP;
@ -618,7 +622,7 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
taskCB = OsCurrTaskGet(); taskCB = OsCurrTaskGet();
stackStart = taskCB->userMapBase; stackStart = taskCB->userMapBase;
stackEnd = taskCB->userMapBase + taskCB->userMapSize; stackEnd = taskCB->userMapBase + taskCB->userMapSize;
if (IsValidFP(regFP, stackStart, stackEnd, &kvaddr) == TRUE) { if (IsValidVaddr(regFP, stackStart, stackEnd, &kvaddr) == TRUE) {
found = TRUE; found = TRUE;
goto FOUND; goto FOUND;
} }
@ -634,7 +638,7 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
stackStart = taskCB->topOfStack; stackStart = taskCB->topOfStack;
stackEnd = taskCB->topOfStack + taskCB->stackSize; stackEnd = taskCB->topOfStack + taskCB->stackSize;
if (IsValidFP(regFP, stackStart, stackEnd, &kvaddr) == TRUE) { if (IsValidVaddr(regFP, stackStart, stackEnd, &kvaddr) == TRUE) {
found = TRUE; found = TRUE;
goto FOUND; goto FOUND;
} }
@ -645,7 +649,7 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
stack = &g_excStack[index]; stack = &g_excStack[index];
stackStart = (UINTPTR)stack->stackTop; stackStart = (UINTPTR)stack->stackTop;
stackEnd = stackStart + LOSCFG_KERNEL_CORE_NUM * stack->stackSize; stackEnd = stackStart + LOSCFG_KERNEL_CORE_NUM * stack->stackSize;
if (IsValidFP(regFP, stackStart, stackEnd, &kvaddr) == TRUE) { if (IsValidVaddr(regFP, stackStart, stackEnd, &kvaddr) == TRUE) {
found = TRUE; found = TRUE;
goto FOUND; goto FOUND;
} }
@ -681,23 +685,23 @@ VOID BackTraceSub(UINTPTR regFP)
* will still be stored and updated. In that case we needs to find the right position of frame pointer. * will still be stored and updated. In that case we needs to find the right position of frame pointer.
*/ */
tmpFP = *(UINTPTR *)(UINTPTR)kvaddr; tmpFP = *(UINTPTR *)(UINTPTR)kvaddr;
if (IsValidFP(tmpFP, stackStart, stackEnd, NULL) == TRUE) { if (IsValidVaddr(tmpFP, stackStart, stackEnd, NULL) == TRUE) {
backFP = tmpFP; backFP = tmpFP;
PrintExcInfo("traceback fp fixed, trace using fp = 0x%x\n", backFP); PrintExcInfo("traceback fp fixed, trace using fp = 0x%x\n", backFP);
} }
while (IsValidFP(backFP, stackStart, stackEnd, &kvaddr) == TRUE) { while (IsValidVaddr(backFP, stackStart, stackEnd, &kvaddr) == TRUE) {
tmpFP = backFP; tmpFP = backFP;
#ifdef LOSCFG_COMPILER_CLANG_LLVM #ifdef LOSCFG_COMPILER_CLANG_LLVM
backFP = *(UINTPTR *)(UINTPTR)kvaddr; backFP = *(UINTPTR *)(UINTPTR)kvaddr;
if (IsValidFP(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) { if (IsValidVaddr(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE); PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
return; return;
} }
backLR = *(UINTPTR *)(UINTPTR)kvaddr; backLR = *(UINTPTR *)(UINTPTR)kvaddr;
#else #else
backLR = *(UINTPTR *)(UINTPTR)kvaddr; backLR = *(UINTPTR *)(UINTPTR)kvaddr;
if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) { if (IsValidVaddr(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE); PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
return; return;
} }