diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-09-24 09:43:31 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-09-24 09:43:31 +0000 |
| commit | f9a3c36cf26b209e04f0f67e0d2b6a844b6b5873 (patch) | |
| tree | 14f254402ba7cba5f978fd4314b3f7bf1c10d3e0 | |
| parent | 7442b26d45dc42be4cfb93775c84a8688be40c0b (diff) | |
| download | openocd+libswd-f9a3c36cf26b209e04f0f67e0d2b6a844b6b5873.tar.gz openocd+libswd-f9a3c36cf26b209e04f0f67e0d2b6a844b6b5873.tar.bz2 openocd+libswd-f9a3c36cf26b209e04f0f67e0d2b6a844b6b5873.tar.xz openocd+libswd-f9a3c36cf26b209e04f0f67e0d2b6a844b6b5873.zip | |
fix noise in gdb console when single stepping. Remove printing of log before processing halted event.
git-svn-id: svn://svn.berlios.de/openocd/trunk@994 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/server/gdb_server.c | 2 | ||||
| -rw-r--r-- | src/target/target.c | 8 | ||||
| -rw-r--r-- | src/target/target.h | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 6c369a3a..b5a35f58 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -665,7 +665,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event target_handle_event( target, event ); switch (event) { - case TARGET_EVENT_HALTED: + case TARGET_EVENT_EARLY_HALTED: gdb_frontend_halted(target, connection); break; case TARGET_EVENT_GDB_FLASH_ERASE_START: diff --git a/src/target/target.c b/src/target/target.c index 5542b335..d42b41a8 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -171,6 +171,7 @@ const Jim_Nvp nvp_target_event[] = { { .value = TARGET_EVENT_OLD_pre_resume , .name = "old-pre_resume" }, + { .value = TARGET_EVENT_EARLY_HALTED, .name = "early-halted" }, { .value = TARGET_EVENT_HALTED, .name = "halted" }, { .value = TARGET_EVENT_RESUMED, .name = "resumed" }, { .value = TARGET_EVENT_RESUME_START, .name = "resume-start" }, @@ -797,6 +798,13 @@ int target_call_event_callbacks(target_t *target, enum target_event event) target_event_callback_t *callback = target_event_callbacks; target_event_callback_t *next_callback; + if (event == TARGET_EVENT_HALTED) + { + /* execute early halted first */ + target_call_event_callbacks(target, TARGET_EVENT_EARLY_HALTED); + } + + LOG_DEBUG("target event %i (%s)", event, Jim_Nvp_value2name_simple( nvp_target_event, event )->name ); diff --git a/src/target/target.h b/src/target/target.h index efa0c645..5b160d12 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -281,6 +281,10 @@ enum target_event TARGET_EVENT_OLD_post_reset, TARGET_EVENT_OLD_pre_resume, + /* allow GDB to do stuff before others handle the halted event, + this is in lieu of defining ordering of invocation of events, + which would be more complicated */ + TARGET_EVENT_EARLY_HALTED, TARGET_EVENT_HALTED, /* target entered debug state from normal execution or reset */ TARGET_EVENT_RESUMED, /* target resumed to normal execution */ TARGET_EVENT_RESUME_START, |