aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog25
-rw-r--r--gdb/go-exp.y4
-rw-r--r--gdb/go-lang.c164
-rw-r--r--gdb/go-lang.h94
-rw-r--r--gdb/go-typeprint.c6
-rw-r--r--gdb/go-valprint.c5
-rw-r--r--gdb/symtab.c3
7 files changed, 161 insertions, 140 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d751b0d..a0f4622 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,30 @@
2020-12-23 Andrew Burgess <andrew.burgess@embecosm.com>
+ * go-exp.y (go_parse): Rename to...
+ (go_language::parser): ...this.
+ * go-lang.c (go_demangle): Rename to...
+ (go_language::demangle_symbol): ...this.
+ (go_language::expression_ops): Implementation moved here out of
+ class declaration.
+ (go_op_print_tab): Rename to...
+ (go_language::op_print_tab): ...this, update comment.
+ (class go_language): Declaration moved to go-lang.h.
+ (go_language::language_arch_info): Implementation moved here out
+ of class declaration.
+ * go-lang.h (go_parse): Delete declaration.
+ (go_demangle): Delete declaration.
+ (go_print_type): Delete declaration.
+ (go_value_print_inner): Delete declaration.
+ (class go_language): Declaration moved here from go-lang.c.
+ * go-typeprint.c (go_print_type): Rename to...
+ (go_language::print_type): ...this.
+ * go-valprint.c (go_value_print_inner): Rename to...
+ (go_language::value_print_inner): ...this.
+ * symtab.c (demangle_for_lookup): Call demangle_symbol method on
+ the go_language object.
+
+2020-12-23 Andrew Burgess <andrew.burgess@embecosm.com>
+
* c-lang.c (language_defn::printchar): Call emitchar, not
LA_EMIT_CHAR.
* f-lang.h (f_language::printchar): Likewise.
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index a911874..078bdca 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -1550,8 +1550,10 @@ yylex (void)
return classify_name (pstate, pstate->expression_context_block);
}
+/* See language.h. */
+
int
-go_parse (struct parser_state *par_state)
+go_language::parser (struct parser_state *par_state) const
{
/* Setting up the parser state. */
scoped_restore pstate_restore = make_scoped_restore (&pstate);
diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index 4547b52..eafcfb4 100644
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -334,7 +334,7 @@ unpack_mangled_go_symbol (const char *mangled_name,
thus not too much effort is currently put into it. */
char *
-go_demangle (const char *mangled_name, int options)
+go_language::demangle_symbol (const char *mangled_name, int options) const
{
struct obstack tempbuf;
char *result;
@@ -386,6 +386,14 @@ go_demangle (const char *mangled_name, int options)
return result;
}
+/* See language.h. */
+
+const struct exp_descriptor *
+go_language::expression_ops () const
+{
+ return &exp_descriptor_c;
+}
+
/* Given a Go symbol, return its package or NULL if unknown.
Space for the result is malloc'd, caller must free. */
@@ -444,11 +452,11 @@ go_block_package_name (const struct block *block)
return NULL;
}
-/* Table mapping opcodes into strings for printing operators
- and precedences of the operators.
+/* See go-lang.h.
+
TODO(dje): &^ ? */
-static const struct op_print go_op_print_tab[] =
+const struct op_print go_language::op_print_tab[] =
{
{",", BINOP_COMMA, PREC_COMMA, 0},
{"=", BINOP_ASSIGN, PREC_ASSIGN, 1},
@@ -482,125 +490,43 @@ static const struct op_print go_op_print_tab[] =
{NULL, OP_NULL, PREC_SUFFIX, 0}
};
-/* Class representing the Go language. */
+/* See language.h. */
-class go_language : public language_defn
+void
+go_language::language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const
{
-public:
- go_language ()
- : language_defn (language_go)
- { /* Nothing. */ }
-
- /* See language.h. */
-
- const char *name () const override
- { return "go"; }
-
- /* See language.h. */
-
- const char *natural_name () const override
- { return "Go"; }
-
- /* See language.h. */
- void language_arch_info (struct gdbarch *gdbarch,
- struct language_arch_info *lai) const override
- {
- const struct builtin_go_type *builtin = builtin_go_type (gdbarch);
-
- /* Helper function to allow shorter lines below. */
- auto add = [&] (struct type * t) -> struct type *
- {
- lai->add_primitive_type (t);
- return t;
- };
-
- add (builtin->builtin_void);
- add (builtin->builtin_char);
- add (builtin->builtin_bool);
- add (builtin->builtin_int);
- add (builtin->builtin_uint);
- add (builtin->builtin_uintptr);
- add (builtin->builtin_int8);
- add (builtin->builtin_int16);
- add (builtin->builtin_int32);
- add (builtin->builtin_int64);
- add (builtin->builtin_uint8);
- add (builtin->builtin_uint16);
- add (builtin->builtin_uint32);
- add (builtin->builtin_uint64);
- add (builtin->builtin_float32);
- add (builtin->builtin_float64);
- add (builtin->builtin_complex64);
- add (builtin->builtin_complex128);
-
- lai->set_string_char_type (builtin->builtin_char);
- lai->set_bool_type (builtin->builtin_bool, "bool");
- }
-
- /* See language.h. */
- bool sniff_from_mangled_name (const char *mangled,
- char **demangled) const override
- {
- *demangled = go_demangle (mangled, 0);
- return *demangled != NULL;
- }
-
- /* See language.h. */
-
- char *demangle_symbol (const char *mangled, int options) const override
- {
- return go_demangle (mangled, options);
- }
+ const struct builtin_go_type *builtin = builtin_go_type (gdbarch);
- /* 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
- {
- go_print_type (type, varstring, stream, show, level, flags);
- }
-
- /* See language.h. */
-
- void value_print_inner
- (struct value *val, struct ui_file *stream, int recurse,
- const struct value_print_options *options) const override
- {
- return go_value_print_inner (val, stream, recurse, options);
- }
-
- /* See language.h. */
-
- int parser (struct parser_state *ps) const override
- {
- return go_parse (ps);
- }
-
- /* See language.h. */
-
- bool is_string_type_p (struct type *type) const override
+ /* Helper function to allow shorter lines below. */
+ auto add = [&] (struct type * t) -> struct type *
{
- type = check_typedef (type);
- return (type->code () == TYPE_CODE_STRUCT
- && go_classify_struct_type (type) == GO_TYPE_STRING);
- }
-
- /* See language.h. */
-
- bool store_sym_names_in_linkage_form_p () const override
- { return true; }
-
- /* See language.h. */
-
- const struct exp_descriptor *expression_ops () const override
- { return &exp_descriptor_c; }
-
- /* See language.h. */
-
- const struct op_print *opcode_print_table () const override
- { return go_op_print_tab; }
-};
+ lai->add_primitive_type (t);
+ return t;
+ };
+
+ add (builtin->builtin_void);
+ add (builtin->builtin_char);
+ add (builtin->builtin_bool);
+ add (builtin->builtin_int);
+ add (builtin->builtin_uint);
+ add (builtin->builtin_uintptr);
+ add (builtin->builtin_int8);
+ add (builtin->builtin_int16);
+ add (builtin->builtin_int32);
+ add (builtin->builtin_int64);
+ add (builtin->builtin_uint8);
+ add (builtin->builtin_uint16);
+ add (builtin->builtin_uint32);
+ add (builtin->builtin_uint64);
+ add (builtin->builtin_float32);
+ add (builtin->builtin_float64);
+ add (builtin->builtin_complex64);
+ add (builtin->builtin_complex128);
+
+ lai->set_string_char_type (builtin->builtin_char);
+ lai->set_bool_type (builtin->builtin_bool, "bool");
+}
/* Single instance of the Go language class. */
diff --git a/gdb/go-lang.h b/gdb/go-lang.h
index 1f07907..532b4eb 100644
--- a/gdb/go-lang.h
+++ b/gdb/go-lang.h
@@ -56,34 +56,100 @@ enum go_type
GO_TYPE_STRING
};
-/* Defined in go-exp.y. */
-
-extern int go_parse (struct parser_state *);
-
/* Defined in go-lang.c. */
extern const char *go_main_name (void);
extern enum go_type go_classify_struct_type (struct type *type);
-extern char *go_demangle (const char *mangled, int options);
-
extern char *go_symbol_package_name (const struct symbol *sym);
extern char *go_block_package_name (const struct block *block);
extern const struct builtin_go_type *builtin_go_type (struct gdbarch *);
-/* Defined in go-typeprint.c. */
+/* Class representing the Go language. */
+
+class go_language : public language_defn
+{
+public:
+ go_language ()
+ : language_defn (language_go)
+ { /* Nothing. */ }
+
+ /* See language.h. */
+
+ const char *name () const override
+ { return "go"; }
+
+ /* See language.h. */
+
+ const char *natural_name () const override
+ { return "Go"; }
+
+ /* See language.h. */
+
+ void language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const override;
+
+ /* See language.h. */
+
+ bool sniff_from_mangled_name (const char *mangled,
+ char **demangled) const override
+ {
+ *demangled = demangle_symbol (mangled, 0);
+ return *demangled != NULL;
+ }
+
+ /* See language.h. */
+
+ char *demangle_symbol (const char *mangled, int options) const override;
+
+ /* See language.h. */
-extern void go_print_type (struct type *type, const char *varstring,
- struct ui_file *stream, int show, int level,
- const struct type_print_options *flags);
+ 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;
-/* Implement la_value_print_inner for Go. */
+ /* See language.h. */
-extern void go_value_print_inner (struct value *value,
- struct ui_file *stream, int recurse,
- const struct value_print_options *options);
+ void value_print_inner
+ (struct value *val, struct ui_file *stream, int recurse,
+ const struct value_print_options *options) const override;
+
+ /* See language.h. */
+
+ int parser (struct parser_state *ps) const override;
+
+ /* See language.h. */
+
+ bool is_string_type_p (struct type *type) const override
+ {
+ type = check_typedef (type);
+ return (type->code () == TYPE_CODE_STRUCT
+ && go_classify_struct_type (type) == GO_TYPE_STRING);
+ }
+
+ /* See language.h. */
+
+ bool store_sym_names_in_linkage_form_p () const override
+ { return true; }
+
+ /* See language.h. */
+
+ const struct exp_descriptor *expression_ops () const override;
+
+ /* See language.h. */
+
+ const struct op_print *opcode_print_table () const override
+ { return op_print_tab; }
+
+private:
+
+ /* Table of opcode data for use by OPCODE_PRINT_TABLE member function. */
+
+ static const struct op_print op_print_tab[];
+
+};
#endif /* !defined (GO_LANG_H) */
diff --git a/gdb/go-typeprint.c b/gdb/go-typeprint.c
index c334914..d768498 100644
--- a/gdb/go-typeprint.c
+++ b/gdb/go-typeprint.c
@@ -42,9 +42,9 @@
LEVEL indicates level of recursion (for nested definitions). */
void
-go_print_type (struct type *type, const char *varstring,
- struct ui_file *stream, int show, int level,
- const struct type_print_options *flags)
+go_language::print_type (struct type *type, const char *varstring,
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags) const
{
/* Borrowed from c-typeprint.c. */
if (show > 0)
diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c
index df0c029..fdbc5c4 100644
--- a/gdb/go-valprint.c
+++ b/gdb/go-valprint.c
@@ -87,8 +87,9 @@ print_go_string (struct type *type,
/* See go-lang.h. */
void
-go_value_print_inner (struct value *val, struct ui_file *stream,
- int recurse, const struct value_print_options *options)
+go_language::value_print_inner (struct value *val, struct ui_file *stream,
+ int recurse,
+ const struct value_print_options *options) const
{
struct type *type = check_typedef (value_type (val));
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 3339bf7..0d3fa9b 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1843,7 +1843,8 @@ demangle_for_lookup (const char *name, enum language lang,
}
else if (lang == language_go)
{
- char *demangled_name = go_demangle (name, 0);
+ char *demangled_name
+ = language_def (language_go)->demangle_symbol (name, 0);
if (demangled_name != NULL)
return storage.set_malloc_ptr (demangled_name);
}