Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/x86_64: Change up_getrsp to x64_getsp

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-07-09 03:08:51 +08:00
committed by Abdelatif Guettouche
parent 05f6445493
commit db02cea58c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86_64/include/intel64/arch.h
+1 -1
View File
@@ -458,7 +458,7 @@ static inline void write_gsbase(unsigned long val)
/* Return stack pointer */ /* Return stack pointer */
static inline uint64_t up_getrsp() static inline uint64_t x64_getsp()
{ {
uint64_t regval; uint64_t regval;
arch/x86_64/include/tls.h
+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)up_getrsp()); return TLS_INFO((uintptr_t)x64_getsp());
} }
#else #else
# define up_tls_info() tls_get_info() # define up_tls_info() tls_get_info()
arch/x86_64/src/common/up_assert.c
+2 -2
View File
@@ -109,7 +109,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 = this_task(); struct tcb_s *rtcb = this_task();
uint64_t sp = up_getrsp(); uint64_t sp = x64_getsp();
uint64_t ustackbase; uint64_t ustackbase;
uint64_t ustacksize; uint64_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -259,7 +259,7 @@ void up_assert(const uint8_t *filename, int lineno)
up_dumpstate(); up_dumpstate();
#ifdef CONFIG_BOARD_CRASHDUMP #ifdef CONFIG_BOARD_CRASHDUMP
board_crashdump(up_getrsp(), this_task(), filename, lineno); board_crashdump(x64_getsp(), this_task(), filename, lineno);
#endif #endif
_up_assert(EXIT_FAILURE); _up_assert(EXIT_FAILURE);