You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/08/19 08:26:15 UTC
[incubator-nuttx] branch master updated: arch/arm: correct the
frame pointer register declare
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 0a8d951 arch/arm: correct the frame pointer register declare
0a8d951 is described below
commit 0a8d9518379f6c296316d8382f0d650a1975703a
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Aug 18 12:13:35 2021 +0800
arch/arm: correct the frame pointer register declare
In AArch32, the frame pointer is stored in register R11 for ARM code or register R7 for Thumb code.
In AArch64, the frame pointer is stored in register X29.
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/arm/include/arm/irq.h | 6 +++++-
arch/arm/include/armv6-m/irq.h | 2 +-
arch/arm/include/armv7-a/irq.h | 6 +++++-
arch/arm/include/armv7-m/irq.h | 2 +-
arch/arm/include/armv7-r/irq.h | 6 +++++-
arch/arm/include/armv8-m/irq.h | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/arm/irq.h b/arch/arm/include/arm/irq.h
index 6c7f3ae..3762882 100644
--- a/arch/arm/include/arm/irq.h
+++ b/arch/arm/include/arm/irq.h
@@ -84,7 +84,11 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#ifdef CONFIG_ARM_THUMB
+ #define REG_FP REG_R7
+#else
+ #define REG_FP REG_R11
+#endif /* CONFIG_ARM_THUMB */
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
diff --git a/arch/arm/include/armv6-m/irq.h b/arch/arm/include/armv6-m/irq.h
index 9d23cc1..104828b 100644
--- a/arch/arm/include/armv6-m/irq.h
+++ b/arch/arm/include/armv6-m/irq.h
@@ -119,7 +119,7 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#define REG_FP REG_R7
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
diff --git a/arch/arm/include/armv7-a/irq.h b/arch/arm/include/armv7-a/irq.h
index c954408..7bbc787 100644
--- a/arch/arm/include/armv7-a/irq.h
+++ b/arch/arm/include/armv7-a/irq.h
@@ -183,7 +183,11 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#ifdef CONFIG_ARM_THUMB
+ #define REG_FP REG_R7
+#else
+ #define REG_FP REG_R11
+#endif /* CONFIG_ARM_THUMB */
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h
index 3ba7c73..96fd94c 100644
--- a/arch/arm/include/armv7-m/irq.h
+++ b/arch/arm/include/armv7-m/irq.h
@@ -75,7 +75,7 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#define REG_FP REG_R7
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
diff --git a/arch/arm/include/armv7-r/irq.h b/arch/arm/include/armv7-r/irq.h
index bf502a4..5acced1 100644
--- a/arch/arm/include/armv7-r/irq.h
+++ b/arch/arm/include/armv7-r/irq.h
@@ -183,7 +183,11 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#ifdef CONFIG_ARM_THUMB
+ #define REG_FP REG_R7
+#else
+ #define REG_FP REG_R11
+#endif /* CONFIG_ARM_THUMB */
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
diff --git a/arch/arm/include/armv8-m/irq.h b/arch/arm/include/armv8-m/irq.h
index 8898f30..a89de90 100644
--- a/arch/arm/include/armv8-m/irq.h
+++ b/arch/arm/include/armv8-m/irq.h
@@ -75,7 +75,7 @@
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
-#define REG_FP REG_R11
+#define REG_FP REG_R7
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14