openocd: remove CamelCase symbols *xPSR*

[fw/openocd] / src / rtos / rtos_chibios_stackings.c

diff --git a/src/rtos/rtos_chibios_stackings.c b/src/rtos/rtos_chibios_stackings.c
index 2163f060957cb559ac7193e15db79cd11090d9d2..38a2889bd94b69a3d5b826f09d6a73b95c6f0a85 100644 (file)
--- a/src/rtos/rtos_chibios_stackings.c
+++ b/src/rtos/rtos_chibios_stackings.c
@@ -1,24 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2012 by Matthias Blaicher                               *
  *   Matthias Blaicher - matthias@blaicher.com                             *
  *                                                                         *
  *   Copyright (C) 2011 by Broadcom Corporation                            *
  *   Evan Hunter - ehunter@broadcom.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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -26,40 +13,58 @@
 #endif
 
 #include "rtos.h"
+#include "target/armv7m.h"
 
-static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[] = {
-       { -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,   96 },           /* FPA1 */
-       { -1,   96 },           /* FPA2 */
-       { -1,   96 },           /* FPA3 */
-       { -1,   96 },           /* FPA4 */
-       { -1,   96 },           /* FPA5 */
-       { -1,   96 },           /* FPA6 */
-       { -1,   96 },           /* FPA7 */
-       { -1,   96 },           /* FPA8 */
-       { -1,   32 },           /* FPS  */
-       { -1,   32 },           /* xPSR */
+static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
+       { 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 = {
-       0x24,                                   /* stack_registers_size */
-       -1,                                     /* stack_growth_direction */
-       26,                                     /* num_output_registers */
-       0,                                      /* stack_alignment */
-       rtos_chibios_arm_v7m_stack_offsets      /* register_offsets */
+       .stack_registers_size = 0x24,
+       .stack_growth_direction = -1,
+       .num_output_registers = ARMV7M_NUM_CORE_REGS,
+       .register_offsets = rtos_chibios_arm_v7m_stack_offsets
+};
+
+static const struct stack_register_offset rtos_chibios_arm_v7m_stack_offsets_w_fpu[ARMV7M_NUM_CORE_REGS] = {
+       { 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 = {
+       .stack_registers_size = 0x64,
+       .stack_growth_direction = -1,
+       .num_output_registers = ARMV7M_NUM_CORE_REGS,
+       .register_offsets = rtos_chibios_arm_v7m_stack_offsets_w_fpu
 };