diff options
| -rw-r--r-- | gdb/c-lang.c | 28 | ||||
| -rw-r--r-- | gdb/d-lang.c | 7 | ||||
| -rw-r--r-- | gdb/language.h | 7 | ||||
| -rw-r--r-- | gdb/objc-lang.c | 7 | ||||
| -rw-r--r-- | gdb/opencl-lang.c | 7 | ||||
| -rw-r--r-- | gdb/rust-lang.h | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/ptype-offsets.exp | 13 | ||||
| -rw-r--r-- | gdb/typeprint.c | 4 |
8 files changed, 77 insertions, 3 deletions
diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 36b4d1a..e15541f 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -816,6 +816,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override @@ -966,6 +973,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override @@ -1066,6 +1080,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override @@ -1118,6 +1139,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override diff --git a/gdb/d-lang.c b/gdb/d-lang.c index d959199..bb48af6 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -144,6 +144,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override diff --git a/gdb/language.h b/gdb/language.h index 871b00b..c1c735a 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -451,6 +451,13 @@ struct language_defn return nullptr; } + /* Return true if this class' implementation of print_type can + handle the /o modifier. */ + virtual bool can_print_type_offsets () const + { + return false; + } + /* Print TYPE to STREAM using syntax appropriate for this language. LEVEL is the depth to indent lines by. VARSTRING, if not NULL or the empty string, is the name of a variable and TYPE should be printed in diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 1a1d621..3c2cbf4 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -266,6 +266,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index e41db3d..f7cf00c 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -953,6 +953,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override diff --git a/gdb/rust-lang.h b/gdb/rust-lang.h index f4c7b7f..a1d1026 100644 --- a/gdb/rust-lang.h +++ b/gdb/rust-lang.h @@ -107,6 +107,13 @@ public: /* See language.h. */ + bool can_print_type_offsets () const override + { + return true; + } + + /* See language.h. */ + void print_type (struct type *type, const char *varstring, struct ui_file *stream, int show, int level, const struct type_print_options *flags) const override; diff --git a/gdb/testsuite/gdb.base/ptype-offsets.exp b/gdb/testsuite/gdb.base/ptype-offsets.exp index eb41baf..b42fa4d 100644 --- a/gdb/testsuite/gdb.base/ptype-offsets.exp +++ b/gdb/testsuite/gdb.base/ptype-offsets.exp @@ -469,3 +469,16 @@ with_test_prefix "with_hex_default" { # restore gdb_test_no_output "set print type hex off" } + +gdb_test_no_output "set language asm" +gdb_test "ptype/o struct tuv" \ + [string_to_regexp [multi_line \ + "/* offset | size */ type = struct tuv \{" \ + "/* 0 | 4 */ int a1;" \ + "/* XXX 4-byte hole */" \ + "/* 8 | 8 */ signed char *a2;" \ + "/* 16 | 4 */ int a3;" \ + "/* XXX 4-byte padding */" \ + "" \ + " /* total size (bytes): 24 */" \ + " \}"]] diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 7904312..7a7ac6c 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -478,9 +478,7 @@ whatis_exp (const char *exp, int show) /* Filter out languages which don't implement the feature. */ if (show > 0 - && (current_language->la_language == language_c - || current_language->la_language == language_cplus - || current_language->la_language == language_rust)) + && current_language->can_print_type_offsets ()) { flags.print_offsets = 1; flags.print_typedefs = 0; |