aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2013-12-19 14:33:20 +0400
committerJoel Brobecker <brobecker@adacore.com>2014-01-07 08:17:38 +0400
commitcd1630f983e42527bc1b68b2f430b41ffadd16c4 (patch)
tree394be37c303a87c33a8f12db96826f3923290a39
parentbdf779a0c5d06c958585c3ba9ca4613da163cda8 (diff)
downloadgdb-cd1630f983e42527bc1b68b2f430b41ffadd16c4.zip
gdb-cd1630f983e42527bc1b68b2f430b41ffadd16c4.tar.gz
gdb-cd1630f983e42527bc1b68b2f430b41ffadd16c4.tar.bz2
ada_val_print_1: Add language parameter
This is to help calling val_print. We would like to be more systematic in calling val_print when printing, because it allows us to make sure we take advantage of the standard features such as pretty-printing which are handled by val_print. gdb/ChangeLog: * ada-valprint.c (ada_val_print_1): Add parameter "language". Update calls to self accordingly. Replace calls to c_val_print by calls to val_print.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/ada-valprint.c25
2 files changed, 20 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 64d1e6b..2866cae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2014-01-07 Joel Brobecker <brobecker@adacore.com>
+ * ada-valprint.c (ada_val_print_1): Add parameter "language".
+ Update calls to self accordingly. Replace calls to c_val_print
+ by calls to val_print.
+
+2014-01-07 Joel Brobecker <brobecker@adacore.com>
+
* ada-valprint.c (print_record): Delete declaration.
(adjust_type_signedness, ada_val_print_1): Likewise.
(ada_val_print): Move function implementation down.
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 5162737..66cda39 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -780,7 +780,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
int offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
const struct value *original_value,
- const struct value_print_options *options)
+ const struct value_print_options *options,
+ const struct language_defn *language)
{
int i;
struct type *elttype;
@@ -814,7 +815,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
value_contents_for_printing (val),
value_embedded_offset (val),
value_address (val), stream, recurse,
- val, options);
+ val, options, language);
value_free_to_mark (mark);
return;
}
@@ -825,14 +826,14 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
switch (TYPE_CODE (type))
{
default:
- c_val_print (type, valaddr, offset, address, stream,
- recurse, original_value, options);
+ val_print (type, valaddr, offset, address, stream, recurse,
+ original_value, options, language_def (language_c));
break;
case TYPE_CODE_PTR:
{
- c_val_print (type, valaddr, offset, address,
- stream, recurse, original_value, options);
+ val_print (type, valaddr, offset, address, stream, recurse,
+ original_value, options, language_def (language_c));
if (ada_is_tag_type (type))
{
@@ -875,13 +876,14 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
ada_val_print_1 (target_type,
value_contents_for_printing (v),
value_embedded_offset (v), 0,
- stream, recurse + 1, v, options);
+ stream, recurse + 1, v, options,
+ language);
}
else
ada_val_print_1 (TYPE_TARGET_TYPE (type),
valaddr, offset,
address, stream, recurse,
- original_value, options);
+ original_value, options, language);
return;
}
else
@@ -970,8 +972,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
case TYPE_CODE_FLT:
if (options->format)
{
- c_val_print (type, valaddr, offset, address, stream,
- recurse, original_value, options);
+ val_print (type, valaddr, offset, address, stream, recurse,
+ original_value, options, language_def (language_c));
return;
}
else
@@ -1066,7 +1068,8 @@ ada_val_print (struct type *type, const gdb_byte *valaddr,
TRY_CATCH (except, RETURN_MASK_ALL)
{
ada_val_print_1 (type, valaddr, embedded_offset, address,
- stream, recurse, val, options);
+ stream, recurse, val, options,
+ current_language);
}
}