X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fm2-lang.c;h=2d2dfe31018318f545032570cd4474a31543172c;hb=708e4b9f189a86d542519b35e36e3f087b36b524;hp=9cc64bc5893ecf09a20f334c4b29f909bd3f59a8;hpb=b5385fc0f02ffc78a7bcfbcfbcc7f5c57c48ea7e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 9cc64bc589..2d2dfe3101 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -1,7 +1,6 @@ /* Modula 2 language support routines for GDB, the GNU debugger. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2002, 2003, 2004, - 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1992-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -24,11 +23,12 @@ #include "expression.h" #include "parser-defs.h" #include "language.h" +#include "varobj.h" #include "m2-lang.h" #include "c-lang.h" #include "valprint.h" +#include "gdbarch.h" -extern void _initialize_m2_language (void); static void m2_printchar (int, struct type *, struct ui_file *); static void m2_emit_char (int, struct type *, struct ui_file *, int); @@ -42,7 +42,7 @@ static void m2_emit_char (int c, struct type *type, struct ui_file *stream, int quoter) { - c &= 0xFF; /* Avoid sign bit follies */ + c &= 0xFF; /* Avoid sign bit follies. */ if (PRINT_LITERAL_FORM (c)) { @@ -146,10 +146,7 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string, { if (in_quotes) { - if (options->inspect_it) - fputs_filtered ("\\\", ", stream); - else - fputs_filtered ("\", ", stream); + fputs_filtered ("\", ", stream); in_quotes = 0; } m2_printchar (string[i], type, stream); @@ -162,10 +159,7 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string, { if (!in_quotes) { - if (options->inspect_it) - fputs_filtered ("\\\"", stream); - else - fputs_filtered ("\"", stream); + fputs_filtered ("\"", stream); in_quotes = 1; } LA_EMIT_CHAR (string[i], type, stream, '"'); @@ -175,17 +169,33 @@ m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string, /* Terminate the quotes if necessary. */ if (in_quotes) - { - if (options->inspect_it) - fputs_filtered ("\\\"", stream); - else - fputs_filtered ("\"", stream); - } + fputs_filtered ("\"", stream); if (force_ellipses || i < length) fputs_filtered ("...", stream); } +/* Return true if TYPE is a string. */ + +static bool +m2_is_string_type_p (struct type *type) +{ + type = check_typedef (type); + if (TYPE_CODE (type) == TYPE_CODE_ARRAY + && TYPE_LENGTH (type) > 0 + && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0) + { + struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type)); + + if (TYPE_LENGTH (elttype) == 1 + && (TYPE_CODE (elttype) == TYPE_CODE_INT + || TYPE_CODE (elttype) == TYPE_CODE_CHAR)) + return true; + } + + return false; +} + static struct value * evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, int *pos, enum noside noside) @@ -194,6 +204,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, struct value *arg1; struct value *arg2; struct type *type; + switch (op) { case UNOP_HIGH: @@ -210,6 +221,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, if (m2_is_unbounded_array (type)) { struct value *temp = arg1; + type = TYPE_FIELD_TYPE (type, 1); /* i18n: Do not translate the "_m2_high" part! */ arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL, @@ -239,10 +251,12 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, { struct value *temp = arg1; type = TYPE_FIELD_TYPE (type, 0); - if (type == NULL || (TYPE_CODE (type) != TYPE_CODE_PTR)) { - warning (_("internal error: unbounded array structure is unknown")); - return evaluate_subexp_standard (expect_type, exp, pos, noside); - } + if (type == NULL || (TYPE_CODE (type) != TYPE_CODE_PTR)) + { + warning (_("internal error: unbounded " + "array structure is unknown")); + return evaluate_subexp_standard (expect_type, exp, pos, noside); + } /* i18n: Do not translate the "_m2_contents" part! */ arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL, _("unbounded structure " @@ -251,7 +265,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp, if (value_type (arg1) != type) arg1 = value_cast (type, arg1); - type = check_typedef (value_type (arg1)); + check_typedef (value_type (arg1)); return value_ind (value_ptradd (arg1, value_as_long (arg2))); } else @@ -311,7 +325,7 @@ static const struct op_print m2_op_print_tab[] = {"MIN", UNOP_MIN, PREC_BUILTIN_FUNCTION, 0}, {"ODD", UNOP_ODD, PREC_BUILTIN_FUNCTION, 0}, {"TRUNC", UNOP_TRUNC, PREC_BUILTIN_FUNCTION, 0}, - {NULL, 0, 0, 0} + {NULL, OP_NULL, PREC_BUILTIN_FUNCTION, 0} }; /* The built-in types of Modula-2. */ @@ -361,18 +375,18 @@ const struct exp_descriptor exp_descriptor_modula2 = evaluate_subexp_modula2 }; -const struct language_defn m2_language_defn = +extern const struct language_defn m2_language_defn = { "modula-2", + "Modula-2", language_m2, range_check_on, - type_check_on, case_sensitive_on, array_row_major, macro_expansion_no, + NULL, &exp_descriptor_modula2, m2_parse, /* parser */ - m2_error, /* parser error function */ null_post_parser, m2_printchar, /* Print character constant */ m2_printstr, /* function to print string constant */ @@ -381,22 +395,33 @@ const struct language_defn m2_language_defn = m2_print_typedef, /* Print a typedef using appropriate syntax */ m2_val_print, /* Print a value using appropriate syntax */ c_value_print, /* Print a top-level value */ + default_read_var_value, /* la_read_var_value */ NULL, /* Language specific skip_trampoline */ NULL, /* name_of_this */ + false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ basic_lookup_transparent_type,/* lookup_transparent_type */ NULL, /* Language specific symbol demangler */ - NULL, /* Language specific class_name_from_physname */ + NULL, + NULL, /* Language specific + class_name_from_physname */ m2_op_print_tab, /* expression operators for printing */ 0, /* arrays are first-class (not c-style) */ 0, /* String lower bound */ default_word_break_characters, - default_make_symbol_completion_list, + default_collect_symbol_completion_matches, m2_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, - LANG_MAGIC + c_watch_location_expression, + NULL, /* la_get_symbol_name_matcher */ + iterate_over_symbols, + default_search_name_hash, + &default_varobj_ops, + NULL, + NULL, + m2_is_string_type_p, + "{...}" /* la_struct_too_deep_ellipsis */ }; static void * @@ -411,7 +436,8 @@ build_m2_types (struct gdbarch *gdbarch) builtin_m2_type->builtin_card = arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch), 1, "CARDINAL"); builtin_m2_type->builtin_real - = arch_float_type (gdbarch, gdbarch_float_bit (gdbarch), "REAL", NULL); + = arch_float_type (gdbarch, gdbarch_float_bit (gdbarch), "REAL", + gdbarch_float_format (gdbarch)); builtin_m2_type->builtin_char = arch_character_type (gdbarch, TARGET_CHAR_BIT, 1, "CHAR"); builtin_m2_type->builtin_bool @@ -425,7 +451,7 @@ static struct gdbarch_data *m2_type_data; const struct builtin_m2_type * builtin_m2_type (struct gdbarch *gdbarch) { - return gdbarch_data (gdbarch, m2_type_data); + return (const struct builtin_m2_type *) gdbarch_data (gdbarch, m2_type_data); } @@ -435,6 +461,4 @@ void _initialize_m2_language (void) { m2_type_data = gdbarch_data_register_post_init (build_m2_types); - - add_language (&m2_language_defn); }