[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-137-g1350b6a

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  1350b6aad074c1556604c5969dee43f294371461 (commit)
      from  60cb5bdd30ec3265cbb5c1c667f5c98cbbb84aab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1350b6aad074c1556604c5969dee43f294371461
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed Jan 20 23:36:57 2010 +0100

    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 <oyv...@zy...>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index f3e0575..17ca439 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2212,12 +2212,13 @@ static int gdb_input_inner(struct connection *connection)
 						log_add_callback(gdb_log_callback, connection);
 
 						bool nostep = false;
+						bool already_running = false;
 						if (target->state == TARGET_RUNNING)
 						{
-							LOG_WARNING("The target is already running. Halt target before stepi/continue.");
-							retval = target_halt(target);
-							if (retval == ERROR_OK)
-								retval = target_wait_state(target, TARGET_HALTED, 100);
+							LOG_WARNING("WARNING! The target is already running. "
+									"All changes GDB did to registers will be discarded! "
+									"Waiting for target to halt.");
+							already_running = true;
 						} else if (target->state != TARGET_HALTED)
 						{
 							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;
 
-						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
 							 * 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;
 							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.. */
-								gdb_frontend_halted(target, connection);
+								int retval = gdb_step_continue_packet(connection, target, packet, packet_size);
+								if (retval != ERROR_OK)
+								{
+									/* we'll never receive a halted condition... issue a false one.. */
+									gdb_frontend_halted(target, connection);
+								}
 							}
 						}
 					}

-----------------------------------------------------------------------

Summary of changes:
 src/server/gdb_server.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository