diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-15 11:44:36 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-10-15 11:44:36 +0000 |
| commit | ccc2e3fe760a425f831b9e1f0e143d7d01d73a25 (patch) | |
| tree | ccb4bbe1c3221f1438d12a04cdc203617d18d5ee /src/target/etb.c | |
| parent | af41e6aac8d2aadf2bcfc84a77ac0f9ded8e7830 (diff) | |
| download | openocd+libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.gz openocd+libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.bz2 openocd+libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.tar.xz openocd+libswd-ccc2e3fe760a425f831b9e1f0e143d7d01d73a25.zip | |
Laurentiu Cocanu - memory read/write and exit() error path fixes
git-svn-id: svn://svn.berlios.de/openocd/trunk@1064 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/etb.c')
| -rw-r--r-- | src/target/etb.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/target/etb.c b/src/target/etb.c index e81049d3..5aa85a1f 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -160,15 +160,17 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb) int etb_get_reg(reg_t *reg) { - if (etb_read_reg(reg) != ERROR_OK) + int retval; + if ((retval = etb_read_reg(reg)) != ERROR_OK) { LOG_ERROR("BUG: error scheduling etm register read"); - exit(-1); + return retval; } - if (jtag_execute_queue() != ERROR_OK) + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_ERROR("register read failed"); + return retval; } return ERROR_OK; @@ -311,10 +313,11 @@ int etb_read_reg(reg_t *reg) int etb_set_reg(reg_t *reg, u32 value) { - if (etb_write_reg(reg, value) != ERROR_OK) + int retval; + if ((retval = etb_write_reg(reg, value)) != ERROR_OK) { LOG_ERROR("BUG: error scheduling etm register write"); - exit(-1); + return retval; } buf_set_u32(reg->value, 0, reg->size, value); @@ -326,12 +329,13 @@ int etb_set_reg(reg_t *reg, u32 value) int etb_set_reg_w_exec(reg_t *reg, u8 *buf) { + int retval; etb_set_reg(reg, buf_get_u32(buf, 0, reg->size)); - if (jtag_execute_queue() != ERROR_OK) + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_ERROR("register write failed"); - exit(-1); + return retval; } return ERROR_OK; } |