2000-02-03 04:14:45 +00:00
|
|
|
/* Output generating routines for GDB.
|
2002-03-19 02:51:09 +00:00
|
|
|
|
2014-01-01 03:54:24 +00:00
|
|
|
Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
2002-03-19 02:51:09 +00:00
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
Contributed by Cygnus Solutions.
|
|
|
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
|
|
|
|
|
|
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
|
2007-08-23 18:08:50 +00:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2000-02-03 04:14:45 +00:00
|
|
|
(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
|
2007-08-23 18:08:50 +00:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
#include "defs.h"
|
remove gdb_string.h
This removes gdb_string.h. This patch is purely mechanical. I
created it by running the two commands:
git rm common/gdb_string.h
perl -pi -e's/"gdb_string.h"/<string.h>/;' *.[chyl] */*.[chyl]
2013-11-18 Tom Tromey <tromey@redhat.com>
* common/gdb_string.h: Remove.
* aarch64-tdep.c: Use string.h, not gdb_string.h.
* ada-exp.y: Use string.h, not gdb_string.h.
* ada-lang.c: Use string.h, not gdb_string.h.
* ada-lex.l: Use string.h, not gdb_string.h.
* ada-typeprint.c: Use string.h, not gdb_string.h.
* ada-valprint.c: Use string.h, not gdb_string.h.
* aix-thread.c: Use string.h, not gdb_string.h.
* alpha-linux-tdep.c: Use string.h, not gdb_string.h.
* alpha-mdebug-tdep.c: Use string.h, not gdb_string.h.
* alpha-nat.c: Use string.h, not gdb_string.h.
* alpha-osf1-tdep.c: Use string.h, not gdb_string.h.
* alpha-tdep.c: Use string.h, not gdb_string.h.
* alphanbsd-tdep.c: Use string.h, not gdb_string.h.
* amd64-dicos-tdep.c: Use string.h, not gdb_string.h.
* amd64-linux-nat.c: Use string.h, not gdb_string.h.
* amd64-linux-tdep.c: Use string.h, not gdb_string.h.
* amd64-nat.c: Use string.h, not gdb_string.h.
* amd64-sol2-tdep.c: Use string.h, not gdb_string.h.
* amd64fbsd-tdep.c: Use string.h, not gdb_string.h.
* amd64obsd-tdep.c: Use string.h, not gdb_string.h.
* arch-utils.c: Use string.h, not gdb_string.h.
* arm-linux-nat.c: Use string.h, not gdb_string.h.
* arm-linux-tdep.c: Use string.h, not gdb_string.h.
* arm-tdep.c: Use string.h, not gdb_string.h.
* arm-wince-tdep.c: Use string.h, not gdb_string.h.
* armbsd-tdep.c: Use string.h, not gdb_string.h.
* armnbsd-nat.c: Use string.h, not gdb_string.h.
* armnbsd-tdep.c: Use string.h, not gdb_string.h.
* armobsd-tdep.c: Use string.h, not gdb_string.h.
* avr-tdep.c: Use string.h, not gdb_string.h.
* ax-gdb.c: Use string.h, not gdb_string.h.
* ax-general.c: Use string.h, not gdb_string.h.
* bcache.c: Use string.h, not gdb_string.h.
* bfin-tdep.c: Use string.h, not gdb_string.h.
* breakpoint.c: Use string.h, not gdb_string.h.
* build-id.c: Use string.h, not gdb_string.h.
* buildsym.c: Use string.h, not gdb_string.h.
* c-exp.y: Use string.h, not gdb_string.h.
* c-lang.c: Use string.h, not gdb_string.h.
* c-typeprint.c: Use string.h, not gdb_string.h.
* c-valprint.c: Use string.h, not gdb_string.h.
* charset.c: Use string.h, not gdb_string.h.
* cli-out.c: Use string.h, not gdb_string.h.
* cli/cli-cmds.c: Use string.h, not gdb_string.h.
* cli/cli-decode.c: Use string.h, not gdb_string.h.
* cli/cli-dump.c: Use string.h, not gdb_string.h.
* cli/cli-interp.c: Use string.h, not gdb_string.h.
* cli/cli-logging.c: Use string.h, not gdb_string.h.
* cli/cli-script.c: Use string.h, not gdb_string.h.
* cli/cli-setshow.c: Use string.h, not gdb_string.h.
* cli/cli-utils.c: Use string.h, not gdb_string.h.
* coffread.c: Use string.h, not gdb_string.h.
* common/common-utils.c: Use string.h, not gdb_string.h.
* common/filestuff.c: Use string.h, not gdb_string.h.
* common/linux-procfs.c: Use string.h, not gdb_string.h.
* common/linux-ptrace.c: Use string.h, not gdb_string.h.
* common/signals.c: Use string.h, not gdb_string.h.
* common/vec.h: Use string.h, not gdb_string.h.
* core-regset.c: Use string.h, not gdb_string.h.
* corefile.c: Use string.h, not gdb_string.h.
* corelow.c: Use string.h, not gdb_string.h.
* cp-abi.c: Use string.h, not gdb_string.h.
* cp-support.c: Use string.h, not gdb_string.h.
* cp-valprint.c: Use string.h, not gdb_string.h.
* cris-tdep.c: Use string.h, not gdb_string.h.
* d-lang.c: Use string.h, not gdb_string.h.
* dbxread.c: Use string.h, not gdb_string.h.
* dcache.c: Use string.h, not gdb_string.h.
* demangle.c: Use string.h, not gdb_string.h.
* dicos-tdep.c: Use string.h, not gdb_string.h.
* disasm.c: Use string.h, not gdb_string.h.
* doublest.c: Use string.h, not gdb_string.h.
* dsrec.c: Use string.h, not gdb_string.h.
* dummy-frame.c: Use string.h, not gdb_string.h.
* dwarf2-frame.c: Use string.h, not gdb_string.h.
* dwarf2loc.c: Use string.h, not gdb_string.h.
* dwarf2read.c: Use string.h, not gdb_string.h.
* elfread.c: Use string.h, not gdb_string.h.
* environ.c: Use string.h, not gdb_string.h.
* eval.c: Use string.h, not gdb_string.h.
* event-loop.c: Use string.h, not gdb_string.h.
* exceptions.c: Use string.h, not gdb_string.h.
* exec.c: Use string.h, not gdb_string.h.
* expprint.c: Use string.h, not gdb_string.h.
* f-exp.y: Use string.h, not gdb_string.h.
* f-lang.c: Use string.h, not gdb_string.h.
* f-typeprint.c: Use string.h, not gdb_string.h.
* f-valprint.c: Use string.h, not gdb_string.h.
* fbsd-nat.c: Use string.h, not gdb_string.h.
* findcmd.c: Use string.h, not gdb_string.h.
* findvar.c: Use string.h, not gdb_string.h.
* fork-child.c: Use string.h, not gdb_string.h.
* frame.c: Use string.h, not gdb_string.h.
* frv-linux-tdep.c: Use string.h, not gdb_string.h.
* frv-tdep.c: Use string.h, not gdb_string.h.
* gdb.c: Use string.h, not gdb_string.h.
* gdb_bfd.c: Use string.h, not gdb_string.h.
* gdbarch.c: Use string.h, not gdb_string.h.
* gdbtypes.c: Use string.h, not gdb_string.h.
* gnu-nat.c: Use string.h, not gdb_string.h.
* gnu-v2-abi.c: Use string.h, not gdb_string.h.
* gnu-v3-abi.c: Use string.h, not gdb_string.h.
* go-exp.y: Use string.h, not gdb_string.h.
* go-lang.c: Use string.h, not gdb_string.h.
* go32-nat.c: Use string.h, not gdb_string.h.
* hppa-hpux-tdep.c: Use string.h, not gdb_string.h.
* hppa-linux-nat.c: Use string.h, not gdb_string.h.
* hppanbsd-tdep.c: Use string.h, not gdb_string.h.
* hppaobsd-tdep.c: Use string.h, not gdb_string.h.
* i386-cygwin-tdep.c: Use string.h, not gdb_string.h.
* i386-dicos-tdep.c: Use string.h, not gdb_string.h.
* i386-linux-nat.c: Use string.h, not gdb_string.h.
* i386-linux-tdep.c: Use string.h, not gdb_string.h.
* i386-nto-tdep.c: Use string.h, not gdb_string.h.
* i386-sol2-tdep.c: Use string.h, not gdb_string.h.
* i386-tdep.c: Use string.h, not gdb_string.h.
* i386bsd-tdep.c: Use string.h, not gdb_string.h.
* i386gnu-nat.c: Use string.h, not gdb_string.h.
* i386nbsd-tdep.c: Use string.h, not gdb_string.h.
* i386obsd-tdep.c: Use string.h, not gdb_string.h.
* i387-tdep.c: Use string.h, not gdb_string.h.
* ia64-libunwind-tdep.c: Use string.h, not gdb_string.h.
* ia64-linux-nat.c: Use string.h, not gdb_string.h.
* inf-child.c: Use string.h, not gdb_string.h.
* inf-ptrace.c: Use string.h, not gdb_string.h.
* inf-ttrace.c: Use string.h, not gdb_string.h.
* infcall.c: Use string.h, not gdb_string.h.
* infcmd.c: Use string.h, not gdb_string.h.
* inflow.c: Use string.h, not gdb_string.h.
* infrun.c: Use string.h, not gdb_string.h.
* interps.c: Use string.h, not gdb_string.h.
* iq2000-tdep.c: Use string.h, not gdb_string.h.
* irix5-nat.c: Use string.h, not gdb_string.h.
* jv-exp.y: Use string.h, not gdb_string.h.
* jv-lang.c: Use string.h, not gdb_string.h.
* jv-typeprint.c: Use string.h, not gdb_string.h.
* jv-valprint.c: Use string.h, not gdb_string.h.
* language.c: Use string.h, not gdb_string.h.
* linux-fork.c: Use string.h, not gdb_string.h.
* linux-nat.c: Use string.h, not gdb_string.h.
* lm32-tdep.c: Use string.h, not gdb_string.h.
* m2-exp.y: Use string.h, not gdb_string.h.
* m2-typeprint.c: Use string.h, not gdb_string.h.
* m32c-tdep.c: Use string.h, not gdb_string.h.
* m32r-linux-nat.c: Use string.h, not gdb_string.h.
* m32r-linux-tdep.c: Use string.h, not gdb_string.h.
* m32r-rom.c: Use string.h, not gdb_string.h.
* m32r-tdep.c: Use string.h, not gdb_string.h.
* m68hc11-tdep.c: Use string.h, not gdb_string.h.
* m68k-tdep.c: Use string.h, not gdb_string.h.
* m68kbsd-tdep.c: Use string.h, not gdb_string.h.
* m68klinux-nat.c: Use string.h, not gdb_string.h.
* m68klinux-tdep.c: Use string.h, not gdb_string.h.
* m88k-tdep.c: Use string.h, not gdb_string.h.
* macrocmd.c: Use string.h, not gdb_string.h.
* main.c: Use string.h, not gdb_string.h.
* mdebugread.c: Use string.h, not gdb_string.h.
* mem-break.c: Use string.h, not gdb_string.h.
* memattr.c: Use string.h, not gdb_string.h.
* memory-map.c: Use string.h, not gdb_string.h.
* mep-tdep.c: Use string.h, not gdb_string.h.
* mi/mi-cmd-break.c: Use string.h, not gdb_string.h.
* mi/mi-cmd-disas.c: Use string.h, not gdb_string.h.
* mi/mi-cmd-env.c: Use string.h, not gdb_string.h.
* mi/mi-cmd-stack.c: Use string.h, not gdb_string.h.
* mi/mi-cmd-var.c: Use string.h, not gdb_string.h.
* mi/mi-cmds.c: Use string.h, not gdb_string.h.
* mi/mi-console.c: Use string.h, not gdb_string.h.
* mi/mi-getopt.c: Use string.h, not gdb_string.h.
* mi/mi-interp.c: Use string.h, not gdb_string.h.
* mi/mi-main.c: Use string.h, not gdb_string.h.
* mi/mi-parse.c: Use string.h, not gdb_string.h.
* microblaze-rom.c: Use string.h, not gdb_string.h.
* microblaze-tdep.c: Use string.h, not gdb_string.h.
* mingw-hdep.c: Use string.h, not gdb_string.h.
* minidebug.c: Use string.h, not gdb_string.h.
* minsyms.c: Use string.h, not gdb_string.h.
* mips-irix-tdep.c: Use string.h, not gdb_string.h.
* mips-linux-tdep.c: Use string.h, not gdb_string.h.
* mips-tdep.c: Use string.h, not gdb_string.h.
* mips64obsd-tdep.c: Use string.h, not gdb_string.h.
* mipsnbsd-tdep.c: Use string.h, not gdb_string.h.
* mipsread.c: Use string.h, not gdb_string.h.
* mn10300-linux-tdep.c: Use string.h, not gdb_string.h.
* mn10300-tdep.c: Use string.h, not gdb_string.h.
* monitor.c: Use string.h, not gdb_string.h.
* moxie-tdep.c: Use string.h, not gdb_string.h.
* mt-tdep.c: Use string.h, not gdb_string.h.
* nbsd-tdep.c: Use string.h, not gdb_string.h.
* nios2-linux-tdep.c: Use string.h, not gdb_string.h.
* nto-procfs.c: Use string.h, not gdb_string.h.
* nto-tdep.c: Use string.h, not gdb_string.h.
* objc-lang.c: Use string.h, not gdb_string.h.
* objfiles.c: Use string.h, not gdb_string.h.
* opencl-lang.c: Use string.h, not gdb_string.h.
* osabi.c: Use string.h, not gdb_string.h.
* osdata.c: Use string.h, not gdb_string.h.
* p-exp.y: Use string.h, not gdb_string.h.
* p-lang.c: Use string.h, not gdb_string.h.
* p-typeprint.c: Use string.h, not gdb_string.h.
* parse.c: Use string.h, not gdb_string.h.
* posix-hdep.c: Use string.h, not gdb_string.h.
* ppc-linux-nat.c: Use string.h, not gdb_string.h.
* ppc-sysv-tdep.c: Use string.h, not gdb_string.h.
* ppcfbsd-tdep.c: Use string.h, not gdb_string.h.
* ppcnbsd-tdep.c: Use string.h, not gdb_string.h.
* ppcobsd-tdep.c: Use string.h, not gdb_string.h.
* printcmd.c: Use string.h, not gdb_string.h.
* procfs.c: Use string.h, not gdb_string.h.
* prologue-value.c: Use string.h, not gdb_string.h.
* python/py-auto-load.c: Use string.h, not gdb_string.h.
* python/py-gdb-readline.c: Use string.h, not gdb_string.h.
* ravenscar-thread.c: Use string.h, not gdb_string.h.
* regcache.c: Use string.h, not gdb_string.h.
* registry.c: Use string.h, not gdb_string.h.
* remote-fileio.c: Use string.h, not gdb_string.h.
* remote-m32r-sdi.c: Use string.h, not gdb_string.h.
* remote-mips.c: Use string.h, not gdb_string.h.
* remote-sim.c: Use string.h, not gdb_string.h.
* remote.c: Use string.h, not gdb_string.h.
* reverse.c: Use string.h, not gdb_string.h.
* rs6000-aix-tdep.c: Use string.h, not gdb_string.h.
* ser-base.c: Use string.h, not gdb_string.h.
* ser-go32.c: Use string.h, not gdb_string.h.
* ser-mingw.c: Use string.h, not gdb_string.h.
* ser-pipe.c: Use string.h, not gdb_string.h.
* ser-tcp.c: Use string.h, not gdb_string.h.
* ser-unix.c: Use string.h, not gdb_string.h.
* serial.c: Use string.h, not gdb_string.h.
* sh-tdep.c: Use string.h, not gdb_string.h.
* sh64-tdep.c: Use string.h, not gdb_string.h.
* shnbsd-tdep.c: Use string.h, not gdb_string.h.
* skip.c: Use string.h, not gdb_string.h.
* sol-thread.c: Use string.h, not gdb_string.h.
* solib-dsbt.c: Use string.h, not gdb_string.h.
* solib-frv.c: Use string.h, not gdb_string.h.
* solib-osf.c: Use string.h, not gdb_string.h.
* solib-spu.c: Use string.h, not gdb_string.h.
* solib-target.c: Use string.h, not gdb_string.h.
* solib.c: Use string.h, not gdb_string.h.
* somread.c: Use string.h, not gdb_string.h.
* source.c: Use string.h, not gdb_string.h.
* sparc-nat.c: Use string.h, not gdb_string.h.
* sparc-sol2-tdep.c: Use string.h, not gdb_string.h.
* sparc-tdep.c: Use string.h, not gdb_string.h.
* sparc64-tdep.c: Use string.h, not gdb_string.h.
* sparc64fbsd-tdep.c: Use string.h, not gdb_string.h.
* sparc64nbsd-tdep.c: Use string.h, not gdb_string.h.
* sparcnbsd-tdep.c: Use string.h, not gdb_string.h.
* spu-linux-nat.c: Use string.h, not gdb_string.h.
* spu-multiarch.c: Use string.h, not gdb_string.h.
* spu-tdep.c: Use string.h, not gdb_string.h.
* stabsread.c: Use string.h, not gdb_string.h.
* stack.c: Use string.h, not gdb_string.h.
* std-regs.c: Use string.h, not gdb_string.h.
* symfile.c: Use string.h, not gdb_string.h.
* symmisc.c: Use string.h, not gdb_string.h.
* symtab.c: Use string.h, not gdb_string.h.
* target.c: Use string.h, not gdb_string.h.
* thread.c: Use string.h, not gdb_string.h.
* tilegx-linux-nat.c: Use string.h, not gdb_string.h.
* tilegx-tdep.c: Use string.h, not gdb_string.h.
* top.c: Use string.h, not gdb_string.h.
* tracepoint.c: Use string.h, not gdb_string.h.
* tui/tui-command.c: Use string.h, not gdb_string.h.
* tui/tui-data.c: Use string.h, not gdb_string.h.
* tui/tui-disasm.c: Use string.h, not gdb_string.h.
* tui/tui-file.c: Use string.h, not gdb_string.h.
* tui/tui-layout.c: Use string.h, not gdb_string.h.
* tui/tui-out.c: Use string.h, not gdb_string.h.
* tui/tui-regs.c: Use string.h, not gdb_string.h.
* tui/tui-source.c: Use string.h, not gdb_string.h.
* tui/tui-stack.c: Use string.h, not gdb_string.h.
* tui/tui-win.c: Use string.h, not gdb_string.h.
* tui/tui-windata.c: Use string.h, not gdb_string.h.
* tui/tui-winsource.c: Use string.h, not gdb_string.h.
* typeprint.c: Use string.h, not gdb_string.h.
* ui-file.c: Use string.h, not gdb_string.h.
* ui-out.c: Use string.h, not gdb_string.h.
* user-regs.c: Use string.h, not gdb_string.h.
* utils.c: Use string.h, not gdb_string.h.
* v850-tdep.c: Use string.h, not gdb_string.h.
* valarith.c: Use string.h, not gdb_string.h.
* valops.c: Use string.h, not gdb_string.h.
* valprint.c: Use string.h, not gdb_string.h.
* value.c: Use string.h, not gdb_string.h.
* varobj.c: Use string.h, not gdb_string.h.
* vax-tdep.c: Use string.h, not gdb_string.h.
* vaxnbsd-tdep.c: Use string.h, not gdb_string.h.
* vaxobsd-tdep.c: Use string.h, not gdb_string.h.
* windows-nat.c: Use string.h, not gdb_string.h.
* xcoffread.c: Use string.h, not gdb_string.h.
* xml-support.c: Use string.h, not gdb_string.h.
* xstormy16-tdep.c: Use string.h, not gdb_string.h.
* xtensa-linux-nat.c: Use string.h, not gdb_string.h.
2013-11-06 14:14:23 +00:00
|
|
|
#include <string.h>
|
2000-02-03 04:14:45 +00:00
|
|
|
#include "expression.h" /* For language.h */
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "ui-out.h"
|
2001-05-09 00:23:23 +00:00
|
|
|
#include "gdb_assert.h"
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
/* table header structures */
|
|
|
|
|
|
|
|
|
|
struct ui_out_hdr
|
|
|
|
|
{
|
|
|
|
|
int colno;
|
|
|
|
|
int width;
|
|
|
|
|
int alignment;
|
2001-06-21 15:39:54 +00:00
|
|
|
char *col_name;
|
2000-02-03 04:14:45 +00:00
|
|
|
char *colhdr;
|
|
|
|
|
struct ui_out_hdr *next;
|
|
|
|
|
};
|
|
|
|
|
|
2001-05-09 00:23:23 +00:00
|
|
|
/* Maintain a stack so that the info applicable to the inner most list
|
|
|
|
|
is always available. Stack/nested level 0 is reserved for the
|
2011-01-12 01:23:29 +00:00
|
|
|
top-level result. */
|
2001-05-09 00:23:23 +00:00
|
|
|
|
Implement core awareness.
* bcache.c (compare_ints): Remove
(print_percentage): Use compare_positive_ints.
* defs.h (compare_positive_ints): Declare.
* linux-nat.h (struct lin_lwp): New field core.
(linux_nat_core_of_thread_1): Declare.
* linux-nat.c (add_lwp): Init the 'core' field.
(linux_nat_wait_1): Record the core.
(linux_nat_core_of_thread_1, linux_nat_core_of_thread): New.
(linux_nat_add_target): Register the above.
* linux-thread-db.c (update_thread_core): New.
(thread_db_find_new_threads): Update core information for
every thread.
* remote.c (struct private_thread_info): New.
(free_private_thread_info, demand_private_info): New.
(PACKET_qXfer_threads, use_osdata_threads): New.
(struct thread_item, threads_parsing_context
(start_thread, end_thread, thread_attributes)
(thread_children, threads_children, threads_elements): New.
(remote_threads_info): Try qXfer:threads before anything
else.
(remote_protocol_packets): Register qXfer:threads.
(remote_open_1): Init use_osdata_threads.
(struct stop_reply): New field 'core'.
(remote_parse_stop_reply): Parse core number.
(process_stop_reply): Record core number.
(remote_xfer_partial): Handle qXfer:threads.
(remote_core_of_thread): New.
(init_remote_ops): Register remote_core_of_thread.
(_initialize_remote): Register qXfer:read.
* target.c (target_core_of_thread): New
* target.h (enum target_object): New value TARGET_OBJECT_THREADS.
(struct target_ops): New field to_core_of_threads.
(target_core_of_thread): Declare.
* gdbthread.h (struct thread_info): New field private_dtor.
* thread.c (print_thread_info): Report the core.
* ui-out.c (MAX_UI_OUT_LEVELS): Increase.
* utils.c (compare_positive_ints): New.
* features/threads.dtd: New.
* mi/mi-interp.c (mi_on_normal_stop): Report the core.
* mi/mi-main.c (struct collect_cores_data, collect_cores)
(do_nothing, free_vector_of_osdata_items)
(splay_tree_int_comparator, free_splay_tree): New.
(print_one_inferior_data): Implemented printing of selected
inferiors. Collect and print cores.
(output_cores): New.
(mi_cmd_list_thread_groups): Support --recurse. Permit specifying
thread groups together with --available.
2010-01-12 21:40:25 +00:00
|
|
|
enum { MAX_UI_OUT_LEVELS = 8 };
|
2001-05-09 00:23:23 +00:00
|
|
|
|
|
|
|
|
struct ui_out_level
|
|
|
|
|
{
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Count each field; the first element is for non-list fields. */
|
2001-05-09 00:23:23 +00:00
|
|
|
int field_count;
|
2011-01-12 01:23:29 +00:00
|
|
|
/* The type of this level. */
|
2001-05-09 01:33:10 +00:00
|
|
|
enum ui_out_type type;
|
2001-05-09 00:23:23 +00:00
|
|
|
};
|
|
|
|
|
|
2013-05-22 12:27:13 +00:00
|
|
|
/* Define uiout->level vector types and operations. */
|
|
|
|
|
typedef struct ui_out_level *ui_out_level_p;
|
|
|
|
|
DEF_VEC_P (ui_out_level_p);
|
|
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
/* Tables are special. Maintain a separate structure that tracks
|
|
|
|
|
their state. At present an output can only contain a single table
|
|
|
|
|
but that restriction might eventually be lifted. */
|
|
|
|
|
|
|
|
|
|
struct ui_out_table
|
|
|
|
|
{
|
|
|
|
|
/* If on, a table is being generated. */
|
|
|
|
|
int flag;
|
|
|
|
|
|
|
|
|
|
/* If on, the body of a table is being generated. If off, the table
|
|
|
|
|
header is being generated. */
|
|
|
|
|
int body_flag;
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
/* The level at which each entry of the table is to be found. A row
|
|
|
|
|
(a tuple) is made up of entries. Consequently ENTRY_LEVEL is one
|
|
|
|
|
above that of the table. */
|
|
|
|
|
int entry_level;
|
|
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
/* Number of table columns (as specified in the table_begin call). */
|
|
|
|
|
int columns;
|
|
|
|
|
|
|
|
|
|
/* String identifying the table (as specified in the table_begin
|
|
|
|
|
call). */
|
|
|
|
|
char *id;
|
|
|
|
|
|
|
|
|
|
/* Points to the first table header (if any). */
|
|
|
|
|
struct ui_out_hdr *header_first;
|
|
|
|
|
|
|
|
|
|
/* Points to the last table header (if any). */
|
|
|
|
|
struct ui_out_hdr *header_last;
|
|
|
|
|
|
|
|
|
|
/* Points to header of NEXT column to format. */
|
|
|
|
|
struct ui_out_hdr *header_next;
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
/* The ui_out structure */
|
|
|
|
|
/* Any change here requires a corresponding one in the initialization
|
2011-01-12 01:23:29 +00:00
|
|
|
of the default uiout, which is statically initialized. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
struct ui_out
|
|
|
|
|
{
|
|
|
|
|
int flags;
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Specific implementation of ui-out. */
|
2000-02-03 04:14:45 +00:00
|
|
|
struct ui_out_impl *impl;
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 00:11:55 +00:00
|
|
|
void *data;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2013-05-22 12:27:13 +00:00
|
|
|
/* Current level. */
|
2001-05-09 00:23:23 +00:00
|
|
|
int level;
|
2013-05-22 12:27:13 +00:00
|
|
|
|
|
|
|
|
/* Vector to store and track the ui-out levels. */
|
|
|
|
|
VEC (ui_out_level_p) *levels;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
/* A table, if any. At present only a single table is supported. */
|
|
|
|
|
struct ui_out_table table;
|
2000-02-03 04:14:45 +00:00
|
|
|
};
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* The current (inner most) level. */
|
2001-05-09 00:23:23 +00:00
|
|
|
static struct ui_out_level *
|
|
|
|
|
current_level (struct ui_out *uiout)
|
|
|
|
|
{
|
2013-05-22 12:27:13 +00:00
|
|
|
return VEC_index (ui_out_level_p, uiout->levels, uiout->level);
|
2001-05-09 00:23:23 +00:00
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Create a new level, of TYPE. Return the new level's index. */
|
2001-05-09 00:23:23 +00:00
|
|
|
static int
|
|
|
|
|
push_level (struct ui_out *uiout,
|
2001-05-09 01:33:10 +00:00
|
|
|
enum ui_out_type type,
|
2001-05-09 00:23:23 +00:00
|
|
|
const char *id)
|
|
|
|
|
{
|
|
|
|
|
struct ui_out_level *current;
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2001-05-09 00:23:23 +00:00
|
|
|
uiout->level++;
|
2013-12-28 22:31:23 +00:00
|
|
|
current = XNEW (struct ui_out_level);
|
2001-05-09 00:23:23 +00:00
|
|
|
current->field_count = 0;
|
2001-05-09 01:33:10 +00:00
|
|
|
current->type = type;
|
2013-05-22 12:27:13 +00:00
|
|
|
VEC_safe_push (ui_out_level_p, uiout->levels, current);
|
2001-05-09 00:23:23 +00:00
|
|
|
return uiout->level;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Discard the current level, return the discarded level's index.
|
2011-01-12 01:23:29 +00:00
|
|
|
TYPE is the type of the level being discarded. */
|
2001-05-09 00:23:23 +00:00
|
|
|
static int
|
2001-05-09 01:33:10 +00:00
|
|
|
pop_level (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type)
|
2001-05-09 00:23:23 +00:00
|
|
|
{
|
2013-05-22 12:27:13 +00:00
|
|
|
struct ui_out_level *current;
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* We had better not underflow the buffer. */
|
2013-05-22 12:27:13 +00:00
|
|
|
gdb_assert (uiout->level > 0);
|
2001-05-09 01:33:10 +00:00
|
|
|
gdb_assert (current_level (uiout)->type == type);
|
2013-05-22 12:27:13 +00:00
|
|
|
current = VEC_pop (ui_out_level_p, uiout->levels);
|
|
|
|
|
xfree (current);
|
2001-05-09 00:23:23 +00:00
|
|
|
uiout->level--;
|
|
|
|
|
return uiout->level + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* These are the default implementation functions. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
static void default_table_begin (struct ui_out *uiout, int nbrofcols,
|
2001-06-19 16:19:16 +00:00
|
|
|
int nr_rows, const char *tblid);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_table_body (struct ui_out *uiout);
|
|
|
|
|
static void default_table_end (struct ui_out *uiout);
|
|
|
|
|
static void default_table_header (struct ui_out *uiout, int width,
|
2001-06-21 15:39:54 +00:00
|
|
|
enum ui_align alig, const char *col_name,
|
2001-06-10 00:22:41 +00:00
|
|
|
const char *colhdr);
|
2001-05-09 01:33:10 +00:00
|
|
|
static void default_begin (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level, const char *id);
|
|
|
|
|
static void default_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_field_int (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align alig,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
int value);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_field_skip (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align alig,
|
|
|
|
|
const char *fldname);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_field_string (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align align,
|
|
|
|
|
const char *fldname,
|
2000-02-03 04:14:45 +00:00
|
|
|
const char *string);
|
|
|
|
|
static void default_field_fmt (struct ui_out *uiout, int fldno,
|
|
|
|
|
int width, enum ui_align align,
|
2001-06-10 00:22:41 +00:00
|
|
|
const char *fldname,
|
|
|
|
|
const char *format,
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 21:14:59 +00:00
|
|
|
va_list args) ATTRIBUTE_PRINTF (6, 0);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_spaces (struct ui_out *uiout, int numspaces);
|
2001-06-10 00:22:41 +00:00
|
|
|
static void default_text (struct ui_out *uiout, const char *string);
|
|
|
|
|
static void default_message (struct ui_out *uiout, int verbosity,
|
|
|
|
|
const char *format,
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 21:14:59 +00:00
|
|
|
va_list args) ATTRIBUTE_PRINTF (3, 0);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void default_wrap_hint (struct ui_out *uiout, char *identstring);
|
|
|
|
|
static void default_flush (struct ui_out *uiout);
|
2013-02-12 01:47:49 +00:00
|
|
|
static void default_data_destroy (struct ui_out *uiout);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* This is the default ui-out implementation functions vector. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
struct ui_out_impl default_ui_out_impl =
|
|
|
|
|
{
|
|
|
|
|
default_table_begin,
|
|
|
|
|
default_table_body,
|
|
|
|
|
default_table_end,
|
|
|
|
|
default_table_header,
|
2001-05-09 01:33:10 +00:00
|
|
|
default_begin,
|
|
|
|
|
default_end,
|
2000-02-03 04:14:45 +00:00
|
|
|
default_field_int,
|
|
|
|
|
default_field_skip,
|
|
|
|
|
default_field_string,
|
|
|
|
|
default_field_fmt,
|
|
|
|
|
default_spaces,
|
|
|
|
|
default_text,
|
|
|
|
|
default_message,
|
|
|
|
|
default_wrap_hint,
|
2001-07-06 03:53:11 +00:00
|
|
|
default_flush,
|
2003-06-28 16:19:07 +00:00
|
|
|
NULL,
|
2013-02-12 01:47:49 +00:00
|
|
|
default_data_destroy,
|
2001-07-06 03:53:11 +00:00
|
|
|
0, /* Does not need MI hacks. */
|
2000-02-03 04:14:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The default ui_out */
|
|
|
|
|
|
|
|
|
|
struct ui_out def_uiout =
|
|
|
|
|
{
|
|
|
|
|
0, /* flags */
|
|
|
|
|
&default_ui_out_impl, /* impl */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Pointer to current ui_out */
|
|
|
|
|
/* FIXME: This should not be a global, but something passed down from main.c
|
2011-01-12 01:23:29 +00:00
|
|
|
or top.c. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2011-08-04 Pedro Alves <pedro@codesourcery.com>
* ui-out.h (uiout): Rename to ...
(current_uiout): ... this.
* ui-out.c (uiout): Rename to ...
(current_uiout): ... this.
* ada-lang.c (print_it_exception, print_one_exception)
(print_mention_exception): Adjust.
* breakpoint.c (watchpoint_check): Adjust.
(print_breakpoint_location, print_one_breakpoint, breakpoint_1)
(default_collect_info, watchpoints_info, print_one_catch_fork)
(print_one_catch_vfork, print_one_catch_syscall)
(print_one_catch_exec, mention, print_it_ranged_breakpoint)
(print_one_ranged_breakpoint, print_mention_ranged_breakpoint)
(print_it_watchpoint, print_mention_watchpoint)
(print_it_masked_watchpoint, print_mention_masked_watchpoint)
(print_it_exception_catchpoint, print_one_exception_catchpoint)
(print_mention_exception_catchpoint, say_where, bkpt_print_it)
(bkpt_print_mention, momentary_bkpt_print_it)
(tracepoint_print_mention, update_static_tracepoint)
(tracepoints_info, save_breakpoints): Adjust.
* cli-out.c (field_separator): Adjust.
* cp-abi.c (list_cp_abis, show_cp_abi_cmd): Adjust.
* exceptions.c (catch_exceptions_with_msg, catch_errors): Adjust.
* frame.c (get_current_frame): Adjust.
* infcmd.c (run_command_1, print_return_value): Adjust.
* inferior.c (inferior_command, info_inferiors_command): Adjust.
* infrun.c (print_end_stepping_range_reason): Adjust.
(print_signal_exited_reason, print_exited_reason): Adjust.
(print_signal_received_reason, print_no_history_reason): Adjust.
* interps.c (interp_set): Adjust.
* osdata.c (info_osdata_command): Adjust.
* progspace.c (maintenance_info_program_spaces_command): Adjust.
* remote-fileio.c (remote_fileio_request): Adjust.
* remote.c (show_remote_cmd): Adjust.
* solib.c (info_sharedlibrary_command): Adjust.
* source.c (print_source_lines_base): Adjust.
* stack.c (print_stack_frame): Adjust.
(do_gdb_disassembly, print_frame_info, print_frame): Adjust.
* symfile-mem.c (add_vsyscall_page): Adjust.
* symfile.c (load_progress, generic_load)
(print_transfer_performance): Adjust.
* thread.c (info_threads_command, restore_selected_frame)
(thread_command): Adjust.
* top.c (make_cleanup_restore_ui_file): Adjust.
* tracepoint.c (tvariables_info_1, trace_status_mi, tfind_1)
(print_one_static_tracepoint_marker): Adjust.
* cli/cli-cmds.c (print_disassembly): Adjust.
* cli/cli-decode.c (print_doc_line): Adjust.
* cli/cli-interp.c (safe_execute_command): Adjust.
* cli/cli-logging.c (set_logging_redirect, pop_output_files)
(handle_redirections): Adjust.
* cli/cli-script.c (show_user_1): Adjust.
* cli/cli-setshow.c (do_setshow_command, cmd_show_list): Adjust.
* mi/mi-cmd-break.c (breakpoint_notify): Adjust.
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Adjust.
* mi/mi-cmd-env.c (mi_cmd_env_pwd, mi_cmd_env_path)
(mi_cmd_env_dir): Adjust.
* mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file)
(print_partial_file_name, mi_cmd_file_list_exec_source_files): Adjust.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames)
(mi_cmd_stack_info_depth, mi_cmd_stack_list_args)
(list_args_or_locals): Adjust.
* mi/mi-cmd-var.c (print_varobj, mi_cmd_var_create)
(mi_cmd_var_delete, mi_cmd_var_set_format, mi_cmd_var_set_frozen)
(mi_cmd_var_show_format, mi_cmd_var_info_num_children)
(mi_cmd_var_list_children, mi_cmd_var_info_type)
(mi_cmd_var_info_path_expression, mi_cmd_var_info_expression)
(mi_cmd_var_show_attributes, mi_cmd_var_evaluate_expression)
(mi_cmd_var_assign, mi_cmd_var_update, varobj_update_one): Adjust.
* mi/mi-interp.c (mi_on_normal_stop): Adjust.
* mi/mi-main.c (mi_cmd_gdb_exit, mi_cmd_thread_select)
(mi_cmd_thread_list_ids, mi_cmd_thread_info, print_one_inferior)
(list_available_thread_groups, mi_cmd_list_thread_groups)
(mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers)
(mi_cmd_data_list_register_values, get_register)
(mi_cmd_data_evaluate_expression, mi_cmd_data_read_memory)
(mi_cmd_data_read_memory_bytes, mi_cmd_list_features)
(mi_cmd_list_target_features, mi_cmd_add_inferior)
(mi_execute_command, mi_load_progress): Adjust.
* mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Adjust.
* python/py-auto-load.c (print_script, info_auto_load_scripts):
Adjust.
* python/py-breakpoint.c (bppy_get_commands): Adjust.
* tui/tui-interp.c (tui_command_loop): Adjust.
* tui/tui-io.c (tui_setup_io, tui_initialize_io): Adjust.
2011-08-04 19:10:14 +00:00
|
|
|
struct ui_out *current_uiout = &def_uiout;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* These are the interfaces to implementation functions. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-06-11 16:34:47 +00:00
|
|
|
static void uo_table_begin (struct ui_out *uiout, int nbrofcols,
|
2001-06-19 16:19:16 +00:00
|
|
|
int nr_rows, const char *tblid);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_table_body (struct ui_out *uiout);
|
|
|
|
|
static void uo_table_end (struct ui_out *uiout);
|
|
|
|
|
static void uo_table_header (struct ui_out *uiout, int width,
|
2001-06-21 15:39:54 +00:00
|
|
|
enum ui_align align, const char *col_name,
|
|
|
|
|
const char *colhdr);
|
2001-05-09 01:33:10 +00:00
|
|
|
static void uo_begin (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level, const char *id);
|
|
|
|
|
static void uo_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_field_int (struct ui_out *uiout, int fldno, int width,
|
2001-06-11 16:34:47 +00:00
|
|
|
enum ui_align align, const char *fldname, int value);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_field_skip (struct ui_out *uiout, int fldno, int width,
|
2001-06-11 16:34:47 +00:00
|
|
|
enum ui_align align, const char *fldname);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_field_fmt (struct ui_out *uiout, int fldno, int width,
|
2001-06-11 16:34:47 +00:00
|
|
|
enum ui_align align, const char *fldname,
|
From Kaveh R. Ghazi <ghazi@caip.rutgers.edu>:
gdb/
* cli-out.c (cli_field_fmt, cli_message, out_field_fmt): Add
ATTR_FORMAT or ATTRIBUTE_FPTR_PRINTF.
* complaints.c (vcomplaint): Likewise.
* defs.h (xvasprintf, xstrvprintf, verror, vfatal)
(internal_verror, internal_vwarning, vwarning)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_readline_begin_hook): Likewise.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (throw_verror, throw_vfatal): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* tui/tui-out.c (tui_field_fmt, tui_message, out_field_fmt):
Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message, field_fmt_ftype)
(message_ftype): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem)
(defaulted_query, printchar): Likewise.
gdb/gdbserver/
* server.h (error, fatal, warning): Add ATTR_FORMAT.
2005-07-31 20:56:26 +00:00
|
|
|
const char *format, va_list args)
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 21:14:59 +00:00
|
|
|
ATTRIBUTE_PRINTF (6, 0);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_spaces (struct ui_out *uiout, int numspaces);
|
2001-06-11 16:34:47 +00:00
|
|
|
static void uo_text (struct ui_out *uiout, const char *string);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_message (struct ui_out *uiout, int verbosity,
|
From Kaveh R. Ghazi <ghazi@caip.rutgers.edu>:
gdb/
* cli-out.c (cli_field_fmt, cli_message, out_field_fmt): Add
ATTR_FORMAT or ATTRIBUTE_FPTR_PRINTF.
* complaints.c (vcomplaint): Likewise.
* defs.h (xvasprintf, xstrvprintf, verror, vfatal)
(internal_verror, internal_vwarning, vwarning)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_readline_begin_hook): Likewise.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (throw_verror, throw_vfatal): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* tui/tui-out.c (tui_field_fmt, tui_message, out_field_fmt):
Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message, field_fmt_ftype)
(message_ftype): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem)
(defaulted_query, printchar): Likewise.
gdb/gdbserver/
* server.h (error, fatal, warning): Add ATTR_FORMAT.
2005-07-31 20:56:26 +00:00
|
|
|
const char *format, va_list args)
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 21:14:59 +00:00
|
|
|
ATTRIBUTE_PRINTF (3, 0);
|
2000-02-03 04:14:45 +00:00
|
|
|
static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
|
|
|
|
|
static void uo_flush (struct ui_out *uiout);
|
2003-06-28 16:19:07 +00:00
|
|
|
static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream);
|
2013-02-12 01:47:49 +00:00
|
|
|
static void uo_data_destroy (struct ui_out *uiout);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
|
|
|
|
|
extern void _initialize_ui_out (void);
|
2001-06-11 16:34:47 +00:00
|
|
|
static void append_header_to_list (struct ui_out *uiout, int width,
|
2001-06-21 15:39:54 +00:00
|
|
|
int alignment, const char *col_name,
|
|
|
|
|
const char *colhdr);
|
2001-12-07 17:51:13 +00:00
|
|
|
static int get_next_header (struct ui_out *uiout, int *colno, int *width,
|
2000-02-03 04:14:45 +00:00
|
|
|
int *alignment, char **colhdr);
|
|
|
|
|
static void clear_header_list (struct ui_out *uiout);
|
2013-02-12 01:47:49 +00:00
|
|
|
static void clear_table (struct ui_out *uiout);
|
2001-12-15 05:18:42 +00:00
|
|
|
static void verify_field (struct ui_out *uiout, int *fldno, int *width,
|
|
|
|
|
int *align);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
/* exported functions (ui_out API) */
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Mark beginning of a table. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 01:18:37 +00:00
|
|
|
static void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
|
2001-06-19 16:19:16 +00:00
|
|
|
int nr_rows,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *tblid)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("tables cannot be nested; table_begin found before \
|
|
|
|
|
previous table_end."));
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.flag = 1;
|
|
|
|
|
uiout->table.body_flag = 0;
|
2001-12-15 05:18:42 +00:00
|
|
|
uiout->table.entry_level = uiout->level + 1;
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.columns = nbrofcols;
|
2000-02-03 04:14:45 +00:00
|
|
|
if (tblid != NULL)
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.id = xstrdup (tblid);
|
2000-02-03 04:14:45 +00:00
|
|
|
else
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.id = NULL;
|
2000-02-03 04:14:45 +00:00
|
|
|
clear_header_list (uiout);
|
|
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_table_body (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
if (!uiout->table.flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("table_body outside a table is not valid; it must be \
|
|
|
|
|
after a table_begin and before a table_end."));
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.body_flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("extra table_body call not allowed; there must be \
|
|
|
|
|
only one table_body after a table_begin and before a table_end."));
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.header_next->colno != uiout->table.columns)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("number of headers differ from number of table \
|
|
|
|
|
columns."));
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.body_flag = 1;
|
|
|
|
|
uiout->table.header_next = uiout->table.header_first;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uo_table_body (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 01:18:37 +00:00
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_table_end (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
if (!uiout->table.flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("misplaced table_end or missing table_begin."));
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
uiout->table.entry_level = 0;
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.body_flag = 0;
|
|
|
|
|
uiout->table.flag = 0;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uo_table_end (uiout);
|
2013-02-12 01:47:49 +00:00
|
|
|
clear_table (uiout);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
2001-06-21 15:39:54 +00:00
|
|
|
const char *col_name,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *colhdr)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
if (!uiout->table.flag || uiout->table.body_flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("table header must be specified after table_begin \
|
|
|
|
|
and before table_body."));
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-06-21 15:39:54 +00:00
|
|
|
append_header_to_list (uiout, width, alignment, col_name, colhdr);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-06-21 15:39:54 +00:00
|
|
|
uo_table_header (uiout, width, alignment, col_name, colhdr);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 01:18:37 +00:00
|
|
|
static void
|
|
|
|
|
do_cleanup_table_end (void *data)
|
|
|
|
|
{
|
|
|
|
|
struct ui_out *ui_out = data;
|
|
|
|
|
|
|
|
|
|
ui_out_table_end (ui_out);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_ui_out_table_begin_end (struct ui_out *ui_out, int nr_cols,
|
|
|
|
|
int nr_rows, const char *tblid)
|
|
|
|
|
{
|
|
|
|
|
ui_out_table_begin (ui_out, nr_cols, nr_rows, tblid);
|
|
|
|
|
return make_cleanup (do_cleanup_table_end, ui_out);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
void
|
2001-05-09 01:33:10 +00:00
|
|
|
ui_out_begin (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
const char *id)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-05-09 00:23:23 +00:00
|
|
|
int new_level;
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.flag && !uiout->table.body_flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("table header or table_body expected; lists must be \
|
|
|
|
|
specified after table_body."));
|
2001-12-15 05:18:42 +00:00
|
|
|
|
|
|
|
|
/* Be careful to verify the ``field'' before the new tuple/list is
|
|
|
|
|
pushed onto the stack. That way the containing list/table/row is
|
|
|
|
|
verified and not the newly created tuple/list. This verification
|
|
|
|
|
is needed (at least) for the case where a table row entry
|
|
|
|
|
contains either a tuple/list. For that case bookkeeping such as
|
|
|
|
|
updating the column count or advancing to the next heading still
|
|
|
|
|
needs to be performed. */
|
|
|
|
|
{
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-09 01:33:10 +00:00
|
|
|
new_level = push_level (uiout, type, id);
|
2001-12-15 05:18:42 +00:00
|
|
|
|
|
|
|
|
/* If the push puts us at the same level as a table row entry, we've
|
|
|
|
|
got a new table row. Put the header pointer back to the start. */
|
|
|
|
|
if (uiout->table.body_flag
|
|
|
|
|
&& uiout->table.entry_level == new_level)
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.header_next = uiout->table.header_first;
|
2001-12-15 05:18:42 +00:00
|
|
|
|
2001-05-09 01:33:10 +00:00
|
|
|
uo_begin (uiout, type, new_level, id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ui_out_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type)
|
|
|
|
|
{
|
|
|
|
|
int old_level = pop_level (uiout, type);
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2001-05-09 01:33:10 +00:00
|
|
|
uo_end (uiout, type, old_level);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
2001-05-10 21:30:37 +00:00
|
|
|
struct ui_out_end_cleanup_data
|
|
|
|
|
{
|
|
|
|
|
struct ui_out *uiout;
|
|
|
|
|
enum ui_out_type type;
|
|
|
|
|
};
|
|
|
|
|
|
2001-01-27 17:57:53 +00:00
|
|
|
static void
|
2001-05-10 21:30:37 +00:00
|
|
|
do_cleanup_end (void *data)
|
|
|
|
|
{
|
|
|
|
|
struct ui_out_end_cleanup_data *end_cleanup_data = data;
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2001-05-10 21:30:37 +00:00
|
|
|
ui_out_end (end_cleanup_data->uiout, end_cleanup_data->type);
|
|
|
|
|
xfree (end_cleanup_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct cleanup *
|
|
|
|
|
make_cleanup_ui_out_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type)
|
|
|
|
|
{
|
|
|
|
|
struct ui_out_end_cleanup_data *end_cleanup_data;
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2013-12-28 22:31:23 +00:00
|
|
|
end_cleanup_data = XNEW (struct ui_out_end_cleanup_data);
|
2001-05-10 21:30:37 +00:00
|
|
|
end_cleanup_data->uiout = uiout;
|
|
|
|
|
end_cleanup_data->type = type;
|
|
|
|
|
return make_cleanup (do_cleanup_end, end_cleanup_data);
|
|
|
|
|
}
|
|
|
|
|
|
2001-01-27 17:57:53 +00:00
|
|
|
struct cleanup *
|
2001-05-12 04:08:24 +00:00
|
|
|
make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
|
|
|
|
|
const char *id)
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 01:18:37 +00:00
|
|
|
ui_out_begin (uiout, ui_out_type_tuple, id);
|
2001-05-12 04:08:24 +00:00
|
|
|
return make_cleanup_ui_out_end (uiout, ui_out_type_tuple);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
2001-06-12 16:44:36 +00:00
|
|
|
make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
|
|
|
|
|
const char *id)
|
2001-01-27 17:57:53 +00:00
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 01:18:37 +00:00
|
|
|
ui_out_begin (uiout, ui_out_type_list, id);
|
2001-05-10 21:30:37 +00:00
|
|
|
return make_cleanup_ui_out_end (uiout, ui_out_type_list);
|
2001-01-27 17:57:53 +00:00
|
|
|
}
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_field_int (struct ui_out *uiout,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
int value)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uo_field_int (uiout, fldno, width, align, fldname, value);
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-03 22:34:58 +00:00
|
|
|
void
|
|
|
|
|
ui_out_field_fmt_int (struct ui_out *uiout,
|
|
|
|
|
int input_width,
|
|
|
|
|
enum ui_align input_align,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
int value)
|
|
|
|
|
{
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
|
|
|
|
|
|
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
|
|
|
|
|
|
|
|
|
uo_field_int (uiout, fldno, input_width, input_align, fldname, value);
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-04 18:50:17 +00:00
|
|
|
/* Documented in ui-out.h. */
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_field_core_addr (struct ui_out *uiout,
|
|
|
|
|
const char *fldname,
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-02 17:21:10 +00:00
|
|
|
struct gdbarch *gdbarch,
|
2001-06-11 16:34:47 +00:00
|
|
|
CORE_ADDR address)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2011-03-31 14:32:49 +00:00
|
|
|
ui_out_field_string (uiout, fldname,
|
|
|
|
|
print_core_address (gdbarch, address));
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_field_stream (struct ui_out *uiout,
|
|
|
|
|
const char *fldname,
|
2012-03-27 19:08:37 +00:00
|
|
|
struct ui_file *stream)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
long length;
|
2012-03-27 19:08:37 +00:00
|
|
|
char *buffer = ui_file_xstrdup (stream, &length);
|
2000-12-15 01:01:51 +00:00
|
|
|
struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
if (length > 0)
|
|
|
|
|
ui_out_field_string (uiout, fldname, buffer);
|
|
|
|
|
else
|
|
|
|
|
ui_out_field_skip (uiout, fldname);
|
2012-03-27 19:08:37 +00:00
|
|
|
ui_file_rewind (stream);
|
2000-02-03 04:14:45 +00:00
|
|
|
do_cleanups (old_cleanup);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Used to omit a field. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_field_skip (struct ui_out *uiout,
|
|
|
|
|
const char *fldname)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uo_field_skip (uiout, fldno, width, align, fldname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ui_out_field_string (struct ui_out *uiout,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *fldname,
|
2000-02-03 04:14:45 +00:00
|
|
|
const char *string)
|
|
|
|
|
{
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uo_field_string (uiout, fldno, width, align, fldname, string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* VARARGS */
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_field_fmt (struct ui_out *uiout,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
const char *format, ...)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
va_list args;
|
|
|
|
|
int fldno;
|
|
|
|
|
int width;
|
|
|
|
|
int align;
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Will not align, but has to call anyway. */
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (uiout, &fldno, &width, &align);
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
va_start (args, format);
|
|
|
|
|
|
|
|
|
|
uo_field_fmt (uiout, fldno, width, align, fldname, format, args);
|
|
|
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_spaces (struct ui_out *uiout, int numspaces)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
uo_spaces (uiout, numspaces);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_text (struct ui_out *uiout,
|
|
|
|
|
const char *string)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
uo_text (uiout, string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
ui_out_message (struct ui_out *uiout, int verbosity,
|
|
|
|
|
const char *format,...)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
|
|
va_start (args, format);
|
|
|
|
|
uo_message (uiout, verbosity, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_wrap_hint (struct ui_out *uiout, char *identstring)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
uo_wrap_hint (uiout, identstring);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_flush (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
uo_flush (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-28 16:19:07 +00:00
|
|
|
int
|
|
|
|
|
ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
|
|
|
{
|
|
|
|
|
return uo_redirect (uiout, outstream);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Set the flags specified by the mask given. */
|
2000-02-03 04:14:45 +00:00
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_set_flags (struct ui_out *uiout, int mask)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2000-05-15 01:44:40 +00:00
|
|
|
int oldflags = uiout->flags;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2000-02-17 20:08:48 +00:00
|
|
|
uiout->flags |= mask;
|
2000-02-03 04:14:45 +00:00
|
|
|
return oldflags;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Clear the flags specified by the mask given. */
|
2000-02-03 04:14:45 +00:00
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_clear_flags (struct ui_out *uiout, int mask)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2000-05-15 01:44:40 +00:00
|
|
|
int oldflags = uiout->flags;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
uiout->flags &= ~mask;
|
|
|
|
|
return oldflags;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Test the flags against the mask given. */
|
2000-02-03 04:14:45 +00:00
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_test_flags (struct ui_out *uiout, int mask)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
return (uiout->flags & mask);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Obtain the current verbosity level (as stablished by the
|
|
|
|
|
'set verbositylevel' command. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
ui_out_get_verblvl (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2011-01-12 01:23:29 +00:00
|
|
|
/* FIXME: not implemented yet. */
|
2000-02-03 04:14:45 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-06 03:53:11 +00:00
|
|
|
int
|
|
|
|
|
ui_out_is_mi_like_p (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
return uiout->impl->is_mi_like_p;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Default gdb-out hook functions. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
static void
|
2001-06-19 16:19:16 +00:00
|
|
|
default_table_begin (struct ui_out *uiout, int nbrofcols,
|
|
|
|
|
int nr_rows,
|
|
|
|
|
const char *tblid)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_table_body (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_table_end (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
2001-06-21 15:39:54 +00:00
|
|
|
const char *col_name,
|
2001-06-10 00:22:41 +00:00
|
|
|
const char *colhdr)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-05-09 01:33:10 +00:00
|
|
|
default_begin (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level,
|
|
|
|
|
const char *id)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-05-09 01:33:10 +00:00
|
|
|
default_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_field_int (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align align,
|
|
|
|
|
const char *fldname, int value)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_field_skip (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align align, const char *fldname)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
default_field_string (struct ui_out *uiout,
|
|
|
|
|
int fldno,
|
|
|
|
|
int width,
|
|
|
|
|
enum ui_align align,
|
2001-06-10 00:22:41 +00:00
|
|
|
const char *fldname,
|
2000-02-03 04:14:45 +00:00
|
|
|
const char *string)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_field_fmt (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 00:22:41 +00:00
|
|
|
enum ui_align align,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
const char *format,
|
2000-07-30 01:48:28 +00:00
|
|
|
va_list args)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_spaces (struct ui_out *uiout, int numspaces)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-06-10 00:22:41 +00:00
|
|
|
default_text (struct ui_out *uiout, const char *string)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-06-10 00:22:41 +00:00
|
|
|
default_message (struct ui_out *uiout, int verbosity,
|
|
|
|
|
const char *format,
|
2000-07-30 01:48:28 +00:00
|
|
|
va_list args)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_wrap_hint (struct ui_out *uiout, char *identstring)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
default_flush (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-12 01:47:49 +00:00
|
|
|
static void
|
|
|
|
|
default_data_destroy (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Interface to the implementation functions. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_table_begin (struct ui_out *uiout, int nbrofcols,
|
2001-06-19 16:19:16 +00:00
|
|
|
int nr_rows,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *tblid)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->table_begin)
|
|
|
|
|
return;
|
2001-06-19 16:19:16 +00:00
|
|
|
uiout->impl->table_begin (uiout, nbrofcols, nr_rows, tblid);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_table_body (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->table_body)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->table_body (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_table_end (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->table_end)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->table_end (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_table_header (struct ui_out *uiout, int width, enum ui_align align,
|
2001-06-21 15:39:54 +00:00
|
|
|
const char *col_name,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *colhdr)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->table_header)
|
|
|
|
|
return;
|
2001-06-21 15:39:54 +00:00
|
|
|
uiout->impl->table_header (uiout, width, align, col_name, colhdr);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
2013-02-12 01:47:49 +00:00
|
|
|
/* Clear the table associated with UIOUT. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
clear_table (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
if (uiout->table.id)
|
|
|
|
|
xfree (uiout->table.id);
|
|
|
|
|
clear_header_list (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
void
|
2001-05-09 01:33:10 +00:00
|
|
|
uo_begin (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level,
|
|
|
|
|
const char *id)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-05-09 01:33:10 +00:00
|
|
|
if (uiout->impl->begin == NULL)
|
2000-02-03 04:14:45 +00:00
|
|
|
return;
|
2001-05-09 01:33:10 +00:00
|
|
|
uiout->impl->begin (uiout, type, level, id);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-05-09 01:33:10 +00:00
|
|
|
uo_end (struct ui_out *uiout,
|
|
|
|
|
enum ui_out_type type,
|
|
|
|
|
int level)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-05-09 01:33:10 +00:00
|
|
|
if (uiout->impl->end == NULL)
|
2000-02-03 04:14:45 +00:00
|
|
|
return;
|
2001-05-09 01:33:10 +00:00
|
|
|
uiout->impl->end (uiout, type, level);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align align,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
int value)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->field_int)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->field_int (uiout, fldno, width, align, fldname, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_field_skip (struct ui_out *uiout, int fldno, int width, enum ui_align align,
|
|
|
|
|
const char *fldname)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->field_skip)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->field_skip (uiout, fldno, width, align, fldname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_field_string (struct ui_out *uiout, int fldno, int width,
|
2001-06-11 16:34:47 +00:00
|
|
|
enum ui_align align,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
const char *string)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->field_string)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->field_string (uiout, fldno, width, align, fldname, string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align,
|
|
|
|
|
const char *fldname,
|
|
|
|
|
const char *format,
|
|
|
|
|
va_list args)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->field_fmt)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->field_fmt (uiout, fldno, width, align, fldname, format, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_spaces (struct ui_out *uiout, int numspaces)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->spaces)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->spaces (uiout, numspaces);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_text (struct ui_out *uiout,
|
|
|
|
|
const char *string)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->text)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->text (uiout, string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2001-06-11 16:34:47 +00:00
|
|
|
uo_message (struct ui_out *uiout, int verbosity,
|
|
|
|
|
const char *format,
|
|
|
|
|
va_list args)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
if (!uiout->impl->message)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->message (uiout, verbosity, format, args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_wrap_hint (struct ui_out *uiout, char *identstring)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->wrap_hint)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->wrap_hint (uiout, identstring);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
uo_flush (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->flush)
|
|
|
|
|
return;
|
|
|
|
|
uiout->impl->flush (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-28 16:19:07 +00:00
|
|
|
int
|
|
|
|
|
uo_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->redirect)
|
|
|
|
|
return -1;
|
|
|
|
|
uiout->impl->redirect (uiout, outstream);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-12 01:47:49 +00:00
|
|
|
void
|
|
|
|
|
uo_data_destroy (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
if (!uiout->impl->data_destroy)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
uiout->impl->data_destroy (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
/* local functions */
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* List of column headers manipulation routines. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
clear_header_list (struct ui_out *uiout)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
while (uiout->table.header_first != NULL)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.header_next = uiout->table.header_first;
|
|
|
|
|
uiout->table.header_first = uiout->table.header_first->next;
|
2012-05-31 18:44:50 +00:00
|
|
|
xfree (uiout->table.header_next->colhdr);
|
|
|
|
|
xfree (uiout->table.header_next->col_name);
|
2001-12-07 17:51:13 +00:00
|
|
|
xfree (uiout->table.header_next);
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
2001-12-07 17:51:13 +00:00
|
|
|
gdb_assert (uiout->table.header_first == NULL);
|
|
|
|
|
uiout->table.header_last = NULL;
|
|
|
|
|
uiout->table.header_next = NULL;
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
append_header_to_list (struct ui_out *uiout,
|
|
|
|
|
int width,
|
|
|
|
|
int alignment,
|
2001-06-21 15:39:54 +00:00
|
|
|
const char *col_name,
|
2001-06-11 16:34:47 +00:00
|
|
|
const char *colhdr)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
struct ui_out_hdr *temphdr;
|
|
|
|
|
|
2013-12-28 22:31:23 +00:00
|
|
|
temphdr = XNEW (struct ui_out_hdr);
|
2000-02-03 04:14:45 +00:00
|
|
|
temphdr->width = width;
|
|
|
|
|
temphdr->alignment = alignment;
|
2007-08-18 19:45:48 +00:00
|
|
|
/* We have to copy the column title as the original may be an
|
|
|
|
|
automatic. */
|
2000-02-03 04:14:45 +00:00
|
|
|
if (colhdr != NULL)
|
2001-06-21 15:39:54 +00:00
|
|
|
temphdr->colhdr = xstrdup (colhdr);
|
|
|
|
|
else
|
|
|
|
|
temphdr->colhdr = NULL;
|
2007-08-18 19:45:48 +00:00
|
|
|
|
2001-06-21 15:39:54 +00:00
|
|
|
if (col_name != NULL)
|
2007-08-18 19:45:48 +00:00
|
|
|
temphdr->col_name = xstrdup (col_name);
|
|
|
|
|
else if (colhdr != NULL)
|
2001-06-21 15:39:54 +00:00
|
|
|
temphdr->col_name = xstrdup (colhdr);
|
|
|
|
|
else
|
2007-08-18 19:45:48 +00:00
|
|
|
temphdr->col_name = NULL;
|
|
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
temphdr->next = NULL;
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.header_first == NULL)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
temphdr->colno = 1;
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.header_first = temphdr;
|
|
|
|
|
uiout->table.header_last = temphdr;
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
temphdr->colno = uiout->table.header_last->colno + 1;
|
|
|
|
|
uiout->table.header_last->next = temphdr;
|
|
|
|
|
uiout->table.header_last = temphdr;
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.header_next = uiout->table.header_last;
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
2011-04-19 18:04:11 +00:00
|
|
|
/* Extract the format information for the NEXT header and advance
|
2001-12-07 17:51:13 +00:00
|
|
|
the header pointer. Return 0 if there was no next header. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
static int
|
2001-12-07 17:51:13 +00:00
|
|
|
get_next_header (struct ui_out *uiout,
|
2000-02-03 04:14:45 +00:00
|
|
|
int *colno,
|
|
|
|
|
int *width,
|
|
|
|
|
int *alignment,
|
|
|
|
|
char **colhdr)
|
|
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
/* There may be no headers at all or we may have used all columns. */
|
|
|
|
|
if (uiout->table.header_next == NULL)
|
2000-02-03 04:14:45 +00:00
|
|
|
return 0;
|
2001-12-07 17:51:13 +00:00
|
|
|
*colno = uiout->table.header_next->colno;
|
|
|
|
|
*width = uiout->table.header_next->width;
|
|
|
|
|
*alignment = uiout->table.header_next->alignment;
|
|
|
|
|
*colhdr = uiout->table.header_next->colhdr;
|
|
|
|
|
/* Advance the header pointer to the next entry. */
|
|
|
|
|
uiout->table.header_next = uiout->table.header_next->next;
|
2000-02-03 04:14:45 +00:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
|
|
|
|
|
/* Verify that the field/tuple/list is correctly positioned. Return
|
|
|
|
|
the field number and corresponding alignment (if
|
|
|
|
|
available/applicable). */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
static void
|
2001-12-15 05:18:42 +00:00
|
|
|
verify_field (struct ui_out *uiout, int *fldno, int *width, int *align)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-15 05:18:42 +00:00
|
|
|
struct ui_out_level *current = current_level (uiout);
|
|
|
|
|
char *text;
|
|
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
if (uiout->table.flag)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-07 17:51:13 +00:00
|
|
|
if (!uiout->table.body_flag)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("table_body missing; table fields must be \
|
|
|
|
|
specified after table_body and inside a list."));
|
2001-12-15 05:18:42 +00:00
|
|
|
/* NOTE: cagney/2001-12-08: There was a check here to ensure
|
|
|
|
|
that this code was only executed when uiout->level was
|
|
|
|
|
greater than zero. That no longer applies - this code is run
|
|
|
|
|
before each table row tuple is started and at that point the
|
|
|
|
|
level is zero. */
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
current->field_count += 1;
|
2000-02-03 04:14:45 +00:00
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
if (uiout->table.body_flag
|
|
|
|
|
&& uiout->table.entry_level == uiout->level
|
|
|
|
|
&& get_next_header (uiout, fldno, width, align, &text))
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
2001-12-15 05:18:42 +00:00
|
|
|
if (*fldno != current->field_count)
|
2001-02-08 06:03:54 +00:00
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
_("ui-out internal error in handling headers."));
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*width = 0;
|
|
|
|
|
*align = ui_noalign;
|
2001-12-15 05:18:42 +00:00
|
|
|
*fldno = current->field_count;
|
2000-02-03 04:14:45 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-15 05:18:42 +00:00
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Access to ui-out members data. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 00:11:55 +00:00
|
|
|
void *
|
2000-02-03 04:14:45 +00:00
|
|
|
ui_out_data (struct ui_out *uiout)
|
|
|
|
|
{
|
|
|
|
|
return uiout->data;
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-28 15:21:21 +00:00
|
|
|
/* Access table field parameters. */
|
|
|
|
|
int
|
|
|
|
|
ui_out_query_field (struct ui_out *uiout, int colno,
|
|
|
|
|
int *width, int *alignment, char **col_name)
|
|
|
|
|
{
|
|
|
|
|
struct ui_out_hdr *hdr;
|
|
|
|
|
|
|
|
|
|
if (!uiout->table.flag)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (hdr = uiout->table.header_first; hdr; hdr = hdr->next)
|
|
|
|
|
if (hdr->colno == colno)
|
|
|
|
|
{
|
|
|
|
|
*width = hdr->width;
|
|
|
|
|
*alignment = hdr->alignment;
|
|
|
|
|
*col_name = hdr->col_name;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Initalize private members at startup. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
struct ui_out *
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 00:11:55 +00:00
|
|
|
ui_out_new (struct ui_out_impl *impl, void *data,
|
2000-02-03 04:14:45 +00:00
|
|
|
int flags)
|
|
|
|
|
{
|
2013-12-28 22:31:23 +00:00
|
|
|
struct ui_out *uiout = XNEW (struct ui_out);
|
|
|
|
|
struct ui_out_level *current = XNEW (struct ui_out_level);
|
2010-05-17 01:15:20 +00:00
|
|
|
|
2000-02-03 04:14:45 +00:00
|
|
|
uiout->data = data;
|
|
|
|
|
uiout->impl = impl;
|
|
|
|
|
uiout->flags = flags;
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.flag = 0;
|
|
|
|
|
uiout->table.body_flag = 0;
|
2001-05-09 00:23:23 +00:00
|
|
|
uiout->level = 0;
|
2013-05-22 12:27:13 +00:00
|
|
|
uiout->levels = NULL;
|
|
|
|
|
|
|
|
|
|
/* Create uiout->level 0, the default level. */
|
|
|
|
|
current->type = ui_out_type_tuple;
|
|
|
|
|
current->field_count = 0;
|
|
|
|
|
VEC_safe_push (ui_out_level_p, uiout->levels, current);
|
|
|
|
|
|
2001-12-07 17:51:13 +00:00
|
|
|
uiout->table.header_first = NULL;
|
|
|
|
|
uiout->table.header_last = NULL;
|
|
|
|
|
uiout->table.header_next = NULL;
|
2000-02-03 04:14:45 +00:00
|
|
|
return uiout;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-12 01:47:49 +00:00
|
|
|
/* Free UIOUT and the memory areas it references. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ui_out_destroy (struct ui_out *uiout)
|
|
|
|
|
{
|
2013-05-22 12:27:13 +00:00
|
|
|
int i;
|
|
|
|
|
struct ui_out_level *current;
|
|
|
|
|
|
|
|
|
|
/* Make sure that all levels are freed in the case where levels have
|
|
|
|
|
been pushed, but not popped before the ui_out object is
|
|
|
|
|
destroyed. */
|
|
|
|
|
for (i = 0;
|
|
|
|
|
VEC_iterate (ui_out_level_p, uiout->levels, i, current);
|
|
|
|
|
++i)
|
|
|
|
|
xfree (current);
|
|
|
|
|
|
|
|
|
|
VEC_free (ui_out_level_p, uiout->levels);
|
2013-02-12 01:47:49 +00:00
|
|
|
uo_data_destroy (uiout);
|
|
|
|
|
clear_table (uiout);
|
|
|
|
|
xfree (uiout);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 01:23:29 +00:00
|
|
|
/* Standard gdb initialization hook. */
|
2000-02-03 04:14:45 +00:00
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
_initialize_ui_out (void)
|
2000-02-03 04:14:45 +00:00
|
|
|
{
|
|
|
|
|
/* nothing needs to be done */
|
|
|
|
|
}
|
