diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2019-04-15 23:47:50 +0200 |
|---|---|---|
| committer | Matthias Welwarsky <matthias@welwarsky.de> | 2019-04-24 14:09:26 +0100 |
| commit | d3a9e535d52bebf9973babe564c09797c71a2fc2 (patch) | |
| tree | 2d5ea877ed0d7a3e5b106e2c72512b1c7ede9a09 /src | |
| parent | a4ac56152d9fc13c3fa479397407d9b86ffb13d8 (diff) | |
| download | riscv-openocd-d3a9e535d52bebf9973babe564c09797c71a2fc2.zip riscv-openocd-d3a9e535d52bebf9973babe564c09797c71a2fc2.tar.gz riscv-openocd-d3a9e535d52bebf9973babe564c09797c71a2fc2.tar.bz2 | |
target/cortex_a: fix waiting for target halted after step
Depending on adapter speed, the function cortex_a_poll() can take
time to execute and can complete successfully when the timeout is
already expired. Checking the timeout at function return causes a
timeout error while that could be avoided.
Check the target status at cortex_a_poll() return, before checking
for the timeout.
Change-Id: I4c1581f6e718298c566df7b1359255e16e3955d5
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5111
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/cortex_a.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index 6eb6aa9..8ed81b7 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -1206,6 +1206,8 @@ static int cortex_a_step(struct target *target, int current, target_addr_t addre retval = cortex_a_poll(target); if (retval != ERROR_OK) return retval; + if (target->state == TARGET_HALTED) + break; if (timeval_ms() > then + 1000) { LOG_ERROR("timeout waiting for target halt"); return ERROR_FAIL; |