From 009b64fc98a3bad39d19bbdca83a223dce3d87d4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 8 Feb 2020 13:40:54 -0700 Subject: [PATCH] Move dwarf_always_disassemble to dwarf2/loc.c dwarf_always_disassemble is only used in dwarf2/loc.c, so move the definition and the command infrastructure to that file. 2020-02-08 Tom Tromey * dwarf2/read.c (dwarf_always_disassemble) (show_dwarf_always_disassemble): Move to loc.c. (_initialize_dwarf2_read): Move "always-disassemble" registration to loc.c. * dwarf2/read.h (dwarf_always_disassemble): Don't declare. * dwarf2/loc.c (dwarf_always_disassemble): Move from read.c. Now static. (show_dwarf_always_disassemble): Move from read.c. (_initialize_dwarf2loc): Move always-disassemble from read.c. Change-Id: I33fb88112e98e583c3f4919d20e4d100f2ea0124 --- gdb/ChangeLog | 12 ++++++++++++ gdb/dwarf2/loc.c | 24 ++++++++++++++++++++++++ gdb/dwarf2/read.c | 24 ------------------------ gdb/dwarf2/read.h | 2 -- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5f51d56960d..07481add73c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2020-02-08 Tom Tromey + + * dwarf2/read.c (dwarf_always_disassemble) + (show_dwarf_always_disassemble): Move to loc.c. + (_initialize_dwarf2_read): Move "always-disassemble" registration + to loc.c. + * dwarf2/read.h (dwarf_always_disassemble): Don't declare. + * dwarf2/loc.c (dwarf_always_disassemble): Move from read.c. Now + static. + (show_dwarf_always_disassemble): Move from read.c. + (_initialize_dwarf2loc): Move always-disassemble from read.c. + 2020-02-08 Tom Tromey * dwarf2/read.c (~dwarf2_per_objfile): Update. diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 03333602820..e337a02d473 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -4177,6 +4177,18 @@ disassemble_dwarf_expression (struct ui_file *stream, return data; } +static bool dwarf_always_disassemble; + +static void +show_dwarf_always_disassemble (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + fprintf_filtered (file, + _("Whether to always disassemble " + "DWARF expressions is %s.\n"), + value); +} + /* Describe a single location, which may in turn consist of multiple pieces. */ @@ -4570,4 +4582,16 @@ _initialize_dwarf2loc () NULL, show_entry_values_debug, &setdebuglist, &showdebuglist); + + add_setshow_boolean_cmd ("always-disassemble", class_obscure, + &dwarf_always_disassemble, _("\ +Set whether `info address' always disassembles DWARF expressions."), _("\ +Show whether `info address' always disassembles DWARF expressions."), _("\ +When enabled, DWARF expressions are always printed in an assembly-like\n\ +syntax. When disabled, expressions will be printed in a more\n\ +conversational style, when possible."), + NULL, + show_dwarf_always_disassemble, + &set_dwarf_cmdlist, + &show_dwarf_cmdlist); } diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 6e893ba9fec..9cda828b198 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -25345,18 +25345,6 @@ show_dwarf_cmd (const char *args, int from_tty) cmd_show_list (show_dwarf_cmdlist, from_tty, ""); } -bool dwarf_always_disassemble; - -static void -show_dwarf_always_disassemble (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) -{ - fprintf_filtered (file, - _("Whether to always disassemble " - "DWARF expressions is %s.\n"), - value); -} - static void show_check_physname (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -25394,18 +25382,6 @@ caching, which can slow down startup."), &set_dwarf_cmdlist, &show_dwarf_cmdlist); - add_setshow_boolean_cmd ("always-disassemble", class_obscure, - &dwarf_always_disassemble, _("\ -Set whether `info address' always disassembles DWARF expressions."), _("\ -Show whether `info address' always disassembles DWARF expressions."), _("\ -When enabled, DWARF expressions are always printed in an assembly-like\n\ -syntax. When disabled, expressions will be printed in a more\n\ -conversational style, when possible."), - NULL, - show_dwarf_always_disassemble, - &set_dwarf_cmdlist, - &show_dwarf_cmdlist); - add_setshow_zuinteger_cmd ("dwarf-read", no_class, &dwarf_read_debug, _("\ Set debugging of the DWARF reader."), _("\ Show debugging of the DWARF reader."), _("\ diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 138a929011a..fdaafbbafab 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -33,8 +33,6 @@ extern struct cmd_list_element *set_dwarf_cmdlist; extern struct cmd_list_element *show_dwarf_cmdlist; -extern bool dwarf_always_disassemble; - struct tu_stats { int nr_uniq_abbrev_tables; -- 2.30.2