X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2Frtos_chibios_stackings.c;h=2887930bdc825399ad55f1853ea773d7711117ff;hb=refs%2Fchanges%2F21%2F4121%2F9;hp=e138b0684a0c22e5eb22232d608821b37494ed9f;hpb=9413a7a814755f3fab92f460bfbdd518f24ffaf5;p=openocd.git

diff --git a/src/rtos/rtos_chibios_stackings.c b/src/rtos/rtos_chibios_stackings.c
index e138b0684a..2887930bdc 100644
--- a/src/rtos/rtos_chibios_stackings.c
+++ b/src/rtos/rtos_chibios_stackings.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -29,23 +27,23 @@
 #include "target/armv7m.h"
 
 static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
-	{ -1,   32 },		/* r0   */
-	{ -1,   32 },		/* r1   */
-	{ -1,   32 },		/* r2   */
-	{ -1,   32 },		/* r3   */
-	{ 0x00, 32 },		/* r4   */
-	{ 0x04, 32 },		/* r5   */
-	{ 0x08, 32 },		/* r6   */
-	{ 0x0c, 32 },		/* r7   */
-	{ 0x10, 32 },		/* r8   */
-	{ 0x14, 32 },		/* r9   */
-	{ 0x18, 32 },		/* r10  */
-	{ 0x1c, 32 },		/* r11  */
-	{ -1,   32 },		/* r12  */
-	{ -2,   32 },		/* sp   */
-	{ -1,   32 },		/* lr   */
-	{ 0x20, 32 },		/* pc   */
-	{ -1,   32 },		/* xPSR */
+	{ ARMV7M_R0,   -1,   32 },		/* r0   */
+	{ ARMV7M_R1,   -1,   32 },		/* r1   */
+	{ ARMV7M_R2,   -1,   32 },		/* r2   */
+	{ ARMV7M_R3,   -1,   32 },		/* r3   */
+	{ ARMV7M_R4,   0x00, 32 },		/* r4   */
+	{ ARMV7M_R5,   0x04, 32 },		/* r5   */
+	{ ARMV7M_R6,   0x08, 32 },		/* r6   */
+	{ ARMV7M_R7,   0x0c, 32 },		/* r7   */
+	{ ARMV7M_R8,   0x10, 32 },		/* r8   */
+	{ ARMV7M_R9,   0x14, 32 },		/* r9   */
+	{ ARMV7M_R10,  0x18, 32 },		/* r10  */
+	{ ARMV7M_R11,  0x1c, 32 },		/* r11  */
+	{ ARMV7M_R12,  -1,   32 },		/* r12  */
+	{ ARMV7M_R13,  -2,   32 },		/* sp   */
+	{ ARMV7M_R14,  -1,   32 },		/* lr   */
+	{ ARMV7M_PC,   0x20, 32 },		/* pc   */
+	{ ARMV7M_xPSR, -1,   32 },		/* xPSR */
 };
 
 const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking = {
@@ -57,23 +55,23 @@ const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking = {
 };
 
 static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets_w_fpu[ARMV7M_NUM_CORE_REGS] = {
-	{ -1,   32 },		/* r0   */
-	{ -1,   32 },		/* r1   */
-	{ -1,   32 },		/* r2   */
-	{ -1,   32 },		/* r3   */
-	{ 0x40, 32 },		/* r4   */
-	{ 0x44, 32 },		/* r5   */
-	{ 0x48, 32 },		/* r6   */
-	{ 0x4c, 32 },		/* r7   */
-	{ 0x50, 32 },		/* r8   */
-	{ 0x54, 32 },		/* r9   */
-	{ 0x58, 32 },		/* r10  */
-	{ 0x5c, 32 },		/* r11  */
-	{ -1,   32 },		/* r12  */
-	{ -2,   32 },		/* sp   */
-	{ -1,   32 },		/* lr   */
-	{ 0x60, 32 },		/* pc   */
-	{ -1,   32 },		/* xPSR */
+	{ ARMV7M_R0,   -1,   32 },		/* r0   */
+	{ ARMV7M_R1,   -1,   32 },		/* r1   */
+	{ ARMV7M_R2,   -1,   32 },		/* r2   */
+	{ ARMV7M_R3,   -1,   32 },		/* r3   */
+	{ ARMV7M_R4,   0x40, 32 },		/* r4   */
+	{ ARMV7M_R5,   0x44, 32 },		/* r5   */
+	{ ARMV7M_R6,   0x48, 32 },		/* r6   */
+	{ ARMV7M_R7,   0x4c, 32 },		/* r7   */
+	{ ARMV7M_R8,   0x50, 32 },		/* r8   */
+	{ ARMV7M_R9,   0x54, 32 },		/* r9   */
+	{ ARMV7M_R10,  0x58, 32 },		/* r10  */
+	{ ARMV7M_R11,  0x5c, 32 },		/* r11  */
+	{ ARMV7M_R12,  -1,   32 },		/* r12  */
+	{ ARMV7M_R13,  -2,   32 },		/* sp   */
+	{ ARMV7M_R14,  -1,   32 },		/* lr   */
+	{ ARMV7M_PC,   0x60, 32 },		/* pc   */
+	{ ARMV7M_xPSR, -1,   32 },		/* xPSR */
 };
 
 const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking_w_fpu = {