[incubator-nuttx] 02/05: arch/x86_64: Change up_getrsp to x64_getsp

[aguettouche]

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit db02cea58c1e58ca1b7a877d7db61f35a4fb33ea
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Thu Jul 9 03:08:51 2020 +0800

    arch/x86_64: Change up_getrsp to x64_getsp
    
    Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
 arch/x86_64/include/intel64/arch.h | 2 +-
 arch/x86_64/include/tls.h          | 2 +-
 arch/x86_64/src/common/up_assert.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86_64/include/intel64/arch.h 
b/arch/x86_64/include/intel64/arch.h
index 0a23f54..2e4624e 100644
--- a/arch/x86_64/include/intel64/arch.h
+++ b/arch/x86_64/include/intel64/arch.h
@@ -458,7 +458,7 @@ static inline void write_gsbase(unsigned long val)
 
 /* Return stack pointer */
 
-static inline uint64_t up_getrsp()
+static inline uint64_t x64_getsp()
 {
   uint64_t regval;
 
diff --git a/arch/x86_64/include/tls.h b/arch/x86_64/include/tls.h
index 51856b9..8bbfc66 100644
--- a/arch/x86_64/include/tls.h
+++ b/arch/x86_64/include/tls.h
@@ -66,7 +66,7 @@
 static inline FAR struct tls_info_s *up_tls_info(void)
 {
   DEBUGASSERT(!up_interrupt_context());
-  return TLS_INFO((uintptr_t)up_getrsp());
+  return TLS_INFO((uintptr_t)x64_getsp());
 }
 #else
 #  define up_tls_info() tls_get_info()
diff --git a/arch/x86_64/src/common/up_assert.c 
b/arch/x86_64/src/common/up_assert.c
index ae9f15f..50737f8 100644
--- a/arch/x86_64/src/common/up_assert.c
+++ b/arch/x86_64/src/common/up_assert.c
@@ -109,7 +109,7 @@ static int assert_tracecallback(FAR struct usbtrace_s 
*trace, FAR void *arg)
 static void up_dumpstate(void)
 {
   struct tcb_s *rtcb = this_task();
-  uint64_t sp = up_getrsp();
+  uint64_t sp = x64_getsp();
   uint64_t ustackbase;
   uint64_t ustacksize;
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
@@ -259,7 +259,7 @@ void up_assert(const uint8_t *filename, int lineno)
   up_dumpstate();
 
 #ifdef CONFIG_BOARD_CRASHDUMP
-  board_crashdump(up_getrsp(), this_task(), filename, lineno);
+  board_crashdump(x64_getsp(), this_task(), filename, lineno);
 #endif
 
   _up_assert(EXIT_FAILURE);