From 56944ac1c83c0e420117ef9f0c6f2de53c8ed424 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 6 Jul 2009 13:42:11 +0000
Subject: [PATCH] Fix regression in "step" command introduced in 2190
git-svn-id: svn://svn.berlios.de/openocd/trunk@2478 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/target/target.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/target/target.c b/src/target/target.c
index b7b465a36..e54a2c997 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2,7 +2,7 @@
* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 �yvind Harboe *
+ * Copyright (C) 2007,2008 �yvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008, Duane Ellis *
@@ -2039,15 +2039,18 @@ static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, cha
* with one argument addr = args[0],
* handle breakpoints, debugging */
uint32_t addr = 0;
+ int current_pc = 1;
if (argc == 1)
{
int retval = parse_u32(args[0], &addr);
if (ERROR_OK != retval)
return retval;
+ current_pc = 0;
}
target_t *target = get_current_target(cmd_ctx);
- return target->type->step(target, 0, addr, 1);
+
+ return target->type->step(target, current_pc, addr, 1);
}
static void handle_md_output(struct command_context_s *cmd_ctx,
--
GitLab