projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor/stm32f1x: Add support for GD32E23x
[fw/openocd]
/
src
/
target
/
arm966e.c
diff --git
a/src/target/arm966e.c
b/src/target/arm966e.c
index a174eab4073b82ac02e03215072027de43ad680e..b6d3e50e3fef7ae5f345ecb5ab51129a013245f0 100644
(file)
--- a/
src/target/arm966e.c
+++ b/
src/target/arm966e.c
@@
-16,9
+16,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-58,11
+56,21
@@
static int arm966e_target_create(struct target *target, Jim_Interp *interp)
return arm966e_init_arch_info(target, arm966e, target->tap);
}
return arm966e_init_arch_info(target, arm966e, target->tap);
}
-static int arm966e_verify_pointer(struct command_context *cmd_ctx,
+static void arm966e_deinit_target(struct target *target)
+{
+ struct arm *arm = target_to_arm(target);
+ struct arm966e_common *arm966e = target_to_arm966(target);
+
+ arm7_9_deinit(target);
+ arm_free_reg_cache(arm);
+ free(arm966e);
+}
+
+static int arm966e_verify_pointer(struct command_invocation *cmd,
struct arm966e_common *arm966e)
{
if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
struct arm966e_common *arm966e)
{
if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
- command_print(cmd
_ctx
, "target is not an ARM966");
+ command_print(cmd, "target is not an ARM966");
return ERROR_TARGET_INVALID;
}
return ERROR_OK;
return ERROR_TARGET_INVALID;
}
return ERROR_OK;
@@
-172,12
+180,12
@@
COMMAND_HANDLER(arm966e_handle_cp15_command)
struct target *target = get_current_target(CMD_CTX);
struct arm966e_common *arm966e = target_to_arm966(target);
struct target *target = get_current_target(CMD_CTX);
struct arm966e_common *arm966e = target_to_arm966(target);
- retval = arm966e_verify_pointer(CMD
_CTX
, arm966e);
+ retval = arm966e_verify_pointer(CMD, arm966e);
if (retval != ERROR_OK)
return retval;
if (target->state != TARGET_HALTED) {
if (retval != ERROR_OK)
return retval;
if (target->state != TARGET_HALTED) {
- command_print(CMD
_CTX
, "target must be stopped for \"%s\" command", CMD_NAME);
+ command_print(CMD, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
return ERROR_OK;
}
@@
-190,8
+198,8
@@
COMMAND_HANDLER(arm966e_handle_cp15_command)
uint32_t value;
retval = arm966e_read_cp15(target, address, &value);
if (retval != ERROR_OK) {
uint32_t value;
retval = arm966e_read_cp15(target, address, &value);
if (retval != ERROR_OK) {
- command_print(CMD
_CTX
,
- "couldn't access reg %" PRI
i
32,
+ command_print(CMD,
+ "couldn't access reg %" PRI
u
32,
address);
return ERROR_OK;
}
address);
return ERROR_OK;
}
@@
-199,19
+207,19
@@
COMMAND_HANDLER(arm966e_handle_cp15_command)
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
- command_print(CMD
_CTX, "%" PRIi
32 ": %8.8" PRIx32,
+ command_print(CMD
, "%" PRIu
32 ": %8.8" PRIx32,
address, value);
} else if (CMD_ARGC == 2) {
uint32_t value;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
retval = arm966e_write_cp15(target, address, value);
if (retval != ERROR_OK) {
address, value);
} else if (CMD_ARGC == 2) {
uint32_t value;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
retval = arm966e_write_cp15(target, address, value);
if (retval != ERROR_OK) {
- command_print(CMD
_CTX
,
- "couldn't access reg %" PRI
i
32,
+ command_print(CMD,
+ "couldn't access reg %" PRI
u
32,
address);
return ERROR_OK;
}
address);
return ERROR_OK;
}
- command_print(CMD
_CTX, "%" PRIi
32 ": %8.8" PRIx32,
+ command_print(CMD
, "%" PRIu
32 ": %8.8" PRIx32,
address, value);
}
}
address, value);
}
}
@@
-261,6
+269,7
@@
struct target_type arm966e_target = {
.deassert_reset = arm7_9_deassert_reset,
.soft_reset_halt = arm7_9_soft_reset_halt,
.deassert_reset = arm7_9_deassert_reset,
.soft_reset_halt = arm7_9_soft_reset_halt,
+ .get_gdb_arch = arm_get_gdb_arch,
.get_gdb_reg_list = arm_get_gdb_reg_list,
.read_memory = arm7_9_read_memory,
.get_gdb_reg_list = arm_get_gdb_reg_list,
.read_memory = arm7_9_read_memory,
@@
-279,6
+288,7
@@
struct target_type arm966e_target = {
.commands = arm966e_command_handlers,
.target_create = arm966e_target_create,
.init_target = arm9tdmi_init_target,
.commands = arm966e_command_handlers,
.target_create = arm966e_target_create,
.init_target = arm9tdmi_init_target,
+ .deinit_target = arm966e_deinit_target,
.examine = arm7_9_examine,
.check_reset = arm7_9_check_reset,
};
.examine = arm7_9_examine,
.check_reset = arm7_9_check_reset,
};