d7e747318f
This patch starts from the desire to eliminate make_cleanup_ui_file_delete, but then goes beyond. It makes ui_file & friends a real C++ class hierarchy, and switches temporary ui_file-like objects to stack-based allocation. - mem_fileopen -> string_file mem_fileopen is replaced with a new string_file class that is treated as a value class created on the stack. This alone eliminates most make_cleanup_ui_file_delete calls, and, simplifies code a whole lot (diffstat shows around 1k loc dropped.) string_file's internal buffer is a std::string, thus the "string" in the name. This simplifies the implementation much, compared to mem_fileopen, which managed growing its internal buffer manually. - ui_file_as_string, ui_file_strdup, ui_file_obsavestring all gone The new string_file class has a string() method that provides direct writable access to the internal std::string buffer. This replaced ui_file_as_string, which forced a copy of the same data the stream had inside. With direct access via a writable reference, we can instead move the string out of the string_stream, avoiding deep string copying. Related, ui_file_xstrdup calls are replaced with xstrdup'ping the stream's string, and ui_file_obsavestring is replaced by obstack_copy0. With all those out of the way, getting rid of the weird ui_file_put mechanism was possible. - New ui_file::printf, ui_file::puts, etc. methods These simplify / clarify client code. I considered splitting client-code changes, like these, e.g.: - stb = mem_fileopen (); - fprintf_unfiltered (stb, "%s%s%s", - _("The valid values are:\n"), - regdesc, - _("The default is \"std\".")); + string_file stb; + stb.printf ("%s%s%s", + _("The valid values are:\n"), + regdesc, + _("The default is \"std\".")); In two steps, with the first step leaving fprintf_unfiltered (etc.) calls in place, and only afterwards do a pass to change all those to call stb.printf etc.. I didn't do that split, because (when I tried), it turned out to be pointless make-work: the first pass would have to touch the fprintf_unfiltered line anyway, to replace "stb" with "&stb". - gdb_fopen replaced with stack-based objects This avoids the need for cleanups or unique_ptr's. I.e., this: struct ui_file *file = gdb_fopen (filename, "w"); if (filename == NULL) perror_with_name (filename); cleanups = make_cleanup_ui_file_delete (file); // use file. do_cleanups (cleanups); is replaced with this: stdio_file file; if (!file.open (filename, "w")) perror_with_name (filename); // use file. - odd contorsions in null_file_write / null_file_fputs around when to call to_fputs / to_write eliminated. - Global null_stream object A few places that were allocating a ui_file in order to print to "nowhere" are adjusted to instead refer to a new 'null_stream' global stream. - TUI's tui_sfileopen eliminated. TUI's ui_file much simplified The TUI's ui_file was serving a dual purpose. It supported being used as string buffer, and supported being backed by a stdio FILE. The string buffer part is gone, replaced by using of string_file. The 'FILE *' support is now much simplified, by making the TUI's ui_file inherit from stdio_file. gdb/ChangeLog: 2017-02-02 Pedro Alves <palves@redhat.com> * ada-lang.c (type_as_string): Use string_file. * ada-valprint.c (ada_print_floating): Use string_file. * ada-varobj.c (ada_varobj_scalar_image) (ada_varobj_get_value_image): Use string_file. * aix-thread.c (aix_thread_extra_thread_info): Use string_file. * arm-tdep.c (_initialize_arm_tdep): Use string_printf. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, reattach_breakpoints) (print_breakpoint_location, print_one_detail_ranged_breakpoint) (print_it_watchpoint): Use string_file. (save_breakpoints): Use stdio_file. * c-exp.y (oper): Use string_file. * cli/cli-logging.c (set_logging_redirect): Use ui_file_up and tee_file. (pop_output_files): Use delete. (handle_redirections): Use stdio_file and tee_file. * cli/cli-setshow.c (do_show_command): Use string_file. * compile/compile-c-support.c (c_compute_program): Use string_file. * compile/compile-c-symbols.c (generate_vla_size): Take a 'string_file &' instead of a 'ui_file *'. (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. Use string_file. (generate_c_for_variable_locations): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-internal.h (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-loc2c.c (push, pushf, unary, binary) (print_label, pushf_register_address, pushf_register) (do_compile_dwarf_expr_to_c): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * compile/compile.c (compile_to_object): Use string_file. * compile/compile.h (compile_dwarf_expr_to_c) (compile_dwarf_bounds_to_c): Take a 'string_file &' instead of a 'ui_file *'. * cp-support.c (inspect_type): Use string_file and obstack_copy0. (replace_typedefs_qualified_name): Use string_file and obstack_copy0. * disasm.c (gdb_pretty_print_insn): Use string_file. (gdb_disassembly): Adjust reference the null_stream global. (do_ui_file_delete): Delete. (gdb_insn_length): Use null_stream. * dummy-frame.c (maintenance_print_dummy_frames): Use stdio_file. * dwarf2loc.c (dwarf2_compile_property_to_c) (locexpr_generate_c_location, loclist_generate_c_location): Take a 'string_file &' instead of a 'ui_file *'. * dwarf2loc.h (dwarf2_compile_property_to_c): Likewise. * dwarf2read.c (do_ui_file_peek_last): Delete. (dwarf2_compute_name): Use string_file. * event-top.c (gdb_setup_readline): Use stdio_file. * gdbarch.sh (verify_gdbarch): Use string_file. * gdbtypes.c (safe_parse_type): Use null_stream. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Use string_file. * guile/scm-disasm.c (gdbscm_print_insn_from_port): Take a 'string_file *' instead of a 'ui_file *'. (gdbscm_arch_disassemble): Use string_file. * guile/scm-frame.c (frscm_print_frame_smob): Use string_file. * guile/scm-ports.c (class ioscm_file_port): Now a class that inherits from ui_file. (ioscm_file_port_delete, ioscm_file_port_rewind) (ioscm_file_port_put): Delete. (ioscm_file_port_write): Rename to ... (ioscm_file_port::write): ... this. Remove file_port_magic checks. (ioscm_file_port_new): Delete. (ioscm_with_output_to_port_worker): Use ioscm_file_port and ui_file_up. * guile/scm-type.c (tyscm_type_name): Use string_file. * guile/scm-value.c (vlscm_print_value_smob, gdbscm_value_print): Use string_file. * infcmd.c (print_return_value_1): Use string_file. * infrun.c (print_target_wait_results): Use string_file. * language.c (add_language): Use string_file. * location.c (explicit_to_string_internal): Use string_file. * main.c (captured_main_1): Use null_file. * maint.c (maintenance_print_architecture): Use stdio_file. * mi/mi-cmd-stack.c (list_arg_or_local): Use string_file. * mi/mi-common.h (struct mi_interp) <out, err, log, targ, event_channel>: Change type to mi_console_file pointer. * mi/mi-console.c (mi_console_file_fputs, mi_console_file_flush) (mi_console_file_delete): Delete. (struct mi_console_file): Delete. (mi_console_file_magic): Delete. (mi_console_file_new): Delete. (mi_console_file::mi_console_file): New. (mi_console_file_delete): Delete. (mi_console_file_fputs): Delete. (mi_console_file::write): New. (mi_console_raw_packet): Delete. (mi_console_file::flush): New. (mi_console_file_flush): Delete. (mi_console_set_raw): Rename to ... (mi_console_file::set_raw): ... this. * mi/mi-console.h (class mi_console_file): New class. (mi_console_file_new, mi_console_set_raw): Delete. * mi/mi-interp.c (mi_interpreter_init): Use mi_console_file. (mi_set_logging): Use delete and tee_file. Adjust. * mi/mi-main.c (output_register): Use string_file. (mi_cmd_data_evaluate_expression): Use string_file. (mi_cmd_data_read_memory): Use string_file. (mi_cmd_execute, print_variable_or_computed): Use string_file. * mi/mi-out.c (mi_ui_out::main_stream): New. (mi_ui_out::rewind): Use main_stream and string_file. (mi_ui_out::put): Use main_stream and string_file. (mi_ui_out::mi_ui_out): Remove 'stream' parameter. Allocate a 'string_file' instead. (mi_out_new): Don't allocate a mem_fileopen stream here. * mi/mi-out.h (mi_ui_out::mi_ui_out): Remove 'stream' parameter. (mi_ui_out::main_stream): Declare method. * printcmd.c (eval_command): Use string_file. * psymtab.c (maintenance_print_psymbols): Use stdio_file. * python/py-arch.c (archpy_disassemble): Use string_file. * python/py-breakpoint.c (bppy_get_commands): Use string_file. * python/py-frame.c (frapy_str): Use string_file. * python/py-framefilter.c (py_print_type, py_print_single_arg): Use string_file. * python/py-type.c (typy_str): Use string_file. * python/py-unwind.c (unwind_infopy_str): Use string_file. * python/py-value.c (valpy_str): Use string_file. * record-btrace.c (btrace_insn_history): Use string_file. * regcache.c (regcache_print): Use stdio_file. * reggroups.c (maintenance_print_reggroups): Use stdio_file. * remote.c (escape_buffer): Use string_file. * rust-lang.c (rust_get_disr_info): Use string_file. * serial.c (serial_open_ops_1): Use stdio_file. (do_serial_close): Use delete. * stack.c (print_frame_arg): Use string_file. (print_frame_args): Remove local mem_fileopen stream, not used. (print_frame): Use string_file. * symmisc.c (maintenance_print_symbols): Use stdio_file. * symtab.h (struct symbol_computed_ops) <generate_c_location>: Take a 'string_file *' instead of a 'ui_file *'. * top.c (new_ui): Use stdio_file and stderr_file. (free_ui): Use delete. (execute_command_to_string): Use string_file. (quit_confirm): Use string_file. * tracepoint.c (collection_list::append_exp): Use string_file. * tui/tui-disasm.c (tui_disassemble): Use string_file. * tui/tui-file.c: Don't include "ui-file.h". (enum streamtype, struct tui_stream): Delete. (tui_file_new, tui_file_delete, tui_fileopen, tui_sfileopen) (tui_file_isatty, tui_file_rewind, tui_file_put): Delete. (tui_file::tui_file): New method. (tui_file_fputs): Delete. (tui_file_get_strbuf): Delete. (tui_file::puts): New method. (tui_file_adjust_strbuf): Delete. (tui_file_flush): Delete. (tui_file::flush): New method. * tui/tui-file.h: Tweak intro comment. Include ui-file.h. (tui_fileopen, tui_sfileopen, tui_file_get_strbuf) (tui_file_adjust_strbuf): Delete declarations. (class tui_file): New class. * tui/tui-io.c (tui_initialize_io): Use tui_file. * tui/tui-regs.c (tui_restore_gdbout): Use delete. (tui_register_format): Use string_stream. * tui/tui-stack.c (tui_make_status_line): Use string_file. (tui_get_function_from_frame): Use string_file. * typeprint.c (type_to_string): Use string_file. * ui-file.c (struct ui_file, ui_file_magic, ui_file_new): Delete. (null_stream): New global. (ui_file_delete): Delete. (ui_file::ui_file): New. (null_file_isatty): Delete. (ui_file::~ui_file): New. (null_file_rewind): Delete. (ui_file::printf): New. (null_file_put): Delete. (null_file_flush): Delete. (ui_file::putstr): New. (null_file_write): Delete. (ui_file::putstrn): New. (null_file_read): Delete. (ui_file::putc): New. (null_file_fputs): Delete. (null_file_write_async_safe): Delete. (ui_file::vprintf): New. (null_file_delete): Delete. (null_file::write): New. (null_file_fseek): Delete. (null_file::puts): New. (ui_file_data): Delete. (null_file::write_async_safe): New. (gdb_flush, ui_file_isatty): Adjust. (ui_file_put, ui_file_rewind): Delete. (ui_file_write): Adjust. (ui_file_write_for_put): Delete. (ui_file_write_async_safe, ui_file_read): Adjust. (ui_file_fseek): Delete. (fputs_unfiltered): Adjust. (set_ui_file_flush, set_ui_file_isatty, set_ui_file_rewind) (set_ui_file_put, set_ui_file_write, set_ui_file_write_async_safe) (set_ui_file_read, set_ui_file_fputs, set_ui_file_fseek) (set_ui_file_data): Delete. (string_file::~string_file, string_file::write) (struct accumulated_ui_file, do_ui_file_xstrdup, ui_file_xstrdup) (do_ui_file_as_string, ui_file_as_string): Delete. (do_ui_file_obsavestring, ui_file_obsavestring): Delete. (struct mem_file): Delete. (mem_file_new): Delete. (stdio_file::stdio_file): New. (mem_file_delete): Delete. (stdio_file::stdio_file): New. (mem_fileopen): Delete. (stdio_file::~stdio_file): New. (mem_file_rewind): Delete. (stdio_file::set_stream): New. (mem_file_put): Delete. (stdio_file::open): New. (mem_file_write): Delete. (stdio_file_magic, struct stdio_file): Delete. (stdio_file_new, stdio_file_delete, stdio_file_flush): Delete. (stdio_file::flush): New. (stdio_file_read): Rename to ... (stdio_file::read): ... this. Adjust. (stdio_file_write): Rename to ... (stdio_file::write): ... this. Adjust. (stdio_file_write_async_safe): Rename to ... (stdio_file::write_async_safe) ... this. Adjust. (stdio_file_fputs): Rename to ... (stdio_file::puts) ... this. Adjust. (stdio_file_isatty): Delete. (stdio_file_fseek): Delete. (stdio_file::isatty): New. (stderr_file_write): Rename to ... (stderr_file::write) ... this. Adjust. (stderr_file_fputs): Rename to ... (stderr_file::puts) ... this. Adjust. (stderr_fileopen, stdio_fileopen, gdb_fopen): Delete. (stderr_file::stderr_file): New. (tee_file_magic): Delete. (struct tee_file): Delete. (tee_file::tee_file): New. (tee_file_new): Delete. (tee_file::~tee_file): New. (tee_file_delete): Delete. (tee_file_flush): Rename to ... (tee_file::flush): ... this. Adjust. (tee_file_write): Rename to ... (tee_file::write): ... this. Adjust. (tee_file::write_async_safe): New. (tee_file_fputs): Rename to ... (tee_file::puts): ... this. Adjust. (tee_file_isatty): Rename to ... (tee_file::isatty): ... this. Adjust. * ui-file.h (struct obstack, struct ui_file): Don't forward-declare. (ui_file_new, ui_file_flush_ftype, set_ui_file_flush) (ui_file_write_ftype) (set_ui_file_write, ui_file_fputs_ftype, set_ui_file_fputs) (ui_file_write_async_safe_ftype, set_ui_file_write_async_safe) (ui_file_read_ftype, set_ui_file_read, ui_file_isatty_ftype) (set_ui_file_isatty, ui_file_rewind_ftype, set_ui_file_rewind) (ui_file_put_method_ftype, ui_file_put_ftype, set_ui_file_put) (ui_file_delete_ftype, set_ui_file_data, ui_file_fseek_ftype) (set_ui_file_fseek): Delete. (ui_file_data, ui_file_delete, ui_file_rewind) (struct ui_file): New. (ui_file_up): New. (class null_file): New. (null_stream): Declare. (ui_file_write_for_put, ui_file_put): Delete. (ui_file_xstrdup, ui_file_as_string, ui_file_obsavestring): Delete. (ui_file_fseek, mem_fileopen, stdio_fileopen, stderr_fileopen) (gdb_fopen, tee_file_new): Delete. (struct string_file): New. (struct stdio_file): New. (stdio_file_up): New. (struct stderr_file): New. (class tee_file): New. * ui-out.c (ui_out::field_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * ui-out.h (class ui_out) <field_stream>: Likewise. * utils.c (do_ui_file_delete, make_cleanup_ui_file_delete) (null_stream): Delete. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * utils.h (struct ui_file): Delete forward declaration.. (make_cleanup_ui_file_delete, null_stream): Delete declarations. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. * varobj.c (varobj_value_get_print_value): Use string_file. * xtensa-tdep.c (xtensa_verify_config): Use string_file. * gdbarch.c: Regenerate.
750 lines
17 KiB
C
750 lines
17 KiB
C
/* Generic serial interface routines
|
||
|
||
Copyright (C) 1992-2017 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
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
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include <ctype.h>
|
||
#include "serial.h"
|
||
#include "gdbcmd.h"
|
||
#include "cli/cli-utils.h"
|
||
|
||
extern void _initialize_serial (void);
|
||
|
||
/* Is serial being debugged? */
|
||
|
||
static unsigned int global_serial_debug_p;
|
||
|
||
typedef const struct serial_ops *serial_ops_p;
|
||
DEF_VEC_P (serial_ops_p);
|
||
|
||
/* Serial I/O handlers. */
|
||
|
||
VEC (serial_ops_p) *serial_ops_list = NULL;
|
||
|
||
/* Pointer to list of scb's. */
|
||
|
||
static struct serial *scb_base;
|
||
|
||
/* Non-NULL gives filename which contains a recording of the remote session,
|
||
suitable for playback by gdbserver. */
|
||
|
||
static char *serial_logfile = NULL;
|
||
static struct ui_file *serial_logfp = NULL;
|
||
|
||
static const struct serial_ops *serial_interface_lookup (const char *);
|
||
static void serial_logchar (struct ui_file *stream,
|
||
int ch_type, int ch, int timeout);
|
||
static const char logbase_hex[] = "hex";
|
||
static const char logbase_octal[] = "octal";
|
||
static const char logbase_ascii[] = "ascii";
|
||
static const char *const logbase_enums[] =
|
||
{logbase_hex, logbase_octal, logbase_ascii, NULL};
|
||
static const char *serial_logbase = logbase_ascii;
|
||
|
||
|
||
static int serial_current_type = 0;
|
||
|
||
/* Log char CH of type CHTYPE, with TIMEOUT. */
|
||
|
||
/* Define bogus char to represent a BREAK. Should be careful to choose a value
|
||
that can't be confused with a normal char, or an error code. */
|
||
#define SERIAL_BREAK 1235
|
||
|
||
static void
|
||
serial_logchar (struct ui_file *stream, int ch_type, int ch, int timeout)
|
||
{
|
||
if (ch_type != serial_current_type)
|
||
{
|
||
fprintf_unfiltered (stream, "\n%c ", ch_type);
|
||
serial_current_type = ch_type;
|
||
}
|
||
|
||
if (serial_logbase != logbase_ascii)
|
||
fputc_unfiltered (' ', stream);
|
||
|
||
switch (ch)
|
||
{
|
||
case SERIAL_TIMEOUT:
|
||
fprintf_unfiltered (stream, "<Timeout: %d seconds>", timeout);
|
||
return;
|
||
case SERIAL_ERROR:
|
||
fprintf_unfiltered (stream, "<Error: %s>", safe_strerror (errno));
|
||
return;
|
||
case SERIAL_EOF:
|
||
fputs_unfiltered ("<Eof>", stream);
|
||
return;
|
||
case SERIAL_BREAK:
|
||
fputs_unfiltered ("<Break>", stream);
|
||
return;
|
||
default:
|
||
if (serial_logbase == logbase_hex)
|
||
fprintf_unfiltered (stream, "%02x", ch & 0xff);
|
||
else if (serial_logbase == logbase_octal)
|
||
fprintf_unfiltered (stream, "%03o", ch & 0xff);
|
||
else
|
||
switch (ch)
|
||
{
|
||
case '\\':
|
||
fputs_unfiltered ("\\\\", stream);
|
||
break;
|
||
case '\b':
|
||
fputs_unfiltered ("\\b", stream);
|
||
break;
|
||
case '\f':
|
||
fputs_unfiltered ("\\f", stream);
|
||
break;
|
||
case '\n':
|
||
fputs_unfiltered ("\\n", stream);
|
||
break;
|
||
case '\r':
|
||
fputs_unfiltered ("\\r", stream);
|
||
break;
|
||
case '\t':
|
||
fputs_unfiltered ("\\t", stream);
|
||
break;
|
||
case '\v':
|
||
fputs_unfiltered ("\\v", stream);
|
||
break;
|
||
default:
|
||
fprintf_unfiltered (stream,
|
||
isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
void
|
||
serial_log_command (struct target_ops *self, const char *cmd)
|
||
{
|
||
if (!serial_logfp)
|
||
return;
|
||
|
||
serial_current_type = 'c';
|
||
|
||
fputs_unfiltered ("\nc ", serial_logfp);
|
||
fputs_unfiltered (cmd, serial_logfp);
|
||
|
||
/* Make sure that the log file is as up-to-date as possible,
|
||
in case we are getting ready to dump core or something. */
|
||
gdb_flush (serial_logfp);
|
||
}
|
||
|
||
|
||
static const struct serial_ops *
|
||
serial_interface_lookup (const char *name)
|
||
{
|
||
const struct serial_ops *ops;
|
||
int i;
|
||
|
||
for (i = 0; VEC_iterate (serial_ops_p, serial_ops_list, i, ops); ++i)
|
||
if (strcmp (name, ops->name) == 0)
|
||
return ops;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
void
|
||
serial_add_interface (const struct serial_ops *optable)
|
||
{
|
||
VEC_safe_push (serial_ops_p, serial_ops_list, optable);
|
||
}
|
||
|
||
/* Return the open serial device for FD, if found, or NULL if FD is
|
||
not already opened. */
|
||
|
||
struct serial *
|
||
serial_for_fd (int fd)
|
||
{
|
||
struct serial *scb;
|
||
|
||
for (scb = scb_base; scb; scb = scb->next)
|
||
if (scb->fd == fd)
|
||
return scb;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* Create a new serial for OPS. */
|
||
|
||
static struct serial *
|
||
new_serial (const struct serial_ops *ops)
|
||
{
|
||
struct serial *scb;
|
||
|
||
scb = XCNEW (struct serial);
|
||
|
||
scb->ops = ops;
|
||
|
||
scb->bufp = scb->buf;
|
||
scb->error_fd = -1;
|
||
scb->refcnt = 1;
|
||
|
||
return scb;
|
||
}
|
||
|
||
static struct serial *serial_open_ops_1 (const struct serial_ops *ops,
|
||
const char *open_name);
|
||
|
||
/* Open up a device or a network socket, depending upon the syntax of NAME. */
|
||
|
||
struct serial *
|
||
serial_open (const char *name)
|
||
{
|
||
struct serial *scb;
|
||
const struct serial_ops *ops;
|
||
const char *open_name = name;
|
||
|
||
if (startswith (name, "|"))
|
||
{
|
||
ops = serial_interface_lookup ("pipe");
|
||
/* Discard ``|'' and any space before the command itself. */
|
||
++open_name;
|
||
open_name = skip_spaces_const (open_name);
|
||
}
|
||
/* Check for a colon, suggesting an IP address/port pair.
|
||
Do this *after* checking for all the interesting prefixes. We
|
||
don't want to constrain the syntax of what can follow them. */
|
||
else if (strchr (name, ':'))
|
||
ops = serial_interface_lookup ("tcp");
|
||
else
|
||
ops = serial_interface_lookup ("hardwire");
|
||
|
||
if (!ops)
|
||
return NULL;
|
||
|
||
return serial_open_ops_1 (ops, open_name);
|
||
}
|
||
|
||
/* Open up a serial for OPS, passing OPEN_NAME to the open method. */
|
||
|
||
static struct serial *
|
||
serial_open_ops_1 (const struct serial_ops *ops, const char *open_name)
|
||
{
|
||
struct serial *scb;
|
||
|
||
scb = new_serial (ops);
|
||
|
||
/* `...->open (...)' would get expanded by the open(2) syscall macro. */
|
||
if ((*scb->ops->open) (scb, open_name))
|
||
{
|
||
xfree (scb);
|
||
return NULL;
|
||
}
|
||
|
||
scb->next = scb_base;
|
||
scb_base = scb;
|
||
|
||
if (serial_logfile != NULL)
|
||
{
|
||
stdio_file_up file (new stdio_file ());
|
||
|
||
if (!file->open (serial_logfile, "w"))
|
||
perror_with_name (serial_logfile);
|
||
|
||
serial_logfp = file.release ();
|
||
}
|
||
|
||
return scb;
|
||
}
|
||
|
||
/* See serial.h. */
|
||
|
||
struct serial *
|
||
serial_open_ops (const struct serial_ops *ops)
|
||
{
|
||
return serial_open_ops_1 (ops, NULL);
|
||
}
|
||
|
||
/* Open a new serial stream using a file handle, using serial
|
||
interface ops OPS. */
|
||
|
||
static struct serial *
|
||
serial_fdopen_ops (const int fd, const struct serial_ops *ops)
|
||
{
|
||
struct serial *scb;
|
||
|
||
if (!ops)
|
||
{
|
||
ops = serial_interface_lookup ("terminal");
|
||
if (!ops)
|
||
ops = serial_interface_lookup ("hardwire");
|
||
}
|
||
|
||
if (!ops)
|
||
return NULL;
|
||
|
||
scb = new_serial (ops);
|
||
|
||
scb->next = scb_base;
|
||
scb_base = scb;
|
||
|
||
if ((ops->fdopen) != NULL)
|
||
(*ops->fdopen) (scb, fd);
|
||
else
|
||
scb->fd = fd;
|
||
|
||
return scb;
|
||
}
|
||
|
||
struct serial *
|
||
serial_fdopen (const int fd)
|
||
{
|
||
return serial_fdopen_ops (fd, NULL);
|
||
}
|
||
|
||
static void
|
||
do_serial_close (struct serial *scb, int really_close)
|
||
{
|
||
struct serial *tmp_scb;
|
||
|
||
if (serial_logfp)
|
||
{
|
||
fputs_unfiltered ("\nEnd of log\n", serial_logfp);
|
||
serial_current_type = 0;
|
||
|
||
/* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
|
||
delete serial_logfp;
|
||
serial_logfp = NULL;
|
||
}
|
||
|
||
/* ensure that the FD has been taken out of async mode. */
|
||
if (scb->async_handler != NULL)
|
||
serial_async (scb, NULL, NULL);
|
||
|
||
if (really_close)
|
||
scb->ops->close (scb);
|
||
|
||
/* For serial_is_open. */
|
||
scb->bufp = NULL;
|
||
|
||
if (scb_base == scb)
|
||
scb_base = scb_base->next;
|
||
else
|
||
for (tmp_scb = scb_base; tmp_scb; tmp_scb = tmp_scb->next)
|
||
{
|
||
if (tmp_scb->next != scb)
|
||
continue;
|
||
|
||
tmp_scb->next = tmp_scb->next->next;
|
||
break;
|
||
}
|
||
|
||
serial_unref (scb);
|
||
}
|
||
|
||
void
|
||
serial_close (struct serial *scb)
|
||
{
|
||
do_serial_close (scb, 1);
|
||
}
|
||
|
||
void
|
||
serial_un_fdopen (struct serial *scb)
|
||
{
|
||
do_serial_close (scb, 0);
|
||
}
|
||
|
||
int
|
||
serial_is_open (struct serial *scb)
|
||
{
|
||
return scb->bufp != NULL;
|
||
}
|
||
|
||
void
|
||
serial_ref (struct serial *scb)
|
||
{
|
||
scb->refcnt++;
|
||
}
|
||
|
||
void
|
||
serial_unref (struct serial *scb)
|
||
{
|
||
--scb->refcnt;
|
||
if (scb->refcnt == 0)
|
||
xfree (scb);
|
||
}
|
||
|
||
int
|
||
serial_readchar (struct serial *scb, int timeout)
|
||
{
|
||
int ch;
|
||
|
||
/* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
|
||
code is finished. */
|
||
if (0 && serial_is_async_p (scb) && timeout < 0)
|
||
internal_error (__FILE__, __LINE__,
|
||
_("serial_readchar: blocking read in async mode"));
|
||
|
||
ch = scb->ops->readchar (scb, timeout);
|
||
if (serial_logfp != NULL)
|
||
{
|
||
serial_logchar (serial_logfp, 'r', ch, timeout);
|
||
|
||
/* Make sure that the log file is as up-to-date as possible,
|
||
in case we are getting ready to dump core or something. */
|
||
gdb_flush (serial_logfp);
|
||
}
|
||
if (serial_debug_p (scb))
|
||
{
|
||
fprintf_unfiltered (gdb_stdlog, "[");
|
||
serial_logchar (gdb_stdlog, 'r', ch, timeout);
|
||
fprintf_unfiltered (gdb_stdlog, "]");
|
||
gdb_flush (gdb_stdlog);
|
||
}
|
||
|
||
return (ch);
|
||
}
|
||
|
||
int
|
||
serial_write (struct serial *scb, const void *buf, size_t count)
|
||
{
|
||
if (serial_logfp != NULL)
|
||
{
|
||
const char *str = (const char *) buf;
|
||
size_t c;
|
||
|
||
for (c = 0; c < count; c++)
|
||
serial_logchar (serial_logfp, 'w', str[c] & 0xff, 0);
|
||
|
||
/* Make sure that the log file is as up-to-date as possible,
|
||
in case we are getting ready to dump core or something. */
|
||
gdb_flush (serial_logfp);
|
||
}
|
||
if (serial_debug_p (scb))
|
||
{
|
||
const char *str = (const char *) buf;
|
||
size_t c;
|
||
|
||
for (c = 0; c < count; c++)
|
||
{
|
||
fprintf_unfiltered (gdb_stdlog, "[");
|
||
serial_logchar (gdb_stdlog, 'w', str[c] & 0xff, 0);
|
||
fprintf_unfiltered (gdb_stdlog, "]");
|
||
}
|
||
gdb_flush (gdb_stdlog);
|
||
}
|
||
|
||
return (scb->ops->write (scb, buf, count));
|
||
}
|
||
|
||
void
|
||
serial_printf (struct serial *desc, const char *format,...)
|
||
{
|
||
va_list args;
|
||
char *buf;
|
||
va_start (args, format);
|
||
|
||
buf = xstrvprintf (format, args);
|
||
serial_write (desc, buf, strlen (buf));
|
||
|
||
xfree (buf);
|
||
va_end (args);
|
||
}
|
||
|
||
int
|
||
serial_drain_output (struct serial *scb)
|
||
{
|
||
return scb->ops->drain_output (scb);
|
||
}
|
||
|
||
int
|
||
serial_flush_output (struct serial *scb)
|
||
{
|
||
return scb->ops->flush_output (scb);
|
||
}
|
||
|
||
int
|
||
serial_flush_input (struct serial *scb)
|
||
{
|
||
return scb->ops->flush_input (scb);
|
||
}
|
||
|
||
int
|
||
serial_send_break (struct serial *scb)
|
||
{
|
||
if (serial_logfp != NULL)
|
||
serial_logchar (serial_logfp, 'w', SERIAL_BREAK, 0);
|
||
|
||
return (scb->ops->send_break (scb));
|
||
}
|
||
|
||
void
|
||
serial_raw (struct serial *scb)
|
||
{
|
||
scb->ops->go_raw (scb);
|
||
}
|
||
|
||
serial_ttystate
|
||
serial_get_tty_state (struct serial *scb)
|
||
{
|
||
return scb->ops->get_tty_state (scb);
|
||
}
|
||
|
||
serial_ttystate
|
||
serial_copy_tty_state (struct serial *scb, serial_ttystate ttystate)
|
||
{
|
||
return scb->ops->copy_tty_state (scb, ttystate);
|
||
}
|
||
|
||
int
|
||
serial_set_tty_state (struct serial *scb, serial_ttystate ttystate)
|
||
{
|
||
return scb->ops->set_tty_state (scb, ttystate);
|
||
}
|
||
|
||
void
|
||
serial_print_tty_state (struct serial *scb,
|
||
serial_ttystate ttystate,
|
||
struct ui_file *stream)
|
||
{
|
||
scb->ops->print_tty_state (scb, ttystate, stream);
|
||
}
|
||
|
||
int
|
||
serial_noflush_set_tty_state (struct serial *scb,
|
||
serial_ttystate new_ttystate,
|
||
serial_ttystate old_ttystate)
|
||
{
|
||
return scb->ops->noflush_set_tty_state (scb, new_ttystate, old_ttystate);
|
||
}
|
||
|
||
int
|
||
serial_setbaudrate (struct serial *scb, int rate)
|
||
{
|
||
return scb->ops->setbaudrate (scb, rate);
|
||
}
|
||
|
||
int
|
||
serial_setstopbits (struct serial *scb, int num)
|
||
{
|
||
return scb->ops->setstopbits (scb, num);
|
||
}
|
||
|
||
/* See serial.h. */
|
||
|
||
int
|
||
serial_setparity (struct serial *scb, int parity)
|
||
{
|
||
return scb->ops->setparity (scb, parity);
|
||
}
|
||
|
||
int
|
||
serial_can_async_p (struct serial *scb)
|
||
{
|
||
return (scb->ops->async != NULL);
|
||
}
|
||
|
||
int
|
||
serial_is_async_p (struct serial *scb)
|
||
{
|
||
return (scb->ops->async != NULL) && (scb->async_handler != NULL);
|
||
}
|
||
|
||
void
|
||
serial_async (struct serial *scb,
|
||
serial_event_ftype *handler,
|
||
void *context)
|
||
{
|
||
int changed = ((scb->async_handler == NULL) != (handler == NULL));
|
||
|
||
scb->async_handler = handler;
|
||
scb->async_context = context;
|
||
/* Only change mode if there is a need. */
|
||
if (changed)
|
||
scb->ops->async (scb, handler != NULL);
|
||
}
|
||
|
||
void
|
||
serial_debug (struct serial *scb, int debug_p)
|
||
{
|
||
scb->debug_p = debug_p;
|
||
}
|
||
|
||
int
|
||
serial_debug_p (struct serial *scb)
|
||
{
|
||
return scb->debug_p || global_serial_debug_p;
|
||
}
|
||
|
||
#ifdef USE_WIN32API
|
||
void
|
||
serial_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
|
||
{
|
||
if (scb->ops->wait_handle)
|
||
scb->ops->wait_handle (scb, read, except);
|
||
else
|
||
{
|
||
*read = (HANDLE) _get_osfhandle (scb->fd);
|
||
*except = NULL;
|
||
}
|
||
}
|
||
|
||
void
|
||
serial_done_wait_handle (struct serial *scb)
|
||
{
|
||
if (scb->ops->done_wait_handle)
|
||
scb->ops->done_wait_handle (scb);
|
||
}
|
||
#endif
|
||
|
||
int
|
||
serial_pipe (struct serial *scbs[2])
|
||
{
|
||
const struct serial_ops *ops;
|
||
int fildes[2];
|
||
|
||
ops = serial_interface_lookup ("pipe");
|
||
if (!ops)
|
||
{
|
||
errno = ENOSYS;
|
||
return -1;
|
||
}
|
||
|
||
if (gdb_pipe (fildes) == -1)
|
||
return -1;
|
||
|
||
scbs[0] = serial_fdopen_ops (fildes[0], ops);
|
||
scbs[1] = serial_fdopen_ops (fildes[1], ops);
|
||
return 0;
|
||
}
|
||
|
||
/* Serial set/show framework. */
|
||
|
||
static struct cmd_list_element *serial_set_cmdlist;
|
||
static struct cmd_list_element *serial_show_cmdlist;
|
||
|
||
static void
|
||
serial_set_cmd (char *args, int from_tty)
|
||
{
|
||
printf_unfiltered ("\"set serial\" must be followed "
|
||
"by the name of a command.\n");
|
||
help_list (serial_set_cmdlist, "set serial ", all_commands, gdb_stdout);
|
||
}
|
||
|
||
static void
|
||
serial_show_cmd (char *args, int from_tty)
|
||
{
|
||
cmd_show_list (serial_show_cmdlist, from_tty, "");
|
||
}
|
||
|
||
/* Baud rate specified for talking to serial target systems. Default
|
||
is left as -1, so targets can choose their own defaults. */
|
||
/* FIXME: This means that "show serial baud" and gr_files_info can
|
||
print -1 or (unsigned int)-1. This is a Bad User Interface. */
|
||
|
||
int baud_rate = -1;
|
||
|
||
static void
|
||
serial_baud_show_cmd (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("Baud rate for remote serial I/O is %s.\n"),
|
||
value);
|
||
}
|
||
|
||
/* Parity for serial port. */
|
||
|
||
int serial_parity = GDBPARITY_NONE;
|
||
|
||
static const char parity_none[] = "none";
|
||
static const char parity_odd[] = "odd";
|
||
static const char parity_even[] = "even";
|
||
static const char *const parity_enums[] =
|
||
{parity_none, parity_odd, parity_even, NULL};
|
||
static const char *parity = parity_none;
|
||
|
||
/* Set serial_parity value. */
|
||
|
||
static void
|
||
set_parity (char *ignore_args, int from_tty, struct cmd_list_element *c)
|
||
{
|
||
if (parity == parity_odd)
|
||
serial_parity = GDBPARITY_ODD;
|
||
else if (parity == parity_even)
|
||
serial_parity = GDBPARITY_EVEN;
|
||
else
|
||
serial_parity = GDBPARITY_NONE;
|
||
}
|
||
|
||
void
|
||
_initialize_serial (void)
|
||
{
|
||
#if 0
|
||
add_com ("connect", class_obscure, connect_command, _("\
|
||
Connect the terminal directly up to the command monitor.\n\
|
||
Use <CR>~. or <CR>~^D to break out."));
|
||
#endif /* 0 */
|
||
|
||
add_prefix_cmd ("serial", class_maintenance, serial_set_cmd, _("\
|
||
Set default serial/parallel port configuration."),
|
||
&serial_set_cmdlist, "set serial ",
|
||
0/*allow-unknown*/,
|
||
&setlist);
|
||
|
||
add_prefix_cmd ("serial", class_maintenance, serial_show_cmd, _("\
|
||
Show default serial/parallel port configuration."),
|
||
&serial_show_cmdlist, "show serial ",
|
||
0/*allow-unknown*/,
|
||
&showlist);
|
||
|
||
/* If target is open when baud changes, it doesn't take effect until
|
||
the next open (I think, not sure). */
|
||
add_setshow_zinteger_cmd ("baud", no_class, &baud_rate, _("\
|
||
Set baud rate for remote serial I/O."), _("\
|
||
Show baud rate for remote serial I/O."), _("\
|
||
This value is used to set the speed of the serial port when debugging\n\
|
||
using remote targets."),
|
||
NULL,
|
||
serial_baud_show_cmd,
|
||
&serial_set_cmdlist, &serial_show_cmdlist);
|
||
|
||
add_setshow_enum_cmd ("parity", no_class, parity_enums,
|
||
&parity, _("\
|
||
Set parity for remote serial I/O"), _("\
|
||
Show parity for remote serial I/O"), NULL,
|
||
set_parity,
|
||
NULL, /* FIXME: i18n: */
|
||
&serial_set_cmdlist, &serial_show_cmdlist);
|
||
|
||
add_setshow_filename_cmd ("remotelogfile", no_class, &serial_logfile, _("\
|
||
Set filename for remote session recording."), _("\
|
||
Show filename for remote session recording."), _("\
|
||
This file is used to record the remote session for future playback\n\
|
||
by gdbserver."),
|
||
NULL,
|
||
NULL, /* FIXME: i18n: */
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_enum_cmd ("remotelogbase", no_class, logbase_enums,
|
||
&serial_logbase, _("\
|
||
Set numerical base for remote session logging"), _("\
|
||
Show numerical base for remote session logging"), NULL,
|
||
NULL,
|
||
NULL, /* FIXME: i18n: */
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_zuinteger_cmd ("serial", class_maintenance,
|
||
&global_serial_debug_p, _("\
|
||
Set serial debugging."), _("\
|
||
Show serial debugging."), _("\
|
||
When non-zero, serial port debugging is enabled."),
|
||
NULL,
|
||
NULL, /* FIXME: i18n: */
|
||
&setdebuglist, &showdebuglist);
|
||
}
|