projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Class-ify ui_out
[deliverable/binutils-gdb.git]
/
gdb
/
stack.c
diff --git
a/gdb/stack.c
b/gdb/stack.c
index 9b4e356fd802c1244d60e5b574e905b35c42529d..4e3bc677332bd02937ce9439b29b84ce1402b2ca 100644
(file)
--- a/
gdb/stack.c
+++ b/
gdb/stack.c
@@
-167,7
+167,7
@@
print_stack_frame (struct frame_info *frame, int print_level,
{
/* For mi, alway print location and address. */
{
/* For mi, alway print location and address. */
- if (
ui_out_is_mi_like_p (current_uiout
))
+ if (
current_uiout->is_mi_like_p (
))
print_what = LOC_AND_ADDRESS;
TRY
print_what = LOC_AND_ADDRESS;
TRY
@@
-234,7
+234,7
@@
print_frame_arg (const struct frame_arg *arg)
gdb_assert (!arg->val || !arg->error);
gdb_assert (arg->entry_kind == print_entry_values_no
|| arg->entry_kind == print_entry_values_only
gdb_assert (!arg->val || !arg->error);
gdb_assert (arg->entry_kind == print_entry_values_no
|| arg->entry_kind == print_entry_values_only
- || (!ui
_out_is_mi_like_p (uiout
)
+ || (!ui
out->is_mi_like_p (
)
&& arg->entry_kind == print_entry_values_compact));
annotate_arg_begin ();
&& arg->entry_kind == print_entry_values_compact));
annotate_arg_begin ();
@@
-255,12
+255,12
@@
print_frame_arg (const struct frame_arg *arg)
if (arg->entry_kind == print_entry_values_only
|| arg->entry_kind == print_entry_values_compact)
fputs_filtered ("@entry", stb);
if (arg->entry_kind == print_entry_values_only
|| arg->entry_kind == print_entry_values_compact)
fputs_filtered ("@entry", stb);
- ui
_out_field_stream (uiout,
"name", stb);
+ ui
out->field_stream (
"name", stb);
annotate_arg_name_end ();
annotate_arg_name_end ();
- ui
_out_text (uiout,
"=");
+ ui
out->text (
"=");
if (!arg->val && !arg->error)
if (!arg->val && !arg->error)
- ui
_out_text (uiout,
"...");
+ ui
out->text (
"...");
else
{
if (arg->error)
else
{
if (arg->error)
@@
-307,7
+307,7
@@
print_frame_arg (const struct frame_arg *arg)
error_message);
}
error_message);
}
- ui
_out_field_stream (uiout,
"value", stb);
+ ui
out->field_stream (
"value", stb);
/* Also invoke ui_out_tuple_end. */
do_cleanups (old_chain);
/* Also invoke ui_out_tuple_end. */
do_cleanups (old_chain);
@@
-396,7
+396,7
@@
read_frame_arg (struct symbol *sym, struct frame_info *frame,
{
/* For MI do not try to use print_entry_values_compact for ARGP. */
{
/* For MI do not try to use print_entry_values_compact for ARGP. */
- if (val && entryval && !
ui_out_is_mi_like_p (current_uiout
))
+ if (val && entryval && !
current_uiout->is_mi_like_p (
))
{
struct type *type = value_type (val);
{
struct type *type = value_type (val);
@@
-518,7
+518,7
@@
read_frame_arg (struct symbol *sym, struct frame_info *frame,
|| print_entry_values == print_entry_values_default) && val_equal)
{
argp->entry_kind = print_entry_values_compact;
|| print_entry_values == print_entry_values_default) && val_equal)
{
argp->entry_kind = print_entry_values_compact;
- gdb_assert (!
ui_out_is_mi_like_p (current_uiout
));
+ gdb_assert (!
current_uiout->is_mi_like_p (
));
}
else
argp->entry_kind = print_entry_values_no;
}
else
argp->entry_kind = print_entry_values_no;
@@
-680,8
+680,8
@@
print_frame_args (struct symbol *func, struct frame_info *frame,
/* Print the current arg. */
if (!first)
/* Print the current arg. */
if (!first)
- ui
_out_text (uiout,
", ");
- ui
_out_wrap_hint (uiout,
" ");
+ ui
out->text (
", ");
+ ui
out->wrap_hint (
" ");
if (!print_args)
{
if (!print_args)
{
@@
-702,8
+702,8
@@
print_frame_args (struct symbol *func, struct frame_info *frame,
{
if (arg.entry_kind != print_entry_values_only)
{
{
if (arg.entry_kind != print_entry_values_only)
{
- ui
_out_text (uiout,
", ");
- ui
_out_wrap_hint (uiout,
" ");
+ ui
out->text (
", ");
+ ui
out->wrap_hint (
" ");
}
print_frame_arg (&entryarg);
}
print_frame_arg (&entryarg);
@@
-826,14
+826,14
@@
print_frame_info (struct frame_info *frame, int print_level,
to list for this frame. */
if (print_level)
{
to list for this frame. */
if (print_level)
{
- ui
_out_text (uiout,
"#");
- ui
_out_field_fmt_int (uiout,
2, ui_left, "level",
+ ui
out->text (
"#");
+ ui
out->field_fmt_int (
2, ui_left, "level",
frame_relative_level (frame));
}
frame_relative_level (frame));
}
- if (ui
_out_is_mi_like_p (uiout
))
+ if (ui
out->is_mi_like_p (
))
{
annotate_frame_address ();
{
annotate_frame_address ();
- ui
_out_field_core_addr (uiout,
"addr",
+ ui
out->field_core_addr (
"addr",
gdbarch, get_frame_pc (frame));
annotate_frame_address_end ();
}
gdbarch, get_frame_pc (frame));
annotate_frame_address_end ();
}
@@
-841,18
+841,18
@@
print_frame_info (struct frame_info *frame, int print_level,
if (get_frame_type (frame) == DUMMY_FRAME)
{
annotate_function_call ();
if (get_frame_type (frame) == DUMMY_FRAME)
{
annotate_function_call ();
- ui
_out_field_string (uiout,
"func", "<function called from gdb>");
+ ui
out->field_string (
"func", "<function called from gdb>");
}
else if (get_frame_type (frame) == SIGTRAMP_FRAME)
{
annotate_signal_handler_caller ();
}
else if (get_frame_type (frame) == SIGTRAMP_FRAME)
{
annotate_signal_handler_caller ();
- ui
_out_field_string (uiout,
"func", "<signal handler called>");
+ ui
out->field_string (
"func", "<signal handler called>");
}
else if (get_frame_type (frame) == ARCH_FRAME)
{
}
else if (get_frame_type (frame) == ARCH_FRAME)
{
- ui
_out_field_string (uiout,
"func", "<cross-architecture call>");
+ ui
out->field_string (
"func", "<cross-architecture call>");
}
}
- ui
_out_text (uiout,
"\n");
+ ui
out->text (
"\n");
annotate_frame_end ();
/* If disassemble-next-line is set to auto or on output the next
annotate_frame_end ();
/* If disassemble-next-line is set to auto or on output the next
@@
-921,9
+921,9
@@
print_frame_info (struct frame_info *frame, int print_level,
ability to decide for themselves if it is desired. */
if (opts.addressprint && mid_statement)
{
ability to decide for themselves if it is desired. */
if (opts.addressprint && mid_statement)
{
- ui
_out_field_core_addr (uiout,
"addr",
+ ui
out->field_core_addr (
"addr",
gdbarch, get_frame_pc (frame));
gdbarch, get_frame_pc (frame));
- ui
_out_text (uiout,
"\t");
+ ui
out->text (
"\t");
}
print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
}
print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
@@
-1187,8
+1187,8
@@
print_frame (struct frame_info *frame, int print_level,
if (print_level)
{
if (print_level)
{
- ui
_out_text (uiout,
"#");
- ui
_out_field_fmt_int (uiout,
2, ui_left, "level",
+ ui
out->text (
"#");
+ ui
out->field_fmt_int (
2, ui_left, "level",
frame_relative_level (frame));
}
get_user_print_options (&opts);
frame_relative_level (frame));
}
get_user_print_options (&opts);
@@
-1199,20
+1199,20
@@
print_frame (struct frame_info *frame, int print_level,
{
annotate_frame_address ();
if (pc_p)
{
annotate_frame_address ();
if (pc_p)
- ui
_out_field_core_addr (uiout,
"addr", gdbarch, pc);
+ ui
out->field_core_addr (
"addr", gdbarch, pc);
else
else
- ui
_out_field_string (uiout,
"addr", "<unavailable>");
+ ui
out->field_string (
"addr", "<unavailable>");
annotate_frame_address_end ();
annotate_frame_address_end ();
- ui
_out_text (uiout,
" in ");
+ ui
out->text (
" in ");
}
annotate_frame_function_name ();
fprintf_symbol_filtered (stb, funname ? funname : "??",
funlang, DMGL_ANSI);
}
annotate_frame_function_name ();
fprintf_symbol_filtered (stb, funname ? funname : "??",
funlang, DMGL_ANSI);
- ui
_out_field_stream (uiout,
"func", stb);
- ui
_out_wrap_hint (uiout,
" ");
+ ui
out->field_stream (
"func", stb);
+ ui
out->wrap_hint (
" ");
annotate_frame_args ();
annotate_frame_args ();
- ui
_out_text (uiout,
" (");
+ ui
out->text (
" (");
if (print_args)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
if (print_args)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
@@
-1243,27
+1243,27
@@
print_frame (struct frame_info *frame, int print_level,
do_cleanups (args_list_chain);
QUIT;
}
do_cleanups (args_list_chain);
QUIT;
}
- ui
_out_text (uiout,
")");
+ ui
out->text (
")");
if (sal.symtab)
{
const char *filename_display;
filename_display = symtab_to_filename_for_display (sal.symtab);
annotate_frame_source_begin ();
if (sal.symtab)
{
const char *filename_display;
filename_display = symtab_to_filename_for_display (sal.symtab);
annotate_frame_source_begin ();
- ui
_out_wrap_hint (uiout,
" ");
- ui
_out_text (uiout,
" at ");
+ ui
out->wrap_hint (
" ");
+ ui
out->text (
" at ");
annotate_frame_source_file ();
annotate_frame_source_file ();
- ui
_out_field_string (uiout,
"file", filename_display);
- if (ui
_out_is_mi_like_p (uiout
))
+ ui
out->field_string (
"file", filename_display);
+ if (ui
out->is_mi_like_p (
))
{
const char *fullname = symtab_to_fullname (sal.symtab);
{
const char *fullname = symtab_to_fullname (sal.symtab);
- ui
_out_field_string (uiout,
"fullname", fullname);
+ ui
out->field_string (
"fullname", fullname);
}
annotate_frame_source_file_end ();
}
annotate_frame_source_file_end ();
- ui
_out_text (uiout,
":");
+ ui
out->text (
":");
annotate_frame_source_line ();
annotate_frame_source_line ();
- ui
_out_field_int (uiout,
"line", sal.line);
+ ui
out->field_int (
"line", sal.line);
annotate_frame_source_end ();
}
annotate_frame_source_end ();
}
@@
-1275,15
+1275,15
@@
print_frame (struct frame_info *frame, int print_level,
if (lib)
{
annotate_frame_where ();
if (lib)
{
annotate_frame_where ();
- ui
_out_wrap_hint (uiout,
" ");
- ui
_out_text (uiout,
" from ");
- ui
_out_field_string (uiout,
"from", lib);
+ ui
out->wrap_hint (
" ");
+ ui
out->text (
" from ");
+ ui
out->field_string (
"from", lib);
}
}
/* do_cleanups will call ui_out_tuple_end() for us. */
do_cleanups (list_chain);
}
}
/* do_cleanups will call ui_out_tuple_end() for us. */
do_cleanups (list_chain);
- ui
_out_text (uiout,
"\n");
+ ui
out->text (
"\n");
do_cleanups (old_chain);
}
\f
do_cleanups (old_chain);
}
\f
This page took
0.029831 seconds
and
4
git commands to generate.