diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/go-lang.c | 2 | ||||
| -rw-r--r-- | gdb/go-lang.h | 6 | ||||
| -rw-r--r-- | gdb/go-valprint.c | 37 |
4 files changed, 50 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 79ed024..862d4bc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2020-03-13 Tom Tromey <tom@tromey.com> + * go-valprint.c (go_value_print_inner): New function. + * go-lang.h (go_value_print_inner): Declare. + * go-lang.c (go_language_defn): Use go_value_print_inner. + +2020-03-13 Tom Tromey <tom@tromey.com> + * rust-lang.c (val_print_struct, rust_print_enum): Use the value API. (rust_val_print): Rewrite. diff --git a/gdb/go-lang.c b/gdb/go-lang.c index 314c281..667c4ae 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -596,7 +596,7 @@ extern const struct language_defn go_language_defn = c_print_typedef, /* Print a typedef using appropriate syntax. */ go_val_print, /* Print a value using appropriate syntax. */ - nullptr, /* la_value_print_inner */ + go_value_print_inner, /* la_value_print_inner */ c_value_print, /* Print a top-level value. */ default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline. */ diff --git a/gdb/go-lang.h b/gdb/go-lang.h index ccfcb8d..8647964 100644 --- a/gdb/go-lang.h +++ b/gdb/go-lang.h @@ -88,4 +88,10 @@ extern void go_val_print (struct type *type, struct value *val, const struct value_print_options *options); +/* Implement la_value_print_inner for Go. */ + +extern void go_value_print_inner (struct value *value, + struct ui_file *stream, int recurse, + const struct value_print_options *options); + #endif /* !defined (GO_LANG_H) */ diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c index 1648a6c..79b3ad5 100644 --- a/gdb/go-valprint.c +++ b/gdb/go-valprint.c @@ -122,3 +122,40 @@ go_val_print (struct type *type, int embedded_offset, break; } } + +/* See go-lang.h. */ + +void +go_value_print_inner (struct value *val, struct ui_file *stream, + int recurse, const struct value_print_options *options) +{ + struct type *type = check_typedef (value_type (val)); + + switch (TYPE_CODE (type)) + { + case TYPE_CODE_STRUCT: + { + enum go_type go_type = go_classify_struct_type (type); + + switch (go_type) + { + case GO_TYPE_STRING: + if (! options->raw) + { + print_go_string (type, value_embedded_offset (val), + value_address (val), + stream, recurse, val, options); + return; + } + break; + default: + break; + } + } + /* Fall through. */ + + default: + c_value_print_inner (val, stream, recurse, options); + break; + } +} |