Merge GDB 7.5.1

gdb/testsuite/lib/gdbserver-support.exp

 # Copyright 2000, 2002-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 51 matching lines @@
                 verbose "Connection failed"
             }
             -re "Remote MIPS debugging.*$gdb_prompt" {
                 verbose "Set target to $targetname"
                 return 0
             }
             -re "Remote debugging using .*$serialport_re.*$gdb_prompt $" {
                 verbose "Set target to $targetname"
                 return 0
             }
+            -re "Remote debugging using stdio.*$gdb_prompt $" {
+                verbose "Set target to $targetname"
+                return 0
+            }
             -re "Remote target $targetname connected to.*$gdb_prompt $" {
                 verbose "Set target to $targetname"
                 return 0
             }
             -re "Connected to.*$gdb_prompt $" { 
                 verbose "Set target to $targetname"
                 return 0
             }
             -re "Ending remote.*$gdb_prompt $" { }
             -re "Connection refused.*$gdb_prompt $" {
@@ skipping 93 matching lines @@
         if [is_remote target] {
             set gdbserver_server_exec [gdb_download $host_exec]
         } else {
             set gdbserver_server_exec $host_exec
         }
     }
 
     return $gdbserver_server_exec
 }
 
+# Default routine to compute the argument to "target remote".
+
+proc gdbserver_default_get_remote_address { host port } {
+    return "$host$port"
+}
+
 # Start a gdbserver process with initial OPTIONS and trailing ARGUMENTS.
 # The port will be filled in between them automatically.
 #
 # Returns the target protocol and socket to connect to.
 
 proc gdbserver_start { options arguments } {
     global portnum
 
     # Port id -- either specified in baseboard file, or managed here.
     if [target_info exists gdb,socketport] {
         set portnum [target_info gdb,socketport]
     } else {
         # Bump the port number to avoid conflicts with hung ports.
         incr portnum
     }
 
     # Extract the local and remote host ids from the target board struct.
     if [target_info exists sockethost] {
         set debughost [target_info sockethost]
     } else {
         set debughost "localhost:"
     }
 
+    # Some boards use a different value for the port that is passed to
+    # gdbserver and the port that is passed to the "target remote" command.
+    # One example is the stdio gdbserver support.
+    if [target_info exists gdb,get_remote_address] {
+        set get_remote_address [target_info gdb,get_remote_address]
+    } else {
+        set get_remote_address gdbserver_default_get_remote_address
+    }
+
     # Extract the protocol
     if [target_info exists gdb_protocol] {
         set protocol [target_info gdb_protocol]
     } else {
         set protocol "remote"
     }
 
     set gdbserver [find_gdbserver]
 
     # Loop till we find a free port.
     while 1 {
-        # Export the host:port pair.
-        set gdbport $debughost$portnum
-
         # Fire off the debug agent.
         set gdbserver_command "$gdbserver"
 
         # If gdbserver_reconnect will be called $gdbserver_reconnect_p must be
         # set to true already during gdbserver_start.
         global gdbserver_reconnect_p
         if {![info exists gdbserver_reconnect_p] || !$gdbserver_reconnect_p} {
             # GDB client could accidentally connect to a stale server.
             # append gdbserver_command " --debug --once"
             append gdbserver_command " --once"
         }
 
         if { $options != "" } {
             append gdbserver_command " $options"
         }
-
-        append gdbserver_command " :$portnum"
-
+        if { $portnum != "" } {
+            append gdbserver_command " :$portnum"
+        }
         if { $arguments != "" } {
             append gdbserver_command " $arguments"
         }
 
         set server_spawn_id [remote_spawn target $gdbserver_command]
 
         # Wait for the server to open its TCP socket, so that GDB can connect.
         expect {
             -i $server_spawn_id
             -notransfer
@@ skipping 17 matching lines @@
     # don't need to redirect output.
     expect_background {
         -i $server_spawn_id
         full_buffer { }
         eof {
             # The spawn ID is already closed now (but not yet waited for).
             wait -i $expect_out(spawn_id)
         }
     }
 
-    return [list $protocol $gdbport]
+    return [list $protocol [$get_remote_address $debughost $portnum]]
 }
 
 # Start a gdbserver process running SERVER_EXEC, and connect GDB
 # to it.  CHILD_ARGS are passed to the inferior.
 #
 # Returns the target protocol and socket to connect to.
 
 proc gdbserver_spawn { child_args } {
     set target_exec [gdbserver_download_current_prog]
 
@@ skipping 44 matching lines @@
 
     global gdbserver_reconnect_p;
     if {![info exists gdbserver_reconnect_p] || !$gdbserver_reconnect_p} {
         error "gdbserver_reconnect_p is not set before gdbserver_reconnect"
         return 0
     }
 
     return [gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport]
 }
 
-# Start and connect to a gdbserver in extended mode.
+# Start and connect to a gdbserver in extended mode.  Note this frobs
+# $gdbserver_protocol, so should be used only from a board that
+# usually connects in target remote mode.
 proc gdbserver_start_extended { } {
     global gdbserver_protocol
     global gdbserver_gdbport
     global use_gdb_stub
 
     set res [gdbserver_start "--multi" ""]
-    set gdbserver_protocol "extended-[lindex $res 0]"
+    set gdbserver_protocol [lindex $res 0]
+    if { [string first "extended-" $gdbserver_protocol] != 0} {
+        set gdbserver_protocol "extended-$gdbserver_protocol"
+    }
     set gdbserver_gdbport [lindex $res 1]
 
     # Even if the board file is testing with target remote, our caller
     # wants to test against gdbserver in extended-remote mode.  Make sure to
     # disable stub-like techniques.
     set use_gdb_stub 0
 
     return [gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport]
 }
+
+# Start and connect to a gdbserver in extended/multi mode.  Unlike
+# gdbserver_start_extended, this does not frob $gdbserver_protocol.
+
+proc gdbserver_start_multi { } {
+    global gdbserver_protocol
+    global gdbserver_gdbport
+
+    set res [gdbserver_start "--multi" ""]
+    set gdbserver_protocol [lindex $res 0]
+    set gdbserver_gdbport [lindex $res 1]
+
+    return [gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport]
+}
+
+# Start a gdbserver process in multi/extended mode, and have GDB
+# connect to it (MI version).  Return 0 on success, or non-zero on
+# failure.
+
+proc mi_gdbserver_start_multi { } {
+    global gdbserver_protocol
+    global gdbserver_gdbport
+
+    set res [gdbserver_start "--multi" ""]
+    set gdbserver_protocol [lindex $res 0]
+    set gdbserver_gdbport [lindex $res 1]
+
+    return [mi_gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport]
+}