/* Multiple source language support for GDB.
- Copyright (C) 1991-2020 Free Software Foundation, Inc.
+ Copyright (C) 1991-2021 Free Software Foundation, Inc.
Contributed by the Department of Computer Science at the State University
of New York at Buffalo.
#include "c-lang.h"
#include <algorithm>
#include "gdbarch.h"
-
-static int unk_lang_parser (struct parser_state *);
+#include "compile/compile-internal.h"
static void set_range_case (void);
-static void unk_lang_emit_char (int c, struct type *type,
- struct ui_file *stream, int quoter);
+/* range_mode ==
+ range_mode_auto: range_check set automatically to default of language.
+ range_mode_manual: range_check set manually by user. */
-static void unk_lang_printchar (int c, struct type *type,
- struct ui_file *stream);
+enum range_mode
+ {
+ range_mode_auto, range_mode_manual
+ };
-static void unk_lang_value_print (struct value *, struct ui_file *,
- const struct value_print_options *);
+/* case_mode ==
+ case_mode_auto: case_sensitivity set upon selection of scope.
+ case_mode_manual: case_sensitivity set only by user. */
-static CORE_ADDR unk_lang_trampoline (struct frame_info *, CORE_ADDR pc);
+enum case_mode
+ {
+ case_mode_auto, case_mode_manual
+ };
/* The current (default at startup) state of type and range checking.
(If the modes are set to "auto", though, these are changed based
on the default language at startup, and then again based on the
language of the first source file. */
-enum range_mode range_mode = range_mode_auto;
+static enum range_mode range_mode = range_mode_auto;
enum range_check range_check = range_check_off;
-enum case_mode case_mode = case_mode_auto;
+static enum case_mode case_mode = case_mode_auto;
enum case_sensitivity case_sensitivity = case_sensitive_on;
/* The current language and language_mode (see language.h). */
fprintf_filtered (gdb_stdout,
_("The current source language is "
"\"auto; currently %s\".\n"),
- current_language->la_name);
+ current_language->name ());
else
fprintf_filtered (gdb_stdout,
_("The current source language is \"%s\".\n"),
- current_language->la_name);
+ current_language->name ());
if (has_stack_frames ())
{
/* Search the list of languages for a match. */
for (const auto &lang : language_defn::languages)
{
- if (strcmp (lang->la_name, language) == 0)
+ if (strcmp (lang->name (), language) == 0)
{
/* Found it! Go into manual mode, and use this language. */
if (lang->la_language == language_auto)
{
/* Enter auto mode. Set to the current frame's language, if
- known, or fallback to the initial language. */
+ known, or fallback to the initial language. */
language_mode = language_mode_auto;
try
{
fprintf_filtered (gdb_stdout, _("Range checking is \"%s\".\n"),
value);
- if (range_check != current_language->la_range_check)
+ if (range_check == range_check_warn
+ || ((range_check == range_check_on)
+ != current_language->range_checking_on_by_default ()))
warning (_("the current range check setting "
"does not match the language.\n"));
}
internal_error (__FILE__, __LINE__,
_("Unrecognized range check setting: \"%s\""), range);
}
- if (range_check != current_language->la_range_check)
+ if (range_check == range_check_warn
+ || ((range_check == range_check_on)
+ != current_language->range_checking_on_by_default ()))
warning (_("the current range check setting "
"does not match the language.\n"));
}
_("Case sensitivity in name search is \"%s\".\n"),
value);
- if (case_sensitivity != current_language->la_case_sensitivity)
+ if (case_sensitivity != current_language->case_sensitivity ())
warning (_("the current case sensitivity setting does not match "
"the language.\n"));
}
case_sensitive);
}
- if (case_sensitivity != current_language->la_case_sensitivity)
+ if (case_sensitivity != current_language->case_sensitivity ())
warning (_("the current case sensitivity setting does not match "
"the language.\n"));
}
set_range_case (void)
{
if (range_mode == range_mode_auto)
- range_check = current_language->la_range_check;
+ range_check = (current_language->range_checking_on_by_default ()
+ ? range_check_on : range_check_off);
if (case_mode == case_mode_auto)
- case_sensitivity = current_language->la_case_sensitivity;
+ case_sensitivity = current_language->case_sensitivity ();
}
/* Set current language to (enum language) LANG. Returns previous
break;
case range_check_off:
/* FIXME: cagney/2002-01-30: Should this function print anything
- when range error is off? */
+ when range error is off? */
vfprintf_filtered (gdb_stderr, string, args);
fprintf_filtered (gdb_stderr, "\n");
break;
language_enum (const char *str)
{
for (const auto &lang : language_defn::languages)
- if (strcmp (lang->la_name, str) == 0)
+ if (strcmp (lang->name (), str) == 0)
return lang->la_language;
if (strcmp (str, "local") == 0)
const char *
language_str (enum language lang)
{
- return language_def (lang)->la_name;
+ return language_def (lang)->name ();
}
\f
/* Display "auto", "local" and "unknown" first, and then the rest,
alpha sorted. */
const char **language_names_p = language_names;
- *language_names_p++ = language_def (language_auto)->la_name;
+ *language_names_p++ = language_def (language_auto)->name ();
*language_names_p++ = "local";
- *language_names_p++ = language_def (language_unknown)->la_name;
+ *language_names_p++ = language_def (language_unknown)->name ();
const char **sort_begin = language_names_p;
for (const auto &lang : language_defn::languages)
{
if (lang->la_language == language_auto
|| lang->la_language == language_unknown)
continue;
- *language_names_p++ = lang->la_name;
+ *language_names_p++ = lang->name ();
}
*language_names_p = NULL;
std::sort (sort_begin, language_names_p, compare_cstrings);
/* Add the filename extensions. */
for (const auto &lang : language_defn::languages)
- if (lang->la_filename_extensions != NULL)
- {
- for (size_t i = 0; lang->la_filename_extensions[i] != NULL; ++i)
- add_filename_language (lang->la_filename_extensions[i],
- lang->la_language);
- }
+ for (const char * const &ext : lang->filename_extensions ())
+ add_filename_language (ext, lang->la_language);
/* Build the "help set language" docs. */
string_file doc;
|| lang->la_language == language_auto)
continue;
- /* FIXME: i18n: for now assume that the human-readable name is
- just a capitalization of the internal name. */
/* Note that we add the newline at the front, so we don't wind
up with a trailing newline. */
- doc.printf ("\n%-16s Use the %c%s language",
- lang->la_name,
- /* Capitalize first letter of language name. */
- toupper (lang->la_name[0]),
- lang->la_name + 1);
+ doc.printf ("\n%-16s Use the %s language",
+ lang->name (),
+ lang->natural_name ());
}
add_setshow_enum_cmd ("language", class_support,
{
for (const auto &lang : language_defn::languages)
{
- if (lang->skip_trampoline != NULL)
- {
- CORE_ADDR real_pc = lang->skip_trampoline (frame, pc);
+ CORE_ADDR real_pc = lang->skip_trampoline (frame, pc);
- if (real_pc)
- return real_pc;
- }
+ if (real_pc != 0)
+ return real_pc;
}
return 0;
language_demangle (const struct language_defn *current_language,
const char *mangled, int options)
{
- if (current_language != NULL && current_language->la_demangle)
- return current_language->la_demangle (mangled, options);
- return NULL;
-}
-
-/* See language.h. */
-
-int
-language_sniff_from_mangled_name (const struct language_defn *lang,
- const char *mangled, char **demangled)
-{
- gdb_assert (lang != NULL);
-
- if (lang->la_sniff_from_mangled_name == NULL)
- {
- *demangled = NULL;
- return 0;
- }
-
- return lang->la_sniff_from_mangled_name (mangled, demangled);
-}
-
-/* Return class name from physname or NULL. */
-char *
-language_class_name_from_physname (const struct language_defn *lang,
- const char *physname)
-{
- if (lang != NULL && lang->la_class_name_from_physname)
- return lang->la_class_name_from_physname (physname);
+ if (current_language != NULL)
+ return current_language->demangle_symbol (mangled, options);
return NULL;
}
struct value *index_value = value_from_longest (index_type, index);
fprintf_filtered (stream, "[");
- LA_VALUE_PRINT (index_value, stream, options);
+ value_print (index_value, stream, options);
fprintf_filtered (stream, "] = ");
}
/* See language.h. */
+gdb::unique_xmalloc_ptr<char>
+language_defn::watch_location_expression (struct type *type,
+ CORE_ADDR addr) const
+{
+ /* Generates an expression that assumes a C like syntax is valid. */
+ type = check_typedef (TYPE_TARGET_TYPE (check_typedef (type)));
+ std::string name = type_to_string (type);
+ return gdb::unique_xmalloc_ptr<char>
+ (xstrprintf ("* (%s *) %s", name.c_str (), core_addr_to_string (addr)));
+}
+
+/* See language.h. */
+
+void
+language_defn::value_print (struct value *val, struct ui_file *stream,
+ const struct value_print_options *options) const
+{
+ return c_value_print (val, stream, options);
+}
+
+/* See language.h. */
+
+int
+language_defn::parser (struct parser_state *ps) const
+{
+ return c_parse (ps);
+}
+
+/* See language.h. */
+
+void
+language_defn::value_print_inner
+ (struct value *val, struct ui_file *stream, int recurse,
+ const struct value_print_options *options) const
+{
+ return c_value_print_inner (val, stream, recurse, options);
+}
+
+/* See language.h. */
+
+void
+language_defn::emitchar (int ch, struct type *chtype,
+ struct ui_file * stream, int quoter) const
+{
+ c_emit_char (ch, chtype, stream, quoter);
+}
+
+/* See language.h. */
+
+void
+language_defn::printstr (struct ui_file *stream, struct type *elttype,
+ const gdb_byte *string, unsigned int length,
+ const char *encoding, int force_ellipses,
+ const struct value_print_options *options) const
+{
+ c_printstr (stream, elttype, string, length, encoding, force_ellipses,
+ options);
+}
+
+/* See language.h. */
+
+void
+language_defn::print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream) const
+{
+ c_print_typedef (type, new_symbol, stream);
+}
+
+/* See language.h. */
+
bool
+language_defn::is_string_type_p (struct type *type) const
+{
+ return c_is_string_type_p (type);
+}
+
+/* See language.h. */
+
+std::unique_ptr<compile_instance>
+language_defn::get_compile_instance () const
+{
+ return {};
+}
+
+/* The default implementation of the get_symbol_name_matcher_inner method
+ from the language_defn class. Matches with strncmp_iw. */
+
+static bool
default_symbol_name_matcher (const char *symbol_search_name,
const lookup_name_info &lookup_name,
completion_match_result *comp_match_res)
/* See language.h. */
-bool
-default_is_string_type_p (struct type *type)
-{
- type = check_typedef (type);
- while (type->code () == TYPE_CODE_REF)
- {
- type = TYPE_TARGET_TYPE (type);
- type = check_typedef (type);
- }
- return (type->code () == TYPE_CODE_STRING);
-}
-
-/* See language.h. */
-
symbol_name_matcher_ftype *
-get_symbol_name_matcher (const language_defn *lang,
- const lookup_name_info &lookup_name)
+language_defn::get_symbol_name_matcher
+ (const lookup_name_info &lookup_name) const
{
/* If currently in Ada mode, and the lookup name is wrapped in
'<...>', hijack all symbol name comparisons using the Ada
matcher, which handles the verbatim matching. */
if (current_language->la_language == language_ada
&& lookup_name.ada ().verbatim_p ())
- return current_language->la_get_symbol_name_matcher (lookup_name);
+ return current_language->get_symbol_name_matcher_inner (lookup_name);
- if (lang->la_get_symbol_name_matcher != nullptr)
- return lang->la_get_symbol_name_matcher (lookup_name);
- return default_symbol_name_matcher;
+ return this->get_symbol_name_matcher_inner (lookup_name);
}
-/* Define the language that is no language. */
+/* See language.h. */
-static int
-unk_lang_parser (struct parser_state *ps)
+symbol_name_matcher_ftype *
+language_defn::get_symbol_name_matcher_inner
+ (const lookup_name_info &lookup_name) const
{
- return 1;
+ return default_symbol_name_matcher;
}
-static void
-unk_lang_emit_char (int c, struct type *type, struct ui_file *stream,
- int quoter)
-{
- error (_("internal error - unimplemented "
- "function unk_lang_emit_char called."));
-}
+/* See language.h. */
-static void
-unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
+const struct lang_varobj_ops *
+language_defn::varobj_ops () const
{
- error (_("internal error - unimplemented "
- "function unk_lang_printchar called."));
+ /* The ops for the C language are suitable for the vast majority of the
+ supported languages. */
+ return &c_varobj_ops;
}
-static void
-unk_lang_printstr (struct ui_file *stream, struct type *type,
- const gdb_byte *string, unsigned int length,
- const char *encoding, int force_ellipses,
- const struct value_print_options *options)
-{
- error (_("internal error - unimplemented "
- "function unk_lang_printstr called."));
-}
+/* See language.h. */
-static void
-unk_lang_print_type (struct type *type, const char *varstring,
- struct ui_file *stream, int show, int level,
- const struct type_print_options *flags)
+const struct exp_descriptor *
+language_defn::expression_ops () const
{
- error (_("internal error - unimplemented "
- "function unk_lang_print_type called."));
+ return &exp_descriptor_standard;
}
-static void
-unk_lang_value_print_inner (struct value *val,
- struct ui_file *stream, int recurse,
- const struct value_print_options *options)
-{
- error (_("internal error - unimplemented "
- "function unk_lang_value_print_inner called."));
-}
+/* Parent class for both the "auto" and "unknown" languages. These two
+ pseudo-languages are very similar so merging their implementations like
+ this makes sense. */
-static void
-unk_lang_value_print (struct value *val, struct ui_file *stream,
- const struct value_print_options *options)
+class auto_or_unknown_language : public language_defn
{
- error (_("internal error - unimplemented "
- "function unk_lang_value_print called."));
-}
+public:
+ auto_or_unknown_language (enum language lang)
+ : language_defn (lang)
+ { /* Nothing. */ }
-static CORE_ADDR unk_lang_trampoline (struct frame_info *frame, CORE_ADDR pc)
-{
- return 0;
-}
+ /* See language.h. */
+ void language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const override
+ {
+ lai->set_string_char_type (builtin_type (gdbarch)->builtin_char);
+ lai->set_bool_type (builtin_type (gdbarch)->builtin_int);
+ }
-/* Unknown languages just use the cplus demangler. */
-static char *unk_lang_demangle (const char *mangled, int options)
-{
- return gdb_demangle (mangled, options);
-}
+ /* See language.h. */
-static char *unk_lang_class_name (const char *mangled)
-{
- return NULL;
-}
+ 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
+ {
+ error (_("type printing not implemented for language \"%s\""),
+ natural_name ());
+ }
-static const struct op_print unk_op_print_tab[] =
-{
- {NULL, OP_NULL, PREC_NULL, 0}
-};
+ /* See language.h. */
-static void
-unknown_language_arch_info (struct gdbarch *gdbarch,
- struct language_arch_info *lai)
-{
- lai->string_char_type = builtin_type (gdbarch)->builtin_char;
- lai->bool_type_default = builtin_type (gdbarch)->builtin_int;
- lai->primitive_type_vector = GDBARCH_OBSTACK_CALLOC (gdbarch, 1,
- struct type *);
-}
+ char *demangle_symbol (const char *mangled, int options) const override
+ {
+ /* The auto language just uses the C++ demangler. */
+ return gdb_demangle (mangled, options);
+ }
-/* Constant data that describes the unknown language. */
+ /* See language.h. */
-extern const struct language_data unknown_language_data =
-{
- "unknown",
- "Unknown",
- language_unknown,
- range_check_off,
- case_sensitive_on,
- array_row_major,
- macro_expansion_no,
- NULL,
- &exp_descriptor_standard,
- unk_lang_parser,
- null_post_parser,
- unk_lang_printchar, /* Print character constant */
- unk_lang_printstr,
- unk_lang_emit_char,
- unk_lang_print_type, /* Print a type using appropriate syntax */
- default_print_typedef, /* Print a typedef using appropriate syntax */
- unk_lang_value_print_inner, /* la_value_print_inner */
- unk_lang_value_print, /* Print a top-level value */
- unk_lang_trampoline, /* Language specific skip_trampoline */
- "this", /* name_of_this */
- true, /* store_sym_names_in_linkage_form_p */
- basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
- unk_lang_demangle, /* Language specific symbol demangler */
- NULL,
- unk_lang_class_name, /* Language specific
- class_name_from_physname */
- unk_op_print_tab, /* expression operators for printing */
- 1, /* c-style arrays */
- 0, /* String lower bound */
- default_word_break_characters,
- default_collect_symbol_completion_matches,
- c_watch_location_expression,
- NULL, /* la_get_symbol_name_matcher */
- iterate_over_symbols,
- default_search_name_hash,
- &default_varobj_ops,
- NULL,
- NULL,
- default_is_string_type_p,
- "{...}" /* la_struct_too_deep_ellipsis */
-};
+ void value_print (struct value *val, struct ui_file *stream,
+ const struct value_print_options *options) const override
+ {
+ error (_("value printing not implemented for language \"%s\""),
+ natural_name ());
+ }
-/* Class representing the unknown language. */
+ /* See language.h. */
-class unknown_language : public language_defn
-{
-public:
- unknown_language ()
- : language_defn (language_unknown, unknown_language_data)
- { /* Nothing. */ }
+ void value_print_inner
+ (struct value *val, struct ui_file *stream, int recurse,
+ const struct value_print_options *options) const override
+ {
+ error (_("inner value printing not implemented for language \"%s\""),
+ natural_name ());
+ }
/* See language.h. */
- void language_arch_info (struct gdbarch *gdbarch,
- struct language_arch_info *lai) const override
+
+ int parser (struct parser_state *ps) const override
{
- unknown_language_arch_info (gdbarch, lai);
+ /* No parsing is done, just claim success. */
+ return 1;
}
-};
-/* Single instance of the unknown language class. */
+ /* See language.h. */
-static unknown_language unknown_language_defn;
+ void emitchar (int ch, struct type *chtype,
+ struct ui_file *stream, int quoter) const override
+ {
+ error (_("emit character not implemented for language \"%s\""),
+ natural_name ());
+ }
-/* Constant data for the fake "auto" language. */
+ /* See language.h. */
-extern const struct language_data auto_language_data =
-{
- "auto",
- "Auto",
- language_auto,
- range_check_off,
- case_sensitive_on,
- array_row_major,
- macro_expansion_no,
- NULL,
- &exp_descriptor_standard,
- unk_lang_parser,
- null_post_parser,
- unk_lang_printchar, /* Print character constant */
- unk_lang_printstr,
- unk_lang_emit_char,
- unk_lang_print_type, /* Print a type using appropriate syntax */
- default_print_typedef, /* Print a typedef using appropriate syntax */
- unk_lang_value_print_inner, /* la_value_print_inner */
- unk_lang_value_print, /* Print a top-level value */
- unk_lang_trampoline, /* Language specific skip_trampoline */
- "this", /* name_of_this */
- false, /* store_sym_names_in_linkage_form_p */
- basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
- unk_lang_demangle, /* Language specific symbol demangler */
- NULL,
- unk_lang_class_name, /* Language specific
- class_name_from_physname */
- unk_op_print_tab, /* expression operators for printing */
- 1, /* c-style arrays */
- 0, /* String lower bound */
- default_word_break_characters,
- default_collect_symbol_completion_matches,
- c_watch_location_expression,
- NULL, /* la_get_symbol_name_matcher */
- iterate_over_symbols,
- default_search_name_hash,
- &default_varobj_ops,
- NULL,
- NULL,
- default_is_string_type_p,
- "{...}" /* la_struct_too_deep_ellipsis */
+ void printchar (int ch, struct type *chtype,
+ struct ui_file *stream) const override
+ {
+ error (_("print character not implemented for language \"%s\""),
+ natural_name ());
+ }
+
+ /* See language.h. */
+
+ void printstr (struct ui_file *stream, struct type *elttype,
+ const gdb_byte *string, unsigned int length,
+ const char *encoding, int force_ellipses,
+ const struct value_print_options *options) const override
+ {
+ error (_("print string not implemented for language \"%s\""),
+ natural_name ());
+ }
+
+ /* See language.h. */
+
+ void print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream) const override
+ {
+ error (_("print typedef not implemented for language \"%s\""),
+ natural_name ());
+ }
+
+ /* See language.h. */
+
+ bool is_string_type_p (struct type *type) const override
+ {
+ type = check_typedef (type);
+ while (type->code () == TYPE_CODE_REF)
+ {
+ type = TYPE_TARGET_TYPE (type);
+ type = check_typedef (type);
+ }
+ return (type->code () == TYPE_CODE_STRING);
+ }
+
+ /* See language.h. */
+
+ const char *name_of_this () const override
+ { return "this"; }
+
+ /* See language.h. */
+
+ const struct op_print *opcode_print_table () const override
+ {
+ static const struct op_print unk_op_print_tab[] =
+ {
+ {NULL, OP_NULL, PREC_NULL, 0}
+ };
+
+ return unk_op_print_tab;
+ }
};
/* Class representing the fake "auto" language. */
-class auto_language : public language_defn
+class auto_language : public auto_or_unknown_language
{
public:
auto_language ()
- : language_defn (language_auto, auto_language_data)
+ : auto_or_unknown_language (language_auto)
{ /* Nothing. */ }
/* See language.h. */
- void language_arch_info (struct gdbarch *gdbarch,
- struct language_arch_info *lai) const override
- {
- unknown_language_arch_info (gdbarch, lai);
- }
+
+ const char *name () const override
+ { return "auto"; }
+
+ /* See language.h. */
+
+ const char *natural_name () const override
+ { return "Auto"; }
};
/* Single instance of the fake "auto" language. */
static auto_language auto_language_defn;
+/* Class representing the unknown language. */
+
+class unknown_language : public auto_or_unknown_language
+{
+public:
+ unknown_language ()
+ : auto_or_unknown_language (language_unknown)
+ { /* Nothing. */ }
+
+ /* See language.h. */
+
+ const char *name () const override
+ { return "unknown"; }
+
+ /* See language.h. */
+
+ const char *natural_name () const override
+ { return "Unknown"; }
+
+ /* See language.h. */
+
+ bool store_sym_names_in_linkage_form_p () const override
+ { return true; }
+};
+
+/* Single instance of the unknown language class. */
+
+static unknown_language unknown_language_defn;
+
\f
/* Per-architecture language information. */
static void *
language_gdbarch_post_init (struct gdbarch *gdbarch)
{
- struct language_gdbarch *l;
-
- l = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct language_gdbarch);
+ struct language_gdbarch *l
+ = obstack_new<struct language_gdbarch> (gdbarch_obstack (gdbarch));
for (const auto &lang : language_defn::languages)
{
gdb_assert (lang != nullptr);
- lang->language_arch_info (gdbarch,
- l->arch_info + lang->la_language);
+ lang->language_arch_info (gdbarch, &l->arch_info[lang->la_language]);
}
return l;
}
+/* See language.h. */
+
struct type *
language_string_char_type (const struct language_defn *la,
struct gdbarch *gdbarch)
{
struct language_gdbarch *ld
= (struct language_gdbarch *) gdbarch_data (gdbarch, language_gdbarch_data);
-
- return ld->arch_info[la->la_language].string_char_type;
+ return ld->arch_info[la->la_language].string_char_type ();
}
+/* See language.h. */
+
struct type *
language_bool_type (const struct language_defn *la,
struct gdbarch *gdbarch)
{
struct language_gdbarch *ld
= (struct language_gdbarch *) gdbarch_data (gdbarch, language_gdbarch_data);
+ return ld->arch_info[la->la_language].bool_type ();
+}
+
+/* See language.h. */
- if (ld->arch_info[la->la_language].bool_type_symbol)
+struct type *
+language_arch_info::bool_type () const
+{
+ if (m_bool_type_name != nullptr)
{
struct symbol *sym;
- sym = lookup_symbol (ld->arch_info[la->la_language].bool_type_symbol,
- NULL, VAR_DOMAIN, NULL).symbol;
- if (sym)
+ sym = lookup_symbol (m_bool_type_name, NULL, VAR_DOMAIN, NULL).symbol;
+ if (sym != nullptr)
{
struct type *type = SYMBOL_TYPE (sym);
-
- if (type && type->code () == TYPE_CODE_BOOL)
+ if (type != nullptr && type->code () == TYPE_CODE_BOOL)
return type;
}
}
- return ld->arch_info[la->la_language].bool_type_default;
-}
-
-/* Helper function for primitive type lookup. */
-
-static struct type **
-language_lookup_primitive_type_1 (const struct language_arch_info *lai,
- const char *name)
-{
- struct type **p;
-
- for (p = lai->primitive_type_vector; (*p) != NULL; p++)
- {
- if (strcmp ((*p)->name (), name) == 0)
- return p;
- }
- return NULL;
+ return m_bool_type_default;
}
/* See language.h. */
-struct type *
-language_lookup_primitive_type (const struct language_defn *la,
- struct gdbarch *gdbarch,
- const char *name)
-{
- struct language_gdbarch *ld =
- (struct language_gdbarch *) gdbarch_data (gdbarch, language_gdbarch_data);
- struct type **typep;
-
- typep = language_lookup_primitive_type_1 (&ld->arch_info[la->la_language],
- name);
- if (typep == NULL)
- return NULL;
- return *typep;
-}
-
-/* Helper function for type lookup as a symbol.
- Create the symbol corresponding to type TYPE in language LANG. */
-
-static struct symbol *
-language_alloc_type_symbol (enum language lang, struct type *type)
+struct symbol *
+language_arch_info::type_and_symbol::alloc_type_symbol
+ (enum language lang, struct type *type)
{
struct symbol *symbol;
struct gdbarch *gdbarch;
-
- gdb_assert (!TYPE_OBJFILE_OWNED (type));
-
- gdbarch = TYPE_OWNER (type).gdbarch;
+ gdb_assert (!type->is_objfile_owned ());
+ gdbarch = type->arch_owner ();
symbol = new (gdbarch_obstack (gdbarch)) struct symbol ();
-
symbol->m_name = type->name ();
symbol->set_language (lang, nullptr);
symbol->owner.arch = gdbarch;
SYMBOL_TYPE (symbol) = type;
SYMBOL_DOMAIN (symbol) = VAR_DOMAIN;
SYMBOL_ACLASS_INDEX (symbol) = LOC_TYPEDEF;
-
return symbol;
}
-/* Initialize the primitive type symbols of language LD.
- The primitive type vector must have already been initialized. */
+/* See language.h. */
-static void
-language_init_primitive_type_symbols (struct language_arch_info *lai,
- const struct language_defn *la,
- struct gdbarch *gdbarch)
+language_arch_info::type_and_symbol *
+language_arch_info::lookup_primitive_type_and_symbol (const char *name)
{
- int n;
+ for (struct type_and_symbol &tas : primitive_types_and_symbols)
+ {
+ if (strcmp (tas.type ()->name (), name) == 0)
+ return &tas;
+ }
- gdb_assert (lai->primitive_type_vector != NULL);
+ return nullptr;
+}
+
+/* See language.h. */
- for (n = 0; lai->primitive_type_vector[n] != NULL; ++n)
- continue;
+struct type *
+language_arch_info::lookup_primitive_type (const char *name)
+{
+ type_and_symbol *tas = lookup_primitive_type_and_symbol (name);
+ if (tas != nullptr)
+ return tas->type ();
+ return nullptr;
+}
- lai->primitive_type_symbols
- = GDBARCH_OBSTACK_CALLOC (gdbarch, n + 1, struct symbol *);
+/* See language.h. */
- for (n = 0; lai->primitive_type_vector[n] != NULL; ++n)
+struct type *
+language_arch_info::lookup_primitive_type
+ (gdb::function_view<bool (struct type *)> filter)
+{
+ for (struct type_and_symbol &tas : primitive_types_and_symbols)
{
- lai->primitive_type_symbols[n]
- = language_alloc_type_symbol (la->la_language,
- lai->primitive_type_vector[n]);
+ if (filter (tas.type ()))
+ return tas.type ();
}
- /* Note: The result of symbol lookup is normally a symbol *and* the block
- it was found in. Builtin types don't live in blocks. We *could* give
- them one, but there is no current need so to keep things simple symbol
- lookup is extended to allow for BLOCK_FOUND to be NULL. */
+ return nullptr;
+}
+
+/* See language.h. */
+
+struct symbol *
+language_arch_info::lookup_primitive_type_as_symbol (const char *name,
+ enum language lang)
+{
+ type_and_symbol *tas = lookup_primitive_type_and_symbol (name);
+ if (tas != nullptr)
+ return tas->symbol (lang);
+ return nullptr;
+}
+
+/* Helper for the language_lookup_primitive_type overloads to forward
+ to the corresponding language's lookup_primitive_type overload. */
+
+template<typename T>
+static struct type *
+language_lookup_primitive_type_1 (const struct language_defn *la,
+ struct gdbarch *gdbarch,
+ T arg)
+{
+ struct language_gdbarch *ld =
+ (struct language_gdbarch *) gdbarch_data (gdbarch, language_gdbarch_data);
+ return ld->arch_info[la->la_language].lookup_primitive_type (arg);
+}
+
+/* See language.h. */
+
+struct type *
+language_lookup_primitive_type (const struct language_defn *la,
+ struct gdbarch *gdbarch,
+ const char *name)
+{
+ return language_lookup_primitive_type_1 (la, gdbarch, name);
+}
+
+/* See language.h. */
+
+struct type *
+language_lookup_primitive_type (const struct language_defn *la,
+ struct gdbarch *gdbarch,
+ gdb::function_view<bool (struct type *)> filter)
+{
+ return language_lookup_primitive_type_1 (la, gdbarch, filter);
}
/* See language.h. */
struct language_gdbarch *ld
= (struct language_gdbarch *) gdbarch_data (gdbarch, language_gdbarch_data);
struct language_arch_info *lai = &ld->arch_info[la->la_language];
- struct type **typep;
- struct symbol *sym;
if (symbol_lookup_debug)
- {
- fprintf_unfiltered (gdb_stdlog,
- "language_lookup_primitive_type_as_symbol"
- " (%s, %s, %s)",
- la->la_name, host_address_to_string (gdbarch), name);
- }
-
- typep = language_lookup_primitive_type_1 (lai, name);
- if (typep == NULL)
- {
- if (symbol_lookup_debug)
- fprintf_unfiltered (gdb_stdlog, " = NULL\n");
- return NULL;
- }
-
- /* The set of symbols is lazily initialized. */
- if (lai->primitive_type_symbols == NULL)
- language_init_primitive_type_symbols (lai, la, gdbarch);
+ fprintf_unfiltered (gdb_stdlog,
+ "language_lookup_primitive_type_as_symbol"
+ " (%s, %s, %s)",
+ la->name (), host_address_to_string (gdbarch), name);
- sym = lai->primitive_type_symbols[typep - lai->primitive_type_vector];
+ struct symbol *sym
+ = lai->lookup_primitive_type_as_symbol (name, la->la_language);
if (symbol_lookup_debug)
fprintf_unfiltered (gdb_stdlog, " = %s\n", host_address_to_string (sym));
+
+ /* Note: The result of symbol lookup is normally a symbol *and* the block
+ it was found in. Builtin types don't live in blocks. We *could* give
+ them one, but there is no current need so to keep things simple symbol
+ lookup is extended to allow for BLOCK_FOUND to be NULL. */
+
return sym;
}
projects / deliverable / binutils-gdb.git / blobdiff