X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2Frtos_ecos_stackings.c;h=53ba171f15c95bd4c00582f649d963764dd7324b;hb=528197ba2cf2b208efa4d5c8465a9044567e8d69;hp=a81b4771909f1f3ff7f1bb81064431f9d0eaa5b9;hpb=a57daf23db62738754c309dfcda0f4f3cfa62fa6;p=openocd.git

diff --git a/src/rtos/rtos_ecos_stackings.c b/src/rtos/rtos_ecos_stackings.c
index a81b477190..53ba171f15 100644
--- a/src/rtos/rtos_ecos_stackings.c
+++ b/src/rtos/rtos_ecos_stackings.c
@@ -13,7 +13,7 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -21,43 +21,32 @@
 #endif
 
 #include "rtos.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] = {
+	{ 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,   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 = {
+	0x44,					/* stack_registers_size */
+	-1,						/* stack_growth_direction */
+	ARMV7M_NUM_CORE_REGS,	/* num_output_registers */
+	8,						/* stack_alignment */
+	rtos_eCos_Cortex_M3_stack_offsets	/* register_offsets */
 };
-
-