PR21985: set inferior-tty doesn't work for remote or sim

  The set inferior-tty command doesn't appear to work for remote or sim
targets. (That is, remote targets using remote-fileio to have the IO appear
on the debug host).

This is a shame as Eclipse (and potentially other front-ends) use this
command to separate the windows used for target stdio and the gdb console.
Currently, therefore Eclipse isn't supporting remote and sim targets fully.

The attached patch adds support for this command in remote-fileio.c and
remote-sim.c. Reads/writes from/to stdin/stdout are redirected to the tty.

This may not be the ideal way to implement this within GDB, but it does get
it working with Eclipse. I'm not hugely familiar with what ttys should
offer, other than redirect stdio.

Cheers,
Jon


gdb/ChangeLog
	* remote-fileio.c (sim_inferior_data):  New field "tty".
	(gdb_os_read_stdin): New function.
	(get_sim_inferior_data): Initialise tty.
	(sim_inferior_data_cleanup): Close tty if opened.
	(init_callbacks): Add read_stdin callback.
	(gdb_os_write_stdout): Write to tty if opened.
	(gdb_os_write_stderr): Write to tty if opened.
	(gdbsim_create_inferior): Open tty if requested.
	* remote-sim.c (remote_fio_data): New field "tty".
	(remote_fileio_init_fd_map): Open tty if requested.
	(remote_fileio_func_read): read from tty if opened.
	(remote_fileio_func_write): write to tty if opened.
	(remote_fileio_reset): Close tty if opened.

     {
@@ -268,6 +274,8 @@ sim_inferior_data_cleanup (struct inferior *inf, void
*data)
 	  sim_close (sim_data->gdbsim_desc, 0);
 	  sim_data->gdbsim_desc = NULL;
 	}
+      if (sim_data->tty >= 0)
+        close (sim_data->tty);  
       xfree (sim_data);
     }
 }
@@ -306,6 +314,7 @@ init_callbacks (void)
     {
       gdb_callback = default_callback;
       gdb_callback.init (&gdb_callback);
+      gdb_callback.read_stdin = gdb_os_read_stdin;
       gdb_callback.write_stdout = gdb_os_write_stdout;
       gdb_callback.flush_stdout = gdb_os_flush_stdout;
       gdb_callback.write_stderr = gdb_os_write_stderr;
@@ -332,15 +341,34 @@ end_callbacks (void)
     }
 }
 
+/* GDB version of os_read_stdin callback.  */
+
+static int
+gdb_os_read_stdin (host_callback *p, char *buf, int len)
+{
+  struct sim_inferior_data *sim_data
+    = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
+  
+  if (sim_data->tty < 0) 
+    len = ui_file_read (gdb_stdtargin, buf, len);
+  else 
+    len = read (sim_data->tty, buf, len);
+  return len;
+}
+
 /* GDB version of os_write_stdout callback.  */
 
 static int
 gdb_os_write_stdout (host_callback *p, const char *buf, int len)
 {
-  int i;
-  char b[2];
+  struct sim_inferior_data *sim_data
+    = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
+
+  if (sim_data->tty < 0)
+    ui_file_write (gdb_stdtarg, buf, len);
+  else 
+    len = write (sim_data->tty, buf, len);
 
-  ui_file_write (gdb_stdtarg, buf, len);
   return len;
 }
 
@@ -357,15 +385,22 @@ gdb_os_flush_stdout (host_callback *p)
 static int
 gdb_os_write_stderr (host_callback *p, const char *buf, int len)
 {
+  struct sim_inferior_data *sim_data
+    = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
   int i;
   char b[2];
 
-  for (i = 0; i < len; i++)
+  if (sim_data->tty < 0)
     {
-      b[0] = buf[i];
-      b[1] = 0;
-      fputs_unfiltered (b, gdb_stdtargerr);
+      for (i = 0; i < len; i++)
+        {
+          b[0] = buf[i];
+          b[1] = 0;
+          fputs_unfiltered (b, gdb_stdtargerr);
+        }
     }
+  else
+    len = write (sim_data->tty, buf, len);    
   return len;
 }
 
@@ -609,6 +644,7 @@ gdbsim_create_inferior (struct target_ops *target, const
char *exec_file,
   int len;
   char *arg_buf;
   const char *args = allargs.c_str ();
+  const char *term;
 
   if (exec_file == 0 || exec_bfd == 0)
     warning (_("No executable file specified."));
@@ -652,6 +688,16 @@ gdbsim_create_inferior (struct target_ops *target,
const char *exec_file,
 
   insert_breakpoints ();	/* Needed to get correct instruction
 				   in cache.  */
+  
+  /* We don't do this in open as Eclispe calls set-inferior-tty after 
+     target-select, but before run.  */
+  term = get_inferior_io_terminal ();
+  if (term != NULL)
+    {
+      sim_data->tty = open (term, O_RDWR | O_NOCTTY);
+      if (sim_data->tty < 0) 
+        error (_("Unable to open %s as inferior-tty."), term);  
+    }
 
   clear_proceed_status (0);
 }
  

PR21985: set inferior-tty doesn't work for remote or sim

Commit Message

Comments

Patch