diff options
| -rw-r--r-- | gdb/ChangeLog | 21 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 1 | ||||
| -rw-r--r-- | gdb/c-lang.c | 4 | ||||
| -rw-r--r-- | gdb/d-lang.c | 1 | ||||
| -rw-r--r-- | gdb/f-lang.c | 1 | ||||
| -rw-r--r-- | gdb/go-lang.c | 1 | ||||
| -rw-r--r-- | gdb/guile/scm-value.c | 2 | ||||
| -rw-r--r-- | gdb/language.c | 10 | ||||
| -rw-r--r-- | gdb/language.h | 22 | ||||
| -rw-r--r-- | gdb/m2-lang.c | 1 | ||||
| -rw-r--r-- | gdb/objc-lang.c | 1 | ||||
| -rw-r--r-- | gdb/opencl-lang.c | 1 | ||||
| -rw-r--r-- | gdb/p-lang.c | 1 | ||||
| -rw-r--r-- | gdb/python/py-value.c | 2 | ||||
| -rw-r--r-- | gdb/rust-lang.c | 1 |
15 files changed, 23 insertions, 47 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 00d21fac1e7..5720c8e7fe1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,26 @@ 2019-11-05 Tom Tromey <tom@tromey.com> + * rust-lang.c (rust_language_defn): Update. + * python/py-value.c (valpy_string): Call c_get_string. + * p-lang.c (pascal_language_defn): Update. + * opencl-lang.c (opencl_language_defn): Update. + * objc-lang.c (objc_language_defn): Update. + * m2-lang.c (m2_language_defn): Update. + * language.c (unknown_language_defn, auto_language_defn): Update. + (default_get_string): Remove. + * guile/scm-value.c (gdbscm_value_to_string): Use c_get_string. + * go-lang.c (go_language_defn): Update. + * f-lang.c (f_language_defn): Update. + * d-lang.c (d_language_defn): Update. + * c-lang.c (c_language_defn, cplus_language_defn) + (asm_language_defn, minimal_language_defn): Update. + * ada-lang.c (ada_language_defn): Update. + * language.h (struct language_defn) <la_get_string>: Remove. + (LA_GET_STRING): Remove. + (default_get_string): Don't declare. + +2019-11-05 Tom Tromey <tom@tromey.com> + * tui/tui-source.h (struct tui_source_window): Inline constructor. Remove destructor. <style_changed, m_observable>: Move to superclass. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 73704907136..0bddc9e8b0d 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -14135,7 +14135,6 @@ extern const struct language_defn ada_language_defn = { ada_language_arch_info, ada_print_array_index, default_pass_by_reference, - c_get_string, ada_watch_location_expression, ada_get_symbol_name_matcher, /* la_get_symbol_name_matcher */ ada_iterate_over_symbols, diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 57592dfbce0..74e3f731199 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -926,7 +926,6 @@ extern const struct language_defn c_language_defn = c_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, @@ -1072,7 +1071,6 @@ extern const struct language_defn cplus_language_defn = cplus_language_arch_info, default_print_array_index, cp_pass_by_reference, - c_get_string, c_watch_location_expression, cp_get_symbol_name_matcher, iterate_over_symbols, @@ -1127,7 +1125,6 @@ extern const struct language_defn asm_language_defn = c_language_arch_info, /* FIXME: la_language_arch_info. */ default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, @@ -1182,7 +1179,6 @@ extern const struct language_defn minimal_language_defn = c_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/d-lang.c b/gdb/d-lang.c index b80b374d6f1..1701976da78 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -244,7 +244,6 @@ extern const struct language_defn d_language_defn = d_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 5681379b3b3..7f241c62784 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -671,7 +671,6 @@ extern const struct language_defn f_language_defn = f_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, cp_get_symbol_name_matcher, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/go-lang.c b/gdb/go-lang.c index c77676c8a57..c5ab306c3bd 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -615,7 +615,6 @@ extern const struct language_defn go_language_defn = go_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index 9b382108fb8..8aa4cfa345b 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -1015,7 +1015,7 @@ gdbscm_value_to_string (SCM self, SCM rest) try { gdb::unique_xmalloc_ptr<gdb_byte> buffer; - LA_GET_STRING (value, &buffer, &length, &char_type, &la_encoding); + c_get_string (value, &buffer, &length, &char_type, &la_encoding); buffer_contents = buffer.release (); } catch (const gdb_exception &except) diff --git a/gdb/language.c b/gdb/language.c index 02c448fb1d8..0e13c7185b7 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -690,14 +690,6 @@ default_print_array_index (struct value *index_value, struct ui_file *stream, fprintf_filtered (stream, "] = "); } -void -default_get_string (struct value *value, - gdb::unique_xmalloc_ptr<gdb_byte> *buffer, - int *length, struct type **char_type, const char **charset) -{ - error (_("Getting a string is unsupported in this language.")); -} - /* See language.h. */ bool @@ -885,7 +877,6 @@ const struct language_defn unknown_language_defn = unknown_language_arch_info, /* la_language_arch_info. */ default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, @@ -937,7 +928,6 @@ const struct language_defn auto_language_defn = unknown_language_arch_info, /* la_language_arch_info. */ default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/language.h b/gdb/language.h index aa19f8ee9b4..5fc25a235ff 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -360,21 +360,6 @@ struct language_defn reference at the language level. */ int (*la_pass_by_reference) (struct type *type); - /* Obtain a string from the inferior, storing it in a newly allocated - buffer in BUFFER, which should be freed by the caller. If the - in- and out-parameter *LENGTH is specified at -1, the string is - read until a null character of the appropriate width is found - - otherwise the string is read to the length of characters specified. - On completion, *LENGTH will hold the size of the string in characters. - If a *LENGTH of -1 was specified it will count only actual - characters, excluding any eventual terminating null character. - Otherwise *LENGTH will include all characters - including any nulls. - CHARSET will hold the encoding used in the string. */ - void (*la_get_string) (struct value *value, - gdb::unique_xmalloc_ptr<gdb_byte> *buffer, - int *length, struct type **chartype, - const char **charset); - /* Return an expression that can be used for a location watchpoint. TYPE is a pointer type that points to the memory to watch, and ADDR is the address of the watched memory. */ @@ -559,8 +544,6 @@ extern enum language set_language (enum language); encoding, force_ellipses,options)) #define LA_EMIT_CHAR(ch, type, stream, quoter) \ (current_language->la_emitchar(ch, type, stream, quoter)) -#define LA_GET_STRING(value, buffer, length, chartype, encoding) \ - (current_language->la_get_string(value, buffer, length, chartype, encoding)) #define LA_PRINT_ARRAY_INDEX(index_value, stream, options) \ (current_language->la_print_array_index(index_value, stream, options)) @@ -643,11 +626,6 @@ int default_pass_by_reference (struct type *type); void default_print_typedef (struct type *type, struct symbol *new_symbol, struct ui_file *stream); -void default_get_string (struct value *value, - gdb::unique_xmalloc_ptr<gdb_byte> *buffer, - int *length, struct type **char_type, - const char **charset); - /* Default name hashing function. */ /* Produce an unsigned hash value from SEARCH_NAME that is consistent diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 759414d7f0f..2d2dfe31018 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -413,7 +413,6 @@ extern const struct language_defn m2_language_defn = m2_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index fbf0dab2ae2..946a0a1faed 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -401,7 +401,6 @@ extern const struct language_defn objc_language_defn = { c_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 80d7ec96bc2..5d03210b569 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1080,7 +1080,6 @@ extern const struct language_defn opencl_language_defn = opencl_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, c_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, diff --git a/gdb/p-lang.c b/gdb/p-lang.c index 95911158d15..0cf1c6c16ca 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -466,7 +466,6 @@ extern const struct language_defn pascal_language_defn = pascal_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, c_watch_location_expression, NULL, /* la_compare_symbol_for_completion */ iterate_over_symbols, diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 1428b7abe5c..1ca2dc5c719 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -567,7 +567,7 @@ valpy_string (PyObject *self, PyObject *args, PyObject *kw) try { - LA_GET_STRING (value, &buffer, &length, &char_type, &la_encoding); + c_get_string (value, &buffer, &length, &char_type, &la_encoding); } catch (const gdb_exception &except) { diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 838d9019adf..b872a2dbf1c 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -2165,7 +2165,6 @@ extern const struct language_defn rust_language_defn = rust_language_arch_info, default_print_array_index, default_pass_by_reference, - c_get_string, rust_watch_location_expression, NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, |