X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2Frtos_mqx_stackings.c;h=087591baaa6d254a7b44bd1af132a7d37b8c8c50;hb=0c6e0bb82bef9c93506e2f30fc20918691540e65;hp=8f2d67ea9c03f616bf06c38c4da636ccef62fb77;hpb=c50047bb418da6a4ed735ca87acee04e7fd2dbe7;p=openocd.git

diff --git a/src/rtos/rtos_mqx_stackings.c b/src/rtos/rtos_mqx_stackings.c
index 8f2d67ea9c..087591baaa 100644
--- a/src/rtos/rtos_mqx_stackings.c
+++ b/src/rtos/rtos_mqx_stackings.c
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2014 by Marian Cingel                                   *
  *   cingel.marian@gmail.com                                               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.                                        *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -52,30 +40,28 @@
  */
 
 static const struct stack_register_offset rtos_mqx_arm_v7m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
-	{ 0x2C, 32 }, /* r0   */
-	{ 0x30, 32 }, /* r1   */
-	{ 0x34, 32 }, /* r2   */
-	{ 0x38, 32 }, /* r3   */
-	{ 0x08, 32 }, /* r4   */
-	{ 0x0C, 32 }, /* r5   */
-	{ 0x10, 32 }, /* r6   */
-	{ 0x14, 32 }, /* r7   */
-	{ 0x18, 32 }, /* r8   */
-	{ 0x1C, 32 }, /* r9   */
-	{ 0x20, 32 }, /* r10  */
-	{ 0x24, 32 }, /* r11  */
-	{ 0x3C, 32 }, /* r12  */
-	{  -2 , 32 }, /* sp   */
-	{ 0x28, 32 }, /* lr   */
-	{ 0x44, 32 }, /* pc   */
-	{ 0x48, 32 }, /* xPSR */
+	{ ARMV7M_R0,   0x2C, 32 }, /* r0   */
+	{ ARMV7M_R1,   0x30, 32 }, /* r1   */
+	{ ARMV7M_R2,   0x34, 32 }, /* r2   */
+	{ ARMV7M_R3,   0x38, 32 }, /* r3   */
+	{ ARMV7M_R4,   0x08, 32 }, /* r4   */
+	{ ARMV7M_R5,   0x0C, 32 }, /* r5   */
+	{ ARMV7M_R6,   0x10, 32 }, /* r6   */
+	{ ARMV7M_R7,   0x14, 32 }, /* r7   */
+	{ ARMV7M_R8,   0x18, 32 }, /* r8   */
+	{ ARMV7M_R9,   0x1C, 32 }, /* r9   */
+	{ ARMV7M_R10,  0x20, 32 }, /* r10  */
+	{ ARMV7M_R11,  0x24, 32 }, /* r11  */
+	{ ARMV7M_R12,  0x3C, 32 }, /* r12  */
+	{ ARMV7M_R13,    -2, 32 }, /* sp   */
+	{ ARMV7M_R14,  0x28, 32 }, /* lr   */
+	{ ARMV7M_PC,   0x44, 32 }, /* pc   */
+	{ ARMV7M_XPSR, 0x48, 32 }, /* xPSR */
 };
 
 const struct rtos_register_stacking rtos_mqx_arm_v7m_stacking = {
-	0x4C,					/* stack_registers_size, calculate offset base address */
-	-1,						/* stack_growth_direction */
-	ARMV7M_NUM_CORE_REGS,	/* num_output_registers */
-	0,						/* stack_alignment */
-	rtos_mqx_arm_v7m_stack_offsets	/* register_offsets */
+	.stack_registers_size = 0x4C,					/* calculate offset base address */
+	.stack_growth_direction = -1,
+	.num_output_registers = ARMV7M_NUM_CORE_REGS,
+	.register_offsets = rtos_mqx_arm_v7m_stack_offsets
 };
-