Style print_address_symbolic

print_address_symbolic does not use ui-out, so it did not style
function names.  This patch changes it to use the low-level style code
directly.

gdb/ChangeLog
2018-12-28  Tom Tromey  <tom@tromey.com>

	* printcmd.c (print_address_symbolic): Style function name.

gdb/testsuite/ChangeLog
2018-12-28  Tom Tromey  <tom@tromey.com>

	* gdb.base/style.exp: Add test for print_address_symbolic.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f9a8f092296374bea3671871b2035ee8bf8cd3d5..aa98a94fb4b0ab1746cff4e3f48e2e653899145c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-28  Tom Tromey  <tom@tromey.com>
+
+       * printcmd.c (print_address_symbolic): Style function name.
+
 2018-12-28  Tom Tromey  <tom@tromey.com>
 
        * breakpoint.c (say_where): Style file name.

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index dd1626455b7633ff2c3638429d995510bbd133d1..c5b6b1a75b268b309c9f922f63da4456331c0870 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -50,6 +50,7 @@
 #include "format.h"
 #include "source.h"
 #include "common/byte-vector.h"
+#include "cli/cli-style.h"
 
 /* Last specified output format.  */
 
@@ -535,7 +536,7 @@ print_address_symbolic (struct gdbarch *gdbarch, CORE_ADDR addr,
     fputs_filtered ("<*", stream);
   else
     fputs_filtered ("<", stream);
-  fputs_filtered (name.c_str (), stream);
+  fputs_styled (name.c_str (), function_name_style.style (), stream);
   if (offset != 0)
     fprintf_filtered (stream, "+%u", (unsigned int) offset);
 
@@ -543,10 +544,10 @@ print_address_symbolic (struct gdbarch *gdbarch, CORE_ADDR addr,
      line # of this addr, if we have it; else line # of the nearest symbol.  */
   if (print_symbol_filename && !filename.empty ())
     {
+      fputs_filtered (line == -1 ? " in " : " at ", stream);
+      fputs_styled (filename.c_str (), file_name_style.style (), stream);
       if (line != -1)
-       fprintf_filtered (stream, " at %s:%d", filename.c_str (), line);
-      else
-       fprintf_filtered (stream, " in %s", filename.c_str ());
+       fprintf_filtered (stream, ":%d", line);
     }
   if (unmapped)
     fputs_filtered ("*>", stream);

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index de21939317262f4b774615348d52122339988e08..78c8da4e45dc9eca837a24b82b932670f68f3cca 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-28  Tom Tromey  <tom@tromey.com>
+
+       * gdb.base/style.exp: Add test for print_address_symbolic.
+
 2018-12-28  Tom Tromey  <tom@tromey.com>
 
        * gdb.base/style.exp: Add test for breakpoint setting.

diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index f5d3fc2938d3958533e0526b346207c54252e93f..2978d82c053f5c6422b40139424055ad86ef76b3 100644 (file)
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -42,4 +42,6 @@ save_vars { env(TERM) } {
     gdb_test "info breakpoints" "$main_expr at $file_expr.*"
 
     gdb_test "break main" "file $base_file_expr.*"
+
+    gdb_test "print &main" " = .* <$main_expr>"
 }