diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 17:55:30 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 17:55:30 -0800 |
| commit | 1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d (patch) | |
| tree | ff8a6912f6577211f45c0823d8a63b3ab7e57e03 | |
| parent | 1f3e067b860927f18f88c5dbb11c7aefe22252a5 (diff) | |
| download | openocd+libswd-1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d.tar.gz openocd+libswd-1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d.tar.bz2 openocd+libswd-1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d.tar.xz openocd+libswd-1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d.zip | |
MIPS: no exit() calls
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
| -rw-r--r-- | src/target/mips32.c | 2 | ||||
| -rw-r--r-- | src/target/mips_m4k.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/target/mips32.c b/src/target/mips32.c index 6ba433c3..1315744c 100644 --- a/src/target/mips32.c +++ b/src/target/mips32.c @@ -268,7 +268,7 @@ int mips32_arch_state(struct target *target) if (mips32->common_magic != MIPS32_COMMON_MAGIC) { LOG_ERROR("BUG: called for a non-MIPS32 target"); - exit(-1); + return ERROR_FAIL; } LOG_USER("target halted due to %s, pc: 0x%8.8" PRIx32 "", diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index d1d34810..864ede07 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -513,10 +513,9 @@ int mips_m4k_set_breakpoint(struct target *target, struct breakpoint *breakpoint bp_num++; if (bp_num >= mips32->num_inst_bpoints) { - LOG_DEBUG("ERROR Can not find free FP Comparator(bpid: %d)", + LOG_ERROR("Can not find free FP Comparator(bpid: %d)", breakpoint->unique_id ); - LOG_WARNING("ERROR Can not find free FP Comparator"); - exit(-1); + return ERROR_FAIL; } breakpoint->set = bp_num + 1; comparator_list[bp_num].used = 1; @@ -724,9 +723,8 @@ int mips_m4k_set_watchpoint(struct target *target, struct watchpoint *watchpoint wp_num++; if (wp_num >= mips32->num_data_bpoints) { - LOG_DEBUG("ERROR Can not find free FP Comparator"); - LOG_WARNING("ERROR Can not find free FP Comparator"); - exit(-1); + LOG_ERROR("Can not find free FP Comparator"); + return ERROR_FAIL; } if (watchpoint->length != 4) |