diff options
| author | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-18 10:08:13 +0000 |
|---|---|---|
| committer | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-18 10:08:13 +0000 |
| commit | 0bba832713cca8e5931d5d21f37f526d0a3979cf (patch) | |
| tree | a6c657cd1661df9fca66bd97b26d9d9823ae4ca5 /src/target/etm.c | |
| parent | 13de2d2fefb80b93aa0bde9bcd447b7e1bb24c47 (diff) | |
| download | openocd+libswd-0bba832713cca8e5931d5d21f37f526d0a3979cf.tar.gz openocd+libswd-0bba832713cca8e5931d5d21f37f526d0a3979cf.tar.bz2 openocd+libswd-0bba832713cca8e5931d5d21f37f526d0a3979cf.tar.xz openocd+libswd-0bba832713cca8e5931d5d21f37f526d0a3979cf.zip | |
The following patches was applied:
- openocd-flash-static-keyword-v3.patch
- openocd-lpc2000-fix-erase-obo.patch
- openocd-jlink-fix-sign-ptr-warn.patch
- openocd-wextra-etm.patch
- openocd-wextra-jtag.patch
- openocd-add-new-tap-symbols-v6.patch
Many thanks to Zach Welch <zw(at)superlucidity.net>
git-svn-id: svn://svn.berlios.de/openocd/trunk@1462 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/etm.c')
| -rw-r--r-- | src/target/etm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/etm.c b/src/target/etm.c index e0aac07f..2e422ee6 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -371,12 +371,12 @@ int etm_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[2].in_handler = NULL; fields[2].in_handler_priv = NULL; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); fields[0].in_value = reg->value; jtag_set_check_value(fields+0, check_value, check_mask, NULL); - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); free(fields[1].out_value); free(fields[2].out_value); @@ -463,7 +463,7 @@ int etm_write_reg(reg_t *reg, u32 value) fields[2].in_handler = NULL; fields[2].in_handler_priv = NULL; - jtag_add_dr_scan(3, fields, -1); + jtag_add_dr_scan(3, fields, TAP_INVALID); free(fields[0].out_value); free(fields[1].out_value); @@ -883,7 +883,7 @@ int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd_ctx) continue; /* indirect branch to the exception vector means an exception occured */ - if (((ctx->last_branch >= 0x0) && (ctx->last_branch <= 0x20)) + if ((ctx->last_branch <= 0x20) || ((ctx->last_branch >= 0xffff0000) && (ctx->last_branch <= 0xffff0020))) { if ((ctx->last_branch & 0xff) == 0x10) |