sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa: Refactor up_fpucmp to only consider enabled coprocessors

Browse Source 
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2022-08-25 17:54:55 -03:00 committed by Xiang Xiao
parent fe2d37aa33
commit 2fb8af0c20
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/xtensa/src/common/xtensa_fpucmp.c
View File

@ -26,15 +26,29 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include "xtensa.h" #include "xtensa.h"
#ifdef CONFIG_ARCH_FPU
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Private Data
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_FPU static uint32_t g_coproc_sa_offsets[] =
{
XTENSA_CP0_SA, XTENSA_CP1_SA, XTENSA_CP2_SA, XTENSA_CP3_SA,
XTENSA_CP4_SA, XTENSA_CP5_SA, XTENSA_CP6_SA, XTENSA_CP7_SA
};
static uint32_t g_coproc_sa_sizes[] =
{
XCHAL_CP0_SA_SIZE, XCHAL_CP1_SA_SIZE, XCHAL_CP2_SA_SIZE, XCHAL_CP3_SA_SIZE,
XCHAL_CP4_SA_SIZE, XCHAL_CP5_SA_SIZE, XCHAL_CP6_SA_SIZE, XCHAL_CP7_SA_SIZE
};
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -45,6 +59,7 @@
* *
* Description: * Description:
* Compare FPU areas from thread context. * Compare FPU areas from thread context.
* This comparison will skip disabled coprocessors.
* *
* Input Parameters: * Input Parameters:
* saveregs1 - Pointer to the saved FPU registers. * saveregs1 - Pointer to the saved FPU registers.
@ -59,8 +74,23 @@ bool up_fpucmp(const void *saveregs1, const void *saveregs2)
{ {
const uint32_t *regs1 = saveregs1; const uint32_t *regs1 = saveregs1;
const uint32_t *regs2 = saveregs2; const uint32_t *regs2 = saveregs2;
uint32_t cpenable = xtensa_get_cpenable();
int ndx = 0;
bool ret = true;
int i;
return memcmp(&regs1[COMMON_CTX_REGS], &regs2[COMMON_CTX_REGS], while (ret && (i = ffs(cpenable)))
XTENSA_CP_SA_SIZE) == 0; {
uint32_t reg_offset;
ndx += i;
reg_offset = g_coproc_sa_offsets[ndx - 1] / 4;
ret = memcmp(&regs1[COMMON_CTX_REGS + reg_offset],
&regs2[COMMON_CTX_REGS + reg_offset],
g_coproc_sa_sizes[ndx - 1]) == 0;
cpenable >>= i;
}
return ret;
} }
#endif /* CONFIG_ARCH_FPU */ #endif /* CONFIG_ARCH_FPU */