Remove la_get_string member

The la_get_string member of struct language_defn was intended to
provide a way to fetch string data from a "string" object in a
language-dependent way.  However, it turned out that this was never
needed, and was only ever implemented for C.  This patch removes the
language hook entirely.

gdb/ChangeLog
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.

Change-Id: Ia97763dfe34dc8ecb46587f7a651f8af9be8fdbd

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 00d21fac1e75743c1ef07d2095116ce62536d690..5720c8e7fe14956fbd98bea0305b990d61a32ec1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,24 @@
+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

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 73704907136766789c575c564c38d365293c2182..0bddc9e8b0d422d6774e507e5cb9990dc514dbe1 100644 (file)
--- 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 57592dfbce0f8822fa3ca3d68ed520b4124a0c5d..74e3f7311996755386b4a0f0db514bebb0be15bd 100644 (file)
--- 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 b80b374d6f1e3cde66015bb058309331ae141599..1701976da7888366b0f41742e46e4a9f89e6cd00 100644 (file)
--- 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 5681379b3b3c0872e071b857300adbdf1c89d070..7f241c62784bef13642f17ab6bac6d0186842b19 100644 (file)
--- 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 c77676c8a5799141a37731159d23e96090f854df..c5ab306c3bd701a84e5bdf7405445942d2c5c69a 100644 (file)
--- 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 9b382108fb87a91a9c197c09e0459fa5c466f973..8aa4cfa345b6b34040ac5d54013e470399512dfd 100644 (file)
--- 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 02c448fb1d8e8fc48d35aa6e433fbf1b1458d4dd..0e13c7185b76b57fa445d4642ac863c9d28f4281 100644 (file)
--- 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 aa19f8ee9b4b97199eacdc38d7bbba3f69a8277f..5fc25a235ff08f84db5c4e345d66bf6c396306f6 100644 (file)
--- 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 759414d7f0f0043cdff31645f3f008f54ac8fc41..2d2dfe31018318f545032570cd4474a31543172c 100644 (file)
--- 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 fbf0dab2ae233b83ed3769f4320b289309ec4126..946a0a1faed286bdec06d929b4cc8dbde97a97b2 100644 (file)
--- 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 80d7ec96bc2bbba906f9ae12cf9a7ccc4d59fddf..5d03210b569db9d9037dd2a060fe956fa2a83f7e 100644 (file)
--- 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 95911158d15ea9e7678964515156b099686f3a96..0cf1c6c16ca614da5f77737d357c5199c9b445ae 100644 (file)
--- 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 1428b7abe5c7b0038ac561c96d3571e363c8780c..1ca2dc5c7195271c0165952d27254e66a77da205 100644 (file)
--- 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 838d9019adfbca32ee205b88da2842ecef0f1e13..b872a2dbf1c47d9d85a0caa93dc5269eece3cef2 100644 (file)
--- 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,