X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2Frtos_ecos_stackings.c;h=0f54e86f7c52479a8ad06f1ac7668c4c0fdd328d;hb=382148e4dd437978997d668f6ec715ddcec1c46e;hp=a81b4771909f1f3ff7f1bb81064431f9d0eaa5b9;hpb=a57daf23db62738754c309dfcda0f4f3cfa62fa6;p=fw%2Fopenocd

diff --git a/src/rtos/rtos_ecos_stackings.c b/src/rtos/rtos_ecos_stackings.c
index a81b47719..0f54e86f7 100644
--- a/src/rtos/rtos_ecos_stackings.c
+++ b/src/rtos/rtos_ecos_stackings.c
@@ -1,63 +1,37 @@
-/***************************************************************************
- *                                                                         *
- *   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.             *
- ***************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "rtos.h"
+#include "rtos_standard_stackings.h"
+#include "target/armv7m.h"
 
-static const struct stack_register_offset rtos_eCos_Cortex_M3_stack_offsets [] =
-{ { 0x0c, 32 },       // r0
-  { 0x10, 32 },       // r1
-  { 0x14, 32 },       // r2
-  { 0x18, 32 },       // r3
-  { 0x1c, 32 },       // r4
-  { 0x20, 32 },       // r5
-  { 0x24, 32 },       // r6
-  { 0x28, 32 },       // r7
-  { 0x2c, 32 },       // r8
-  { 0x30, 32 },       // r9
-  { 0x34, 32 },       // r10
-  { 0x38, 32 },       // r11
-  { 0x3c, 32 },       // r12
-  { -2,   32 },       // sp
-  { -1,   32 },       // lr
-  { 0x40, 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_ecos_cortex_m3_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
+	{ ARMV7M_R0,   0x0c, 32 },		/* r0   */
+	{ ARMV7M_R1,   0x10, 32 },		/* r1   */
+	{ ARMV7M_R2,   0x14, 32 },		/* r2   */
+	{ ARMV7M_R3,   0x18, 32 },		/* r3   */
+	{ ARMV7M_R4,   0x1c, 32 },		/* r4   */
+	{ ARMV7M_R5,   0x20, 32 },		/* r5   */
+	{ ARMV7M_R6,   0x24, 32 },		/* r6   */
+	{ ARMV7M_R7,   0x28, 32 },		/* r7   */
+	{ ARMV7M_R8,   0x2c, 32 },		/* r8   */
+	{ ARMV7M_R9,   0x30, 32 },		/* r9   */
+	{ ARMV7M_R10,  0x34, 32 },		/* r10  */
+	{ ARMV7M_R11,  0x38, 32 },		/* r11  */
+	{ ARMV7M_R12,  0x3c, 32 },		/* r12  */
+	{ ARMV7M_R13,  -2,   32 },		/* sp   */
+	{ ARMV7M_R14,  -1,   32 },		/* lr   */
+	{ ARMV7M_PC,   0x40, 32 },		/* pc   */
+	{ ARMV7M_XPSR, -1,   32 },		/* xPSR */
 };
 
-
-const struct rtos_register_stacking rtos_eCos_Cortex_M3_stacking =
-{
-          0x44,                                 // stack_registers_size
-          -1,                                   // stack_growth_direction
-          26,                                   // num_output_registers
-          rtos_eCos_Cortex_M3_stack_offsets     // register_offsets
+const struct rtos_register_stacking rtos_ecos_cortex_m3_stacking = {
+	.stack_registers_size = 0x44,
+	.stack_growth_direction = -1,
+	.num_output_registers = ARMV7M_NUM_CORE_REGS,
+	.calculate_process_stack = rtos_generic_stack_align8,
+	.register_offsets = rtos_ecos_cortex_m3_stack_offsets
 };
-
-