From 17fa4de8541ac12fad2ce836aa61d22dbf1642c8 Mon Sep 17 00:00:00 2001 From: zwelch Date: Sun, 31 May 2009 11:31:11 +0000 Subject: [PATCH] Add target_step wrapper: - replaces all calls to target->type->step. git-svn-id: svn://svn.berlios.de/openocd/trunk@1965 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/server/gdb_server.c | 3 ++- src/target/target.c | 6 ++++++ src/target/target.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 4a6bc035d..23748e7c6 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -1366,7 +1366,8 @@ int gdb_step_continue_packet(connection_t *connection, target_t *target, char *p else if (packet[0] == 's') { LOG_DEBUG("step"); - retval=target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ + /* step at current or address, don't handle breakpoints */ + retval = target_step(target, current, address, 0); } return retval; } diff --git a/src/target/target.c b/src/target/target.c index 7a4548ccc..993b8c613 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -548,6 +548,12 @@ int target_get_gdb_reg_list(struct target_s *target, { return target->type->get_gdb_reg_list(target, reg_list, reg_list_size); } +int target_step(struct target_s *target, + int current, u32 address, int handle_breakpoints) +{ + return target->type->step(target, current, address, handle_breakpoints); +} + int target_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, diff --git a/src/target/target.h b/src/target/target.h index 1b2889388..3d9d8e9f9 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -410,6 +410,13 @@ extern void target_reset_examined(struct target_s *target); extern int target_get_gdb_reg_list(struct target_s *target, struct reg_s **reg_list[], int *reg_list_size); +/** + * Step the target. + * + * This routine is a wrapper for target->type->step. + */ +int target_step(struct target_s *target, + int current, u32 address, int handle_breakpoints); /** * Run an algorithm on the @a target given. * -- 2.30.2