aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-12-24 16:43:51 -0700
committerTom Tromey <tom@tromey.com>2019-12-27 09:33:37 -0700
commitf9ba974dea317eae6e7032b52b52314cbe43f9d8 (patch)
tree6c09ab7685769bb0ca67bc97e7232bad5d31a333
parenta1e4dee4350dec57393bec8944762c9848ee6049 (diff)
downloadgdb-f9ba974dea317eae6e7032b52b52314cbe43f9d8.zip
gdb-f9ba974dea317eae6e7032b52b52314cbe43f9d8.tar.gz
gdb-f9ba974dea317eae6e7032b52b52314cbe43f9d8.tar.bz2
Reorder an "if" in print_disassembly
I noticed that print_disassembly has two #if blocks for TUI code, where one would do. This patch rearranges the code slightly to remove a #if. gdb/ChangeLog 2019-12-27 Tom Tromey <tom@tromey.com> * cli/cli-cmds.c (print_disassembly): Reorder "if". Change-Id: I36f3f682f5685b3d9b148da5aed26eb3cc7d598e
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/cli/cli-cmds.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b31ddcd..571cd78 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2019-12-27 Tom Tromey <tom@tromey.com>
+ * cli/cli-cmds.c (print_disassembly): Reorder "if".
+
+2019-12-27 Tom Tromey <tom@tromey.com>
+
* tui/tui.c (tui_active): Now bool.
(tui_finish_init): Likewise.
(tui_enable): Update.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 681d53c..e141069 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1338,7 +1338,9 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
gdb_disassembly_flags flags)
{
#if defined(TUI)
- if (!tui_is_window_visible (DISASSEM_WIN))
+ if (tui_is_window_visible (DISASSEM_WIN))
+ tui_show_assembly (gdbarch, low);
+ else
#endif
{
printf_filtered ("Dump of assembler code ");
@@ -1368,12 +1370,6 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
}
printf_filtered ("End of assembler dump.\n");
}
-#if defined(TUI)
- else
- {
- tui_show_assembly (gdbarch, low);
- }
-#endif
}
/* Subroutine of disassemble_command to simplify it.