aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-disasm.c18
-rw-r--r--gdb/tui/tui-file.c230
-rw-r--r--gdb/tui/tui-file.h18
-rw-r--r--gdb/tui/tui-io.c4
-rw-r--r--gdb/tui/tui-regs.c21
-rw-r--r--gdb/tui/tui-stack.c33
6 files changed, 61 insertions, 263 deletions
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 2d1cadd..123a906 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -54,10 +54,7 @@ static CORE_ADDR
tui_disassemble (struct gdbarch *gdbarch, struct tui_asm_line *asm_lines,
CORE_ADDR pc, int count)
{
- struct ui_file *gdb_dis_out;
-
- /* Now init the ui_file structure. */
- gdb_dis_out = tui_sfileopen (256);
+ string_file gdb_dis_out;
/* Now construct each line. */
for (; count > 0; count--, asm_lines++)
@@ -67,20 +64,19 @@ tui_disassemble (struct gdbarch *gdbarch, struct tui_asm_line *asm_lines,
if (asm_lines->insn)
xfree (asm_lines->insn);
- print_address (gdbarch, pc, gdb_dis_out);
+ print_address (gdbarch, pc, &gdb_dis_out);
asm_lines->addr = pc;
- asm_lines->addr_string = xstrdup (tui_file_get_strbuf (gdb_dis_out));
+ asm_lines->addr_string = xstrdup (gdb_dis_out.c_str ());
- ui_file_rewind (gdb_dis_out);
+ gdb_dis_out.clear ();
- pc = pc + gdb_print_insn (gdbarch, pc, gdb_dis_out, NULL);
+ pc = pc + gdb_print_insn (gdbarch, pc, &gdb_dis_out, NULL);
- asm_lines->insn = xstrdup (tui_file_get_strbuf (gdb_dis_out));
+ asm_lines->insn = xstrdup (gdb_dis_out.c_str ());
/* Reset the buffer to empty. */
- ui_file_rewind (gdb_dis_out);
+ gdb_dis_out.clear ();
}
- ui_file_delete (gdb_dis_out);
return pc;
}
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 4dc6370..2f895b7 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -17,145 +17,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "ui-file.h"
#include "tui/tui-file.h"
#include "tui/tui-io.h"
#include "tui/tui-command.h"
#include "tui.h"
-/* A ``struct ui_file'' that is compatible with all the legacy
- code. */
-
-/* new */
-enum streamtype
-{
- afile,
- astring
-};
-
-/* new */
-struct tui_stream
-{
- int *ts_magic;
- enum streamtype ts_streamtype;
- FILE *ts_filestream;
- char *ts_strbuf;
- int ts_buflen;
-};
-
-static ui_file_flush_ftype tui_file_flush;
-extern ui_file_fputs_ftype tui_file_fputs;
-static ui_file_isatty_ftype tui_file_isatty;
-static ui_file_rewind_ftype tui_file_rewind;
-static ui_file_put_ftype tui_file_put;
-static ui_file_delete_ftype tui_file_delete;
-static struct ui_file *tui_file_new (void);
-static int tui_file_magic;
-
-static struct ui_file *
-tui_file_new (void)
-{
- struct tui_stream *tui = XNEW (struct tui_stream);
- struct ui_file *file = ui_file_new ();
-
- set_ui_file_data (file, tui, tui_file_delete);
- set_ui_file_flush (file, tui_file_flush);
- set_ui_file_fputs (file, tui_file_fputs);
- set_ui_file_isatty (file, tui_file_isatty);
- set_ui_file_rewind (file, tui_file_rewind);
- set_ui_file_put (file, tui_file_put);
- tui->ts_magic = &tui_file_magic;
- return file;
-}
-
-static void
-tui_file_delete (struct ui_file *file)
-{
- struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
-
- if (tmpstream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_delete: bad magic number"));
- if ((tmpstream->ts_streamtype == astring)
- && (tmpstream->ts_strbuf != NULL))
- {
- xfree (tmpstream->ts_strbuf);
- }
- xfree (tmpstream);
-}
-
-struct ui_file *
-tui_fileopen (FILE *stream)
-{
- struct ui_file *file = tui_file_new ();
- struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
-
- tmpstream->ts_streamtype = afile;
- tmpstream->ts_filestream = stream;
- tmpstream->ts_strbuf = NULL;
- tmpstream->ts_buflen = 0;
- return file;
-}
-
-struct ui_file *
-tui_sfileopen (int n)
-{
- struct ui_file *file = tui_file_new ();
- struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file);
-
- tmpstream->ts_streamtype = astring;
- tmpstream->ts_filestream = NULL;
- if (n > 0)
- {
- tmpstream->ts_strbuf = XNEWVEC (char, n + 1);
- tmpstream->ts_strbuf[0] = '\0';
- }
- else
- /* Do not allocate the buffer now. The first time something is
- printed one will be allocated by tui_file_adjust_strbuf(). */
- tmpstream->ts_strbuf = NULL;
- tmpstream->ts_buflen = n;
- return file;
-}
-
-static int
-tui_file_isatty (struct ui_file *file)
-{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_isatty: bad magic number"));
- if (stream->ts_streamtype == afile)
- return (isatty (fileno (stream->ts_filestream)));
- else
- return 0;
-}
-
-static void
-tui_file_rewind (struct ui_file *file)
-{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_rewind: bad magic number"));
- stream->ts_strbuf[0] = '\0';
-}
-
-static void
-tui_file_put (struct ui_file *file,
- ui_file_put_method_ftype *write,
- void *dest)
-{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_put: bad magic number"));
- if (stream->ts_streamtype == astring)
- write (dest, stream->ts_strbuf, strlen (stream->ts_strbuf));
-}
+tui_file::tui_file (FILE *stream)
+ : stdio_file (stream)
+{}
/* All TUI I/O sent to the *_filtered and *_unfiltered functions
eventually ends up here. The fputs_unfiltered_hook is primarily
@@ -164,91 +33,22 @@ tui_file_put (struct ui_file *file,
gdb_stderr are sent to the hook. Everything else is sent on to
fputs to allow file I/O to be handled appropriately. */
-/* FIXME: Should be broken up and moved to a TUI specific file. */
-
void
-tui_file_fputs (const char *linebuffer, struct ui_file *file)
-{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_streamtype == astring)
- {
- tui_file_adjust_strbuf (strlen (linebuffer), file);
- strcat (stream->ts_strbuf, linebuffer);
- }
- else
- {
- tui_puts (linebuffer);
- /* gdb_stdout is buffered, and the caller must gdb_flush it at
- appropriate times. Other streams are not so buffered. */
- if (file != gdb_stdout)
- tui_refresh_cmd_win ();
- }
-}
-
-char *
-tui_file_get_strbuf (struct ui_file *file)
+tui_file::puts (const char *linebuffer)
{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_get_strbuf: bad magic number"));
- return (stream->ts_strbuf);
+ tui_puts (linebuffer);
+ /* gdb_stdout is buffered, and the caller must gdb_flush it at
+ appropriate times. Other streams are not so buffered. */
+ if (this != gdb_stdout)
+ tui_refresh_cmd_win ();
}
-/* Adjust the length of the buffer by the amount necessary to
- accomodate appending a string of length N to the buffer
- contents. */
void
-tui_file_adjust_strbuf (int n, struct ui_file *file)
-{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
- int non_null_chars;
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_adjust_strbuf: bad magic number"));
-
- if (stream->ts_streamtype != astring)
- return;
-
- if (stream->ts_strbuf)
- {
- /* There is already a buffer allocated. */
- non_null_chars = strlen (stream->ts_strbuf);
-
- if (n > (stream->ts_buflen - non_null_chars - 1))
- {
- stream->ts_buflen = n + non_null_chars + 1;
- stream->ts_strbuf
- = XRESIZEVEC (char, stream->ts_strbuf, stream->ts_buflen);
- }
- }
- else
- /* No buffer yet, so allocate one of the desired size. */
- stream->ts_strbuf = XNEWVEC (char, n + 1);
-}
-
-static void
-tui_file_flush (struct ui_file *file)
+tui_file::flush ()
{
- struct tui_stream *stream = (struct tui_stream *) ui_file_data (file);
-
- if (stream->ts_magic != &tui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tui_file_flush: bad magic number"));
-
- switch (stream->ts_streamtype)
- {
- case astring:
- break;
- case afile:
- /* gdb_stdout is buffered. Other files are always flushed on
- every write. */
- if (file == gdb_stdout)
- tui_refresh_cmd_win ();
- fflush (stream->ts_filestream);
- break;
- }
+ /* gdb_stdout is buffered. Other files are always flushed on
+ every write. */
+ if (this == gdb_stdout)
+ tui_refresh_cmd_win ();
+ stdio_file::flush ();
}
diff --git a/gdb/tui/tui-file.h b/gdb/tui/tui-file.h
index 0e90cdf..aceaab6 100644
--- a/gdb/tui/tui-file.h
+++ b/gdb/tui/tui-file.h
@@ -1,4 +1,4 @@
-/* UI_FILE - a generic STDIO like output stream.
+/* TUI_FILE - a STDIO-like output stream for the TUI.
Copyright (C) 1999-2017 Free Software Foundation, Inc.
This file is part of GDB.
@@ -19,9 +19,17 @@
#ifndef TUI_FILE_H
#define TUI_FILE_H
-extern struct ui_file *tui_fileopen (FILE *);
-extern struct ui_file *tui_sfileopen (int);
-extern char *tui_file_get_strbuf (struct ui_file *);
-extern void tui_file_adjust_strbuf (int, struct ui_file *);
+#include "ui-file.h"
+
+/* A STDIO-like output stream for the TUI. */
+
+class tui_file : public stdio_file
+{
+public:
+ explicit tui_file (FILE *stream);
+
+ void flush () override;
+ void puts (const char *) override;
+};
#endif
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index 6f00f84..433762b 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -528,8 +528,8 @@ tui_initialize_io (void)
#endif
/* Create tui output streams. */
- tui_stdout = tui_fileopen (stdout);
- tui_stderr = tui_fileopen (stderr);
+ tui_stdout = new tui_file (stdout);
+ tui_stderr = new tui_file (stderr);
tui_out = tui_out_new (tui_stdout);
/* Create the default UI. */
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index fc7913b..7d116ee 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -711,7 +711,7 @@ TUI command to control the register window."), tuicmd);
static void
tui_restore_gdbout (void *ui)
{
- ui_file_delete (gdb_stdout);
+ delete gdb_stdout;
gdb_stdout = (struct ui_file*) ui;
pagination_enabled = 1;
}
@@ -723,29 +723,26 @@ static char *
tui_register_format (struct frame_info *frame, int regnum)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
- struct ui_file *stream;
struct ui_file *old_stdout;
struct cleanup *cleanups;
char *p, *s;
char *ret;
+ string_file stream;
+
pagination_enabled = 0;
old_stdout = gdb_stdout;
- stream = tui_sfileopen (256);
- gdb_stdout = stream;
+ gdb_stdout = &stream;
cleanups = make_cleanup (tui_restore_gdbout, (void*) old_stdout);
- gdbarch_print_registers_info (gdbarch, stream, frame, regnum, 1);
-
- /* Save formatted output in the buffer. */
- p = tui_file_get_strbuf (stream);
+ gdbarch_print_registers_info (gdbarch, &stream, frame, regnum, 1);
/* Remove the possible \n. */
- s = strrchr (p, '\n');
- if (s && s[1] == 0)
- *s = 0;
+ std::string &str = stream.string ();
+ if (!str.empty () && str.back () == '\n')
+ str.resize (str.size () - 1);
/* Expand tabs into spaces, since ncurses on MS-Windows doesn't. */
- ret = tui_expand_tabs (p, 0);
+ ret = tui_expand_tabs (str.c_str (), 0);
do_cleanups (cleanups);
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index 945a716..21a8bac 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -68,12 +68,9 @@ tui_make_status_line (struct tui_locator_element *loc)
int status_size;
int i, proc_width;
const char *pid_name;
- const char *pc_buf;
int target_width;
int pid_width;
int line_width;
- int pc_width;
- struct ui_file *pc_out;
if (ptid_equal (inferior_ptid, null_ptid))
pid_name = "No process";
@@ -102,12 +99,14 @@ tui_make_status_line (struct tui_locator_element *loc)
line_width = MIN_LINE_WIDTH;
/* Translate PC address. */
- pc_out = tui_sfileopen (128);
+ string_file pc_out;
+
fputs_filtered (loc->gdbarch? paddress (loc->gdbarch, loc->addr) : "??",
- pc_out);
- pc_buf = tui_file_get_strbuf (pc_out);
- pc_width = strlen (pc_buf);
-
+ &pc_out);
+
+ const char *pc_buf = pc_out.c_str ();
+ int pc_width = pc_out.size ();
+
/* First determine the amount of proc name width we have available.
The +1 are for a space separator between fields.
The -1 are to take into account the \0 counted by sizeof. */
@@ -204,7 +203,6 @@ tui_make_status_line (struct tui_locator_element *loc)
string[i] = ' ';
string[status_size] = (char) 0;
- ui_file_delete (pc_out);
return string;
}
@@ -215,21 +213,21 @@ static char*
tui_get_function_from_frame (struct frame_info *fi)
{
static char name[256];
- struct ui_file *stream = tui_sfileopen (256);
- char *p;
+ string_file stream;
print_address_symbolic (get_frame_arch (fi), get_frame_pc (fi),
- stream, demangle, "");
- p = tui_file_get_strbuf (stream);
+ &stream, demangle, "");
/* Use simple heuristics to isolate the function name. The symbol
can be demangled and we can have function parameters. Remove
them because the status line is too short to display them. */
- if (*p == '<')
- p++;
- strncpy (name, p, sizeof (name) - 1);
+ const char *d = stream.c_str ();
+ if (*d == '<')
+ d++;
+ strncpy (name, d, sizeof (name) - 1);
name[sizeof (name) - 1] = 0;
- p = strchr (name, '(');
+
+ char *p = strchr (name, '(');
if (!p)
p = strchr (name, '>');
if (p)
@@ -237,7 +235,6 @@ tui_get_function_from_frame (struct frame_info *fi)
p = strchr (name, '+');
if (p)
*p = 0;
- ui_file_delete (stream);
return name;
}
generated by cgit v1.1 at 2024-08-11 11:42:44 +0000