interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb_server: handle stepi/continue packet while target is running with more grace 

Rather than issuing a halt and then stepi/resume, just
wait for target to halt.

Issue a sterner warning via gdb console that any gdb
register changes will be ignored in this case.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe 2010-01-20 23:36:57 +01:00
parent 60cb5bdd30
commit 1350b6aad0
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/gdb_server.c
View File

@ -2212,12 +2212,13 @@ static int gdb_input_inner(struct connection *connection)
log_add_callback(gdb_log_callback, connection); log_add_callback(gdb_log_callback, connection);
bool nostep = false; bool nostep = false;
bool already_running = false;
if (target->state == TARGET_RUNNING) if (target->state == TARGET_RUNNING)
{ {
LOG_WARNING("The target is already running. Halt target before stepi/continue."); LOG_WARNING("WARNING! The target is already running. "
retval = target_halt(target); "All changes GDB did to registers will be discarded! "
if (retval == ERROR_OK) "Waiting for target to halt.");
retval = target_wait_state(target, TARGET_HALTED, 100); already_running = true;
} else if (target->state != TARGET_HALTED) } else if (target->state != TARGET_HALTED)
{ {
LOG_WARNING("The target is not in the halted nor running stated, stepi/continue ignored."); LOG_WARNING("The target is not in the halted nor running stated, stepi/continue ignored.");
@ -2233,7 +2234,7 @@ static int gdb_input_inner(struct connection *connection)
} }
gdb_con->sync = false; gdb_con->sync = false;
if ((retval!=ERROR_OK) || nostep) if ((retval!=ERROR_OK) || (!already_running && nostep))
{ {
/* Either the target isn't in the halted state, then we can't /* Either the target isn't in the halted state, then we can't
* step/continue. This might be early setup, etc. * step/continue. This might be early setup, etc.
@ -2253,11 +2254,15 @@ static int gdb_input_inner(struct connection *connection)
*/ */
gdb_con->frontend_state = TARGET_RUNNING; gdb_con->frontend_state = TARGET_RUNNING;
target_call_event_callbacks(target, TARGET_EVENT_GDB_START); target_call_event_callbacks(target, TARGET_EVENT_GDB_START);
int retval = gdb_step_continue_packet(connection, target, packet, packet_size);
if (retval != ERROR_OK) if (!already_running)
{ {
/* we'll never receive a halted condition... issue a false one.. */ int retval = gdb_step_continue_packet(connection, target, packet, packet_size);
gdb_frontend_halted(target, connection); if (retval != ERROR_OK)
{
/* we'll never receive a halted condition... issue a false one.. */
gdb_frontend_halted(target, connection);
}
} }
} }
} }