arch: Rename xxx_getsp to up_getsp

All modern desgin support stack pointer and it's also an
important information, so let's standardize this interface.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2021-06-09 16:26:18 +08:00
committed by David Sidrane
parent fdf325c7e3
commit 6576306bca
65 changed files with 126 additions and 109 deletions
+2 -2
View File
@@ -109,12 +109,12 @@ do { \
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: arm_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
/* I don't know if the builtin to get SP is enabled */ /* I don't know if the builtin to get SP is enabled */
static inline uint32_t arm_getsp(void) static inline uint32_t up_getsp(void)
{ {
uint32_t sp; uint32_t sp;
__asm__ __asm__
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)arm_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+3 -3
View File
@@ -75,7 +75,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -157,7 +157,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -331,7 +331,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+3 -3
View File
@@ -74,7 +74,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -195,7 +195,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -384,7 +384,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+3 -3
View File
@@ -77,7 +77,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -195,7 +195,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 7 #if CONFIG_ARCH_INTERRUPTSTACK > 7
@@ -430,7 +430,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+3 -3
View File
@@ -77,7 +77,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -203,7 +203,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 7 #if CONFIG_ARCH_INTERRUPTSTACK > 7
@@ -422,7 +422,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+3 -3
View File
@@ -74,7 +74,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -192,7 +192,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 7 #if CONFIG_ARCH_INTERRUPTSTACK > 7
@@ -396,7 +396,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+3 -3
View File
@@ -77,7 +77,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -203,7 +203,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = arm_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 7 #if CONFIG_ARCH_INTERRUPTSTACK > 7
@@ -422,7 +422,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(arm_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: avr_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint16_t avr_getsp(void) static inline uint16_t up_getsp(void)
{ {
uint8_t spl; uint8_t spl;
uint8_t sph; uint8_t sph;
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: avr_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t avr_getsp(void) static inline uint32_t up_getsp(void)
{ {
uint32_t retval; uint32_t retval;
__asm__ __volatile__ __asm__ __volatile__
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)avr_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+2 -2
View File
@@ -49,7 +49,7 @@
static void up_stackdump(uint16_t sp, uint16_t stack_top) static void up_stackdump(uint16_t sp, uint16_t stack_top)
{ {
uint16_t stack ; uint16_t stack;
for (stack = sp & ~3; stack < stack_top; stack += 12) for (stack = sp & ~3; stack < stack_top; stack += 12)
{ {
@@ -125,7 +125,7 @@ static inline void up_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint16_t sp = avr_getsp(); uint16_t sp = up_getsp();
uint16_t ustackbase; uint16_t ustackbase;
uint16_t ustacksize; uint16_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 0 #if CONFIG_ARCH_INTERRUPTSTACK > 0
+2 -2
View File
@@ -49,7 +49,7 @@
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -95,7 +95,7 @@ static inline void up_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = avr_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+1 -1
View File
@@ -154,7 +154,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(avr_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
#ifdef CONFIG_ARCH_USBDUMP #ifdef CONFIG_ARCH_USBDUMP
+2 -2
View File
@@ -40,10 +40,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: hc_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint16_t hc_getsp(void) static inline uint16_t up_getsp(void)
{ {
uint16_t ret; uint16_t ret;
__asm__ __asm__
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)hc_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+2 -2
View File
@@ -170,7 +170,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint16_t sp = hc_getsp(); uint16_t sp = up_getsp();
uint16_t ustackbase; uint16_t ustackbase;
uint16_t ustacksize; uint16_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -329,7 +329,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(hc_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -40,10 +40,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: mips_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t mips_getsp(void) static inline uint32_t up_getsp(void)
{ {
register uint32_t sp; register uint32_t sp;
__asm__ __asm__
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)mips_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+1 -1
View File
@@ -160,7 +160,7 @@ void up_assert(const char *filename, int lineno)
#endif #endif
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(mips_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -50,7 +50,7 @@
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -125,7 +125,7 @@ static inline void up_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = mips_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+2 -2
View File
@@ -36,10 +36,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: misoc_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t misoc_getsp(void) static inline uint32_t up_getsp(void)
{ {
register uint32_t sp; register uint32_t sp;
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)misoc_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+1 -1
View File
@@ -164,7 +164,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(misoc_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -48,7 +48,7 @@
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -111,7 +111,7 @@ static inline void up_registerdump(void)
void lm32_dumpstate(void) void lm32_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = misoc_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+1 -1
View File
@@ -163,7 +163,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(misoc_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+1 -1
View File
@@ -113,7 +113,7 @@ static inline void up_registerdump(void)
void minerva_dumpstate(void) void minerva_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = misoc_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+2 -2
View File
@@ -71,10 +71,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: or1k_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t or1k_getsp(void) static inline uint32_t up_getsp(void)
{ {
uint32_t sp; uint32_t sp;
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)or1k_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+3 -3
View File
@@ -73,7 +73,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -195,7 +195,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = or1k_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -384,7 +384,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(or1k_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: renesas_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint16_t renesas_getsp(void) static inline uint16_t up_getsp(void)
{ {
uint16_t sp; uint16_t sp;
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: renesas_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint16_t renesas_getsp(void) static inline uint16_t up_getsp(void)
{ {
uint16_t sp; uint16_t sp;
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: renesas_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t renesas_getsp(void) static inline uint32_t up_getsp(void)
{ {
uint32_t sp; uint32_t sp;
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)renesas_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+1 -1
View File
@@ -159,7 +159,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(renesas_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+1 -1
View File
@@ -122,7 +122,7 @@ static inline void m16c_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint16_t sp = renesas_getsp(); uint16_t sp = up_getsp();
uint16_t ustackbase; uint16_t ustackbase;
uint16_t ustacksize; uint16_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+1 -1
View File
@@ -129,7 +129,7 @@ static inline void rx65n_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = renesas_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+2 -2
View File
@@ -52,7 +52,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
static void sh1_stackdump(uint32_t sp, uint32_t stack_top) static void sh1_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -109,7 +109,7 @@ static inline void sh1_registerdump(void)
void up_dumpstate(void) void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = renesas_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: riscv_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint32_t riscv_getsp(void) static inline uint32_t up_getsp(void)
{ {
register uint32_t sp; register uint32_t sp;
__asm__ __asm__
+2 -2
View File
@@ -44,10 +44,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: riscv_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uint64_t riscv_getsp(void) static inline uint64_t up_getsp(void)
{ {
register uint64_t sp; register uint64_t sp;
__asm__ __asm__
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)riscv_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+3 -3
View File
@@ -70,7 +70,7 @@
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void riscv_stackdump(uint32_t sp, uint32_t stack_top) static void riscv_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -177,7 +177,7 @@ static inline void riscv_registerdump(void)
static void riscv_dumpstate(void) static void riscv_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = riscv_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 15 #if CONFIG_ARCH_INTERRUPTSTACK > 15
@@ -364,7 +364,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(riscv_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
riscv_assert(); riscv_assert();
+2 -2
View File
@@ -191,7 +191,7 @@ static inline void up_registerdump(void)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint64_t sp = riscv_getsp(); uint64_t sp = up_getsp();
uintptr_t ustackbase; uintptr_t ustackbase;
uintptr_t ustacksize; uintptr_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 15 #if CONFIG_ARCH_INTERRUPTSTACK > 15
@@ -397,7 +397,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(riscv_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();
+2 -2
View File
@@ -30,10 +30,10 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: sim_getsp * Name: up_getsp
****************************************************************************/ ****************************************************************************/
static inline uintptr_t sim_getsp(void) static inline uintptr_t up_getsp(void)
{ {
return (uintptr_t)__builtin_frame_address(0); return (uintptr_t)__builtin_frame_address(0);
} }
+1 -1
View File
@@ -65,7 +65,7 @@
#ifdef CONFIG_TLS_ALIGNED #ifdef CONFIG_TLS_ALIGNED
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
return TLS_INFO(sim_getsp()); return TLS_INFO(up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+1 -1
View File
@@ -90,7 +90,7 @@ void up_assert(const char *filename, int line)
/* Allow for any board/configuration specific crash information */ /* Allow for any board/configuration specific crash information */
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(sim_getsp(), this_task(), filename, line); board_crashdump(up_getsp(), this_task(), filename, line);
#endif #endif
/* Flush any buffered SYSLOG data */ /* Flush any buffered SYSLOG data */
+1 -1
View File
@@ -53,7 +53,7 @@ void up_initial_state(struct tcb_s *tcb)
{ {
if (tcb->pid == 0) if (tcb->pid == 0)
{ {
tcb->stack_alloc_ptr = (void *)(sim_getsp() - tcb->stack_alloc_ptr = (void *)(up_getsp() -
CONFIG_IDLETHREAD_STACKSIZE); CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr; tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE; tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
+1 -1
View File
@@ -357,7 +357,7 @@ begin_packed_struct struct idt_ptr_s
/* Return stack pointer */ /* Return stack pointer */
static inline uint32_t x86_getsp() static inline uint32_t up_getsp()
{ {
uint32_t regval; uint32_t regval;
+1 -1
View File
@@ -66,7 +66,7 @@
static inline FAR struct tls_info_s *up_tls_info(void) static inline FAR struct tls_info_s *up_tls_info(void)
{ {
DEBUGASSERT(!up_interrupt_context()); DEBUGASSERT(!up_interrupt_context());
return TLS_INFO((uintptr_t)x86_getsp()); return TLS_INFO((uintptr_t)up_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
+3 -3
View File
@@ -75,7 +75,7 @@ static uint32_t s_last_regs[XCPTCONTEXT_REGS];
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_stackdump(uint32_t sp, uint32_t stack_top) static void up_stackdump(uint32_t sp, uint32_t stack_top)
{ {
uint32_t stack ; uint32_t stack;
for (stack = sp & ~0x1f; stack < stack_top; stack += 32) for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
{ {
@@ -121,7 +121,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = running_task(); struct tcb_s *rtcb = running_task();
uint32_t sp = x86_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -290,7 +290,7 @@ void up_assert(const char *filename, int lineno)
syslog_flush(); syslog_flush();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(x86_getsp(), running_task(), filename, lineno); board_crashdump(up_getsp(), running_task(), filename, lineno);
#endif #endif
_up_assert(); _up_assert();

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