X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2Frtos_chibios_stackings.c;h=38a2889bd94b69a3d5b826f09d6a73b95c6f0a85;hb=0c6e0bb82bef9c93506e2f30fc20918691540e65;hp=e138b0684a0c22e5eb22232d608821b37494ed9f;hpb=9413a7a814755f3fab92f460bfbdd518f24ffaf5;p=fw%2Fopenocd

diff --git a/src/rtos/rtos_chibios_stackings.c b/src/rtos/rtos_chibios_stackings.c
index e138b0684..38a2889bd 100644
--- 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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -29,57 +16,55 @@
 #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 = {
-	0x24,					/* stack_registers_size */
-	-1,						/* stack_growth_direction */
-	ARMV7M_NUM_CORE_REGS,	/* num_output_registers */
-	NULL,					/* 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] = {
-	{ -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 = {
-	0x64,										/* stack_registers_size */
-	-1,											/* stack_growth_direction */
-	ARMV7M_NUM_CORE_REGS,						/* num_output_registers */
-	NULL,										/* stack_alignment */
-	rtos_chibios_arm_v7m_stack_offsets_w_fpu	/* register_offsets */
+	.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
 };