Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 13:52:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch: up_getusrsp change to inline and implement in irq.h

Browse Source 
Signed-off-by: buxiasen <buxiasen@xiaomi.com>
This commit is contained in:
buxiasen
2024-12-31 17:00:17 +08:00
committed by Xiang Xiao
parent 1358942132
commit 89455bc9a1
53 changed files with 205 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/include/armv6-m/irq.h
+6
View File
@@ -362,6 +362,12 @@ static always_inline_function uint32_t up_getsp(void)
return sp;
}
static always_inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
static always_inline_function bool up_interrupt_context(void)
{
return getipsr() != 0;
arch/arm/include/armv7-a/irq.h
+6
View File
@@ -473,6 +473,12 @@ static inline_function uint32_t up_getsp(void)
return sp;
}
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
noinstrument_function
static inline_function void up_set_interrupt_context(bool flag)
{
arch/arm/include/armv7-m/irq.h
+6
View File
@@ -512,6 +512,12 @@ static always_inline_function uint32_t up_getsp(void)
return sp;
}
static always_inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
static always_inline_function bool up_interrupt_context(void)
{
return getipsr() != 0;
arch/arm/include/armv7-r/irq.h
+6
View File
@@ -468,6 +468,12 @@ static inline_function uint32_t up_getsp(void)
return sp;
}
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
noinstrument_function
static inline_function void up_set_interrupt_context(bool flag)
{
arch/arm/include/armv8-m/irq.h
+6
View File
@@ -487,6 +487,12 @@ static always_inline_function uint32_t up_getsp(void)
return sp;
}
static always_inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
static always_inline_function bool up_interrupt_context(void)
{
return getipsr() != 0;
arch/arm/include/armv8-r/irq.h
+6
View File
@@ -468,6 +468,12 @@ static inline_function uint32_t up_getsp(void)
return sp;
}
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
noinstrument_function
static inline_function void up_set_interrupt_context(bool flag)
{
arch/arm/include/tlsr82/irq.h
+6
View File
@@ -262,6 +262,12 @@ static inline_function uint32_t up_getsp(void)
return sp;
}
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = (uint32_t *)regs;
return ptr[REG_SP];
}
noinstrument_function
static inline_function bool up_interrupt_context(void)
{
arch/arm/src/common/arm_registerdump.c
-10
View File
@@ -43,16 +43,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/arm64/include/irq.h
+8
View File
@@ -462,6 +462,14 @@ static inline_function void up_irq_restore(irqstate_t flags)
#define up_getusrpc(regs) \
(((uintptr_t *)((regs) ? (regs) : running_regs()))[REG_ELR])
#ifndef CONFIG_BUILD_KERNEL
# define up_getusrsp(regs) \
((uintptr_t)((uint64_t *)(regs))[REG_SP_ELX])
#else
# define up_getusrsp(regs) \
((uintptr_t)((uint64_t *)(regs))[REG_SP_EL0])
#endif
#undef EXTERN
#ifdef __cplusplus
}
arch/arm64/src/common/arm64_registerdump.c
-13
View File
@@ -46,19 +46,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
#ifndef CONFIG_BUILD_KERNEL
return ((uint64_t *)regs)[REG_SP_ELX];
#else
return ((uint64_t *)regs)[REG_SP_EL0];
#endif
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/avr/include/irq.h
+7
View File
@@ -126,6 +126,13 @@ static inline_function void up_set_current_regs(FAR uint8_t *regs)
#define up_interrupt_context() (up_current_regs() != NULL)
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint8_t *)(regs))[REG_R13])
#undef EXTERN
#ifdef __cplusplus
}
arch/avr/src/avr/avr_registerdump.c
-10
View File
@@ -40,16 +40,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return ptr[REG_R13];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/avr/src/avr32/avr_registerdump.c
-10
View File
@@ -40,16 +40,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return ptr[REG_R13];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/ceva/include/irq.h
+7
View File
@@ -175,6 +175,13 @@ static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t*)(regs))[REG_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/ceva/src/common/ceva_registerdump.c
-10
View File
@@ -37,16 +37,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/hc/include/irq.h
+10
View File
@@ -127,6 +127,16 @@ static inline_function void up_set_current_regs(FAR uint8_t *regs)
#define up_interrupt_context() (up_current_regs() != NULL)
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return (uintptr_t)(ptr[REG_SPH] << 8 | ptr[REG_SPL]);
}
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
arch/hc/src/m9s12/m9s12_registerdump.c
-10
View File
@@ -38,16 +38,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return (uintptr_t)(ptr[REG_SPH] << 8 | ptr[REG_SPL]);
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/mips/include/irq.h
+7
View File
@@ -138,6 +138,13 @@ static inline_function void up_set_current_regs(uint32_t *regs)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_EPC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t*)(regs))[REG_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/mips/src/mips32/mips_registerdump.c
-10
View File
@@ -40,16 +40,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/misoc/include/lm32/irq.h
+7
View File
@@ -227,5 +227,12 @@ struct xcptcontext
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_EPC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_SP])
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_MISOC_INCLUDE_LM32_IRQ_H */
arch/misoc/include/minerva/irq.h
+7
View File
@@ -308,5 +308,12 @@ struct xcptcontext
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_CSR_MEPC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_X2])
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_MISOC_INCLUDE_MINERVA_IRQ_H */
arch/misoc/src/lm32/lm32_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/misoc/src/minerva/minerva_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_X2];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/or1k/include/irq.h
+7
View File
@@ -157,6 +157,13 @@ static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_R13])
#undef EXTERN
#ifdef __cplusplus
}
arch/or1k/src/common/or1k_registerdump.c
-10
View File
@@ -38,16 +38,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_R13];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/renesas/include/m16c/irq.h
+10
View File
@@ -350,6 +350,16 @@ static inline_function irqstate_t up_irq_enable(void)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
static inline_function uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return (uintptr_t)(ptr[REG_SP] << 8 | ptr[REG_SP + 1]);
}
#undef EXTERN
#ifdef __cplusplus
}
arch/renesas/include/rx65n/irq.h
+7
View File
@@ -1088,6 +1088,13 @@ static inline_function void up_irq_restore(irqstate_t flags)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_SP])
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_RENESAS_INCLUDE_RX65N_IRQ_H */
arch/renesas/include/sh1/irq.h
+7
View File
@@ -571,6 +571,13 @@ static inline_function void up_irq_restore(irqstate_t flags)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/renesas/src/m16c/m16c_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint8_t *ptr = regs;
return (uintptr_t)(ptr[REG_SP] << 8 | ptr[REG_SP + 1]);
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/renesas/src/rx65n/rx65n_registerdump.c
-10
View File
@@ -41,16 +41,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/renesas/src/sh1/sh1_registerdump.c
-10
View File
@@ -38,16 +38,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/risc-v/include/irq.h
+7
View File
@@ -830,6 +830,13 @@ noinstrument_function static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((uintptr_t *)((regs) ? (regs) : running_regs()))[REG_EPC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
(((uintptr_t*)(regs))[REG_SP])
#undef EXTERN
#if defined(__cplusplus)
}
arch/risc-v/src/common/riscv_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uintptr_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/sim/include/irq.h
+7
View File
@@ -183,6 +183,13 @@ static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((xcpt_reg_t *)((regs) ? (regs) : up_current_regs()))[JB_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((xcpt_reg_t *)(regs))[JB_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/sim/src/sim/sim_registerdump.c
-10
View File
@@ -34,16 +34,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
xcpt_reg_t *ptr = regs;
return ptr[JB_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/sparc/include/irq.h
+7
View File
@@ -175,6 +175,13 @@ static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_I6])
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
arch/sparc/src/sparc_v8/sparc_v8_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_I6];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/tricore/include/irq.h
+20
View File
@@ -186,6 +186,26 @@ static inline_function bool up_interrupt_context(void)
return ret;
}
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
static inline_function uintptr_t up_getusrsp(void *regs)
{
uintptr_t *csa = regs;
while (((uintptr_t)csa & PCXI_UL) == 0)
{
csa = tricore_csa2addr((uintptr_t)csa);
csa = (uintptr_t *)csa[0];
}
csa = tricore_csa2addr((uintptr_t)csa);
return csa[REG_SP];
}
#endif /* __ASSEMBLY__ */
#undef EXTERN
arch/tricore/src/common/tricore_registerdump.c
-19
View File
@@ -39,25 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uintptr_t *csa = regs;
while (((uintptr_t)csa & PCXI_UL) == 0)
{
csa = tricore_csa2addr((uintptr_t)csa);
csa = (uintptr_t *)csa[0];
}
csa = tricore_csa2addr((uintptr_t)csa);
return csa[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/x86/include/irq.h
+7
View File
@@ -120,6 +120,13 @@ static inline_function void up_set_current_regs(uint32_t *regs)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_EIP])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint32_t *)(regs))[REG_ESP])
#undef EXTERN
#ifdef __cplusplus
}
arch/x86/src/i486/i486_regdump.c
-10
View File
@@ -35,16 +35,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint32_t *ptr = regs;
return ptr[REG_ESP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/x86_64/include/irq.h
+7
View File
@@ -182,6 +182,13 @@ static inline_function void up_set_interrupt_context(bool flag)
#define up_getusrpc(regs) \
(((uint64_t *)((regs) ? (regs) : running_regs()))[REG_RIP])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((uint64_t *)(regs))[REG_RSP])
#undef EXTERN
#ifdef __cplusplus
}
arch/x86_64/src/intel64/intel64_regdump.c
-10
View File
@@ -37,16 +37,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uint64_t *ptr = regs;
return ptr[REG_RSP];
}
/****************************************************************************
* Name: x86_64_registerdump
****************************************************************************/
arch/xtensa/include/irq.h
+7
View File
@@ -468,6 +468,13 @@ noinstrument_function static inline_function bool up_interrupt_context(void)
#define up_getusrpc(regs) \
(((uint32_t *)((regs) ? (regs) : running_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
(((uintptr_t*)(regs))[REG_A1])
#undef EXTERN
#ifdef __cplusplus
}
arch/xtensa/src/common/xtensa_registerdump.c
-10
View File
@@ -39,16 +39,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(void *regs)
{
uintptr_t *ptr = regs;
return ptr[REG_A1];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/z16/include/irq.h
+7
View File
@@ -112,6 +112,13 @@ static inline_function void up_set_current_regs(FAR chipreg_t *regs)
#define up_getusrpc(regs) \
(((FAR chipreg_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((FAR uint32_t*)(regs))[REG_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/z16/src/common/z16_registerdump.c
-10
View File
@@ -35,16 +35,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(FAR void *regs)
{
FAR uint32_t *ptr = regs;
return ptr[REG_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/z80/include/irq.h
+7
View File
@@ -57,6 +57,13 @@ uintptr_t up_getsp(void);
#define up_getusrpc(regs) \
(((FAR chipreg_t *)((regs) ? (regs) : up_current_regs()))[XCPT_PC])
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
#define up_getusrsp(regs) \
((uintptr_t)((FAR chipreg_t*)(regs))[XCPT_SP])
#undef EXTERN
#ifdef __cplusplus
}
arch/z80/src/ez80/ez80_registerdump.c
-10
View File
@@ -38,16 +38,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(FAR void *regs)
{
FAR chipreg_t *ptr = regs;
return ptr[XCPT_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/
arch/z80/src/z180/z180_registerdump.c
-10
View File
@@ -38,16 +38,6 @@
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_getusrsp
****************************************************************************/
uintptr_t up_getusrsp(FAR void *regs)
{
FAR chipreg_t *ptr = regs;
return ptr[XCPT_SP];
}
/****************************************************************************
* Name: up_dump_register
****************************************************************************/

Some files were not shown because too many files have changed in this diff Show More