[40/55] Introduce c_value_print_ptr

Message ID 20191208182958.10181-41-tom@tromey.com
State New
Headers show
Series
  • Remove val_print
Related show

Commit Message

Tom Tromey Dec. 8, 2019, 6:29 p.m.
This adds c_value_print_ptr, a value-based analogue of
c_val_print_ptr.

gdb/ChangeLog
2019-12-08  Tom Tromey  <tom@tromey.com>

	* c-valprint.c (c_value_print_ptr): New function.
	(c_value_print_inner): Use it.

Change-Id: Iba7917a57d5d67c51a76014c4bcb82c0353f6453
---
 gdb/ChangeLog    |  5 +++++
 gdb/c-valprint.c | 40 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

-- 
2.17.2

Comments

Simon Marchi Jan. 15, 2020, 5:57 a.m. | #1
On 2019-12-08 1:29 p.m., Tom Tromey wrote:
> This adds c_value_print_ptr, a value-based analogue of

> c_val_print_ptr.

> 

> gdb/ChangeLog

> 2019-12-08  Tom Tromey  <tom@tromey.com>

> 

> 	* c-valprint.c (c_value_print_ptr): New function.

> 	(c_value_print_inner): Use it.

> 

> Change-Id: Iba7917a57d5d67c51a76014c4bcb82c0353f6453

> ---

>  gdb/ChangeLog    |  5 +++++

>  gdb/c-valprint.c | 40 ++++++++++++++++++++++++++++++++++++++--

>  2 files changed, 43 insertions(+), 2 deletions(-)

> 

> diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c

> index af7a386fb78..f50c49abbfd 100644

> --- a/gdb/c-valprint.c

> +++ b/gdb/c-valprint.c

> @@ -375,6 +375,43 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr,

>      }

>  }

>  

> +/* c_val_print helper for TYPE_CODE_PTR.  */

> +

> +static void

> +c_value_print_ptr (struct value*val, struct ui_file *stream, int recurse,


Missing a space.

Simon
Tom Tromey Jan. 23, 2020, 11:41 p.m. | #2
>>>>> "Simon" == Simon Marchi <simark@simark.ca> writes:


>> +static void

>> +c_value_print_ptr (struct value*val, struct ui_file *stream, int recurse,


Simon> Missing a space.

Thanks, I fixed this.

Tom

Patch

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index af7a386fb78..f50c49abbfd 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -375,6 +375,43 @@  c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
     }
 }
 
+/* c_val_print helper for TYPE_CODE_PTR.  */
+
+static void
+c_value_print_ptr (struct value*val, struct ui_file *stream, int recurse,
+		   const struct value_print_options *options)
+{
+  if (options->format && options->format != 's')
+    {
+      value_print_scalar_formatted (val, options, 0, stream);
+      return;
+    }
+
+  struct type *type = check_typedef (value_type (val));
+  struct gdbarch *arch = get_type_arch (type);
+  const gdb_byte *valaddr = value_contents_for_printing (val);
+
+  if (options->vtblprint && cp_is_vtbl_ptr_type (type))
+    {
+      /* Print the unmangled name if desired.  */
+      /* Print vtable entry - we only get here if we ARE using
+	 -fvtable_thunks.  (Otherwise, look under
+	 TYPE_CODE_STRUCT.)  */
+      CORE_ADDR addr = extract_typed_address (valaddr, type);
+
+      print_function_pointer_address (options, arch, addr, stream);
+    }
+  else
+    {
+      struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
+      struct type *elttype = check_typedef (unresolved_elttype);
+      CORE_ADDR addr = unpack_pointer (type, valaddr);
+
+      print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
+			      0, addr, stream, recurse, options);
+    }
+}
+
 /* c_val_print helper for TYPE_CODE_STRUCT.  */
 
 static void
@@ -582,8 +619,7 @@  c_value_print_inner (struct value *val, struct ui_file *stream, int recurse,
       break;
 
     case TYPE_CODE_PTR:
-      c_val_print_ptr (type, valaddr, 0, stream, recurse,
-		       val, options);
+      c_value_print_ptr (val, stream, recurse, options);
       break;
 
     case TYPE_CODE_UNION: