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
__archive__
oharboe 2008-09-24 09:43:31 +00:00
parent 7442b26d45
commit f9a3c36cf2
3 changed files with 13 additions and 1 deletions

View File

@ -665,7 +665,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
target_handle_event( target, event ); target_handle_event( target, event );
switch (event) switch (event)
{ {
case TARGET_EVENT_HALTED: case TARGET_EVENT_EARLY_HALTED:
gdb_frontend_halted(target, connection); gdb_frontend_halted(target, connection);
break; break;
case TARGET_EVENT_GDB_FLASH_ERASE_START: case TARGET_EVENT_GDB_FLASH_ERASE_START:

View File

@ -171,6 +171,7 @@ const Jim_Nvp nvp_target_event[] = {
{ .value = TARGET_EVENT_OLD_pre_resume , .name = "old-pre_resume" }, { .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_HALTED, .name = "halted" },
{ .value = TARGET_EVENT_RESUMED, .name = "resumed" }, { .value = TARGET_EVENT_RESUMED, .name = "resumed" },
{ .value = TARGET_EVENT_RESUME_START, .name = "resume-start" }, { .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 *callback = target_event_callbacks;
target_event_callback_t *next_callback; 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)", LOG_DEBUG("target event %i (%s)",
event, event,
Jim_Nvp_value2name_simple( nvp_target_event, event )->name ); Jim_Nvp_value2name_simple( nvp_target_event, event )->name );

View File

@ -281,6 +281,10 @@ enum target_event
TARGET_EVENT_OLD_post_reset, TARGET_EVENT_OLD_post_reset,
TARGET_EVENT_OLD_pre_resume, 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_HALTED, /* target entered debug state from normal execution or reset */
TARGET_EVENT_RESUMED, /* target resumed to normal execution */ TARGET_EVENT_RESUMED, /* target resumed to normal execution */
TARGET_EVENT_RESUME_START, TARGET_EVENT_RESUME_START,