From 3aef2f08589e46bbbce15a4534c4900bc2528998 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 7 Oct 2008 18:04:14 +0000
Subject: Fixes SEGFAULT when setting registers from GDB.

set $cpsr=1234

git-svn-id: svn://svn.berlios.de/openocd/trunk@1026 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/target/armv7m.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'src/target/armv7m.c')

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 38f635ea..8456754d 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -198,21 +198,6 @@ int armv7m_set_core_reg(reg_t *reg, u8 *buf)
 	return ERROR_OK;
 }
 
-int armv7m_get_dummy_core_reg(reg_t *reg)
-{
-	return ERROR_OK;
-}
-
-int armv7m_set_dummy_core_reg(reg_t *reg, u8 *buf)
-{
-	u32 value = buf_get_u32(buf, 0, 32);
-	buf_set_u32(reg->value, 0, 32, value);
-	reg->dirty = 1;
-	reg->valid = 1;
-
-	return ERROR_OK;
-}
-
 int armv7m_read_core_reg(struct target_s *target, int num)
 {
 	u32 reg_value;
@@ -485,12 +470,11 @@ reg_cache_t *armv7m_build_reg_cache(target_t *target)
 	if (armv7m_core_reg_arch_type == -1)
 	{
 		armv7m_core_reg_arch_type = register_reg_arch_type(armv7m_get_core_reg, armv7m_set_core_reg);
-		armv7m_dummy_core_reg_arch_type = register_reg_arch_type(armv7m_get_dummy_core_reg, armv7m_set_dummy_core_reg);
-
-		armv7m_gdb_dummy_fp_reg.arch_type=armv7m_dummy_core_reg_arch_type;
-		armv7m_gdb_dummy_fps_reg.arch_type=armv7m_dummy_core_reg_arch_type;
-		armv7m_gdb_dummy_cpsr_reg.arch_type=armv7m_dummy_core_reg_arch_type;
 	}
+	
+	register_init_dummy(&armv7m_gdb_dummy_fps_reg);
+	register_init_dummy(&armv7m_gdb_dummy_cpsr_reg);
+	register_init_dummy(&armv7m_gdb_dummy_fp_reg);
 		
 	/* Build the process context cache */ 
 	cache->name = "arm v7m registers";
-- 
cgit v1.2.3