f486487f55
This is a patch I extracted from Pedro's C++ branch. It contains the most trivial enum fixes, where an integer type/value was used instead of the appropriate enum type/value. It fixes many C++ errors, since in C++ you can't mix integers and enums implicitely. Regardless of the C++ conversion, I think this is a good cleanup to make use of the appropriate enum types. Regression-tested on native x86_64. gdb/ChangeLog: * aarch64-linux-nat.c (aarch64_linux_can_use_hw_breakpoint): Use enum type or value instead of integer. (aarch64_linux_insert_watchpoint): Likewise. (aarch64_linux_remove_watchpoint): Likewise. * ada-lang.c (ada_op_print_tab): Likewise. * amd64-linux-tdep.c (amd64_canonicalize_syscall): Likewise. (amd64_linux_syscall_record_common): Likewise. * arch-utils.c (target_byte_order_user): Likewise. (default_byte_order): Likewise. * arm-linux-nat.c (arm_linux_can_use_hw_breakpoint): Likewise. (arm_linux_get_hwbp_type): Likewise. (arm_linux_hw_watchpoint_initialize): Likewise. (arm_linux_insert_watchpoint): Likewise. * arm-linux-tdep.c (arm_canonicalize_syscall): Likewise. (arm_linux_syscall_record): Likewise. * breakpoint.c (update_watchpoint): Likewise. (breakpoint_here_p): Likewise. (bpstat_print): Likewise. (enable_breakpoint_disp): Likewise. * c-lang.c (c_op_print_tab): Likewise. * cli/cli-decode.c (add_info_alias): Likewise. * d-lang.c (d_op_print_tab): Likewise. * eval.c (evaluate_subexp_standard): Likewise. * f-exp.y (dot_ops): Likewise. (f77_keywords): Likewise. * f-lang.c (f_op_print_tab): Likewise. * go-lang.c (go_op_print_tab): Likewise. * guile/scm-breakpoint.c (gdbscm_make_breakpoint): Likewise. * guile/scm-cmd.c (gdbscm_make_command): Likewise. * guile/scm-param.c (gdbscm_make_parameter): Likewise. * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): Likewise. * guile/scm-string.c (struct scm_to_stringn_data): Likewise. (struct scm_from_stringn_data): Likewise. * i386-linux-tdep.c (i386_canonicalize_syscall): Likewise. * ia64-linux-nat.c (ia64_linux_insert_watchpoint): Likewise. (ia64_linux_remove_watchpoint): Likewise. (ia64_linux_can_use_hw_breakpoint): Likewise. * infrun.c (print_stop_event): Likewise. * jv-lang.c (java_op_print_tab): Likewise. * linux-nat.c (linux_proc_xfer_partial): Likewise. * linux-nat.h (struct lwp_info): Likewise. * linux-thread-db.c (enable_thread_event): Likewise. * m2-lang.c (m2_op_print_tab): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Likewise. (mi_cmd_stack_list_variables): Likewise. * mi/mi-main.c (mi_cmd_trace_frame_collected): Likewise. * mi/mi-out.c (mi_table_begin): Likewise. (mi_table_header): Likewise. * mips-linux-nat.c (mips_linux_can_use_hw_breakpoint): Likewise. (mips_linux_insert_watchpoint): Likewise. (mips_linux_remove_watchpoint): Likewise. * nat/mips-linux-watch.c (mips_linux_watch_type_to_irw): Likewise. * nat/mips-linux-watch.h (struct mips_watchpoint): Likewise. (mips_linux_watch_type_to_irw): Likewise. * nto-procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_hw_watchpoint): Likewise. (procfs_can_use_hw_breakpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. * p-lang.c (pascal_op_print_tab): Likewise. * ppc-linux-nat.c (ppc_linux_can_use_hw_breakpoint): Likewise. * ppc-linux-tdep.c (ppu2spu_unwind_register): Likewise. * ppc-sysv-tdep.c (get_decimal_float_return_value): Likewise. * procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_watchpoint): Likewise. (procfs_remove_watchpoint): Likewise. * psymtab.c (recursively_search_psymtabs): Likewise. * remote-m32r-sdi.c (m32r_can_use_hw_watchpoint): Likewise. (m32r_insert_watchpoint): Likewise. * remote-mips.c (mips_can_use_watchpoint): Likewise. (mips_insert_watchpoint): Likewise. (mips_remove_watchpoint): Likewise. * remote.c (watchpoint_to_Z_packet): Likewise. (remote_insert_watchpoint): Likewise. (remote_remove_watchpoint): Likewise. (remote_check_watch_resources): Likewise. * s390-linux-nat.c (s390_insert_watchpoint): Likewise. (s390_remove_watchpoint): Likewise. (s390_can_use_hw_breakpoint): Likewise. * s390-linux-tdep.c (s390_gdbarch_init): Likewise. * spu-linux-nat.c (spu_can_use_hw_breakpoint): Likewise. * target.h (struct target_ops): Likewise. * tilegx-tdep.c (tilegx_analyze_prologue): Likewise. * ui-out.c (struct ui_out_hdr): Likewise. (append_header_to_list): Likewise. (get_next_header): Likewise. (verify_field): Likewise. (ui_out_begin): Likewise. (ui_out_field_int): Likewise. (ui_out_field_fmt_int): Likewise. (ui_out_field_skip): Likewise. (ui_out_field_string): Likewise. (ui_out_field_fmt): Likewise. * varobj.c (new_variable): Likewise. * x86-nat.c (x86_insert_watchpoint): Likewise. (x86_remove_watchpoint): Likewise. (x86_can_use_hw_breakpoint): Likewise. * xtensa-tdep.h (struct gdbarch_tdep): Likewise. * inflow.c (enum gdb_has_a_terminal_flag_enum): Add name to previously anonymous enumeration type.. * linux-record.h (enum gdb_syscall): Add gdb_sys_no_syscall value. * target-debug.h (target_debug_print_enum_target_hw_bp_type): New. (target_debug_print_enum_bptype): New. * target-delegates.c: Regenerate.
441 lines
12 KiB
C
441 lines
12 KiB
C
/* Modula 2 language support routines for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 1992-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "parser-defs.h"
|
||
#include "language.h"
|
||
#include "varobj.h"
|
||
#include "m2-lang.h"
|
||
#include "c-lang.h"
|
||
#include "valprint.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);
|
||
|
||
/* Print the character C on STREAM as part of the contents of a literal
|
||
string whose delimiter is QUOTER. Note that that format for printing
|
||
characters and strings is language specific.
|
||
FIXME: This is a copy of the same function from c-exp.y. It should
|
||
be replaced with a true Modula version. */
|
||
|
||
static void
|
||
m2_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
|
||
{
|
||
|
||
c &= 0xFF; /* Avoid sign bit follies. */
|
||
|
||
if (PRINT_LITERAL_FORM (c))
|
||
{
|
||
if (c == '\\' || c == quoter)
|
||
{
|
||
fputs_filtered ("\\", stream);
|
||
}
|
||
fprintf_filtered (stream, "%c", c);
|
||
}
|
||
else
|
||
{
|
||
switch (c)
|
||
{
|
||
case '\n':
|
||
fputs_filtered ("\\n", stream);
|
||
break;
|
||
case '\b':
|
||
fputs_filtered ("\\b", stream);
|
||
break;
|
||
case '\t':
|
||
fputs_filtered ("\\t", stream);
|
||
break;
|
||
case '\f':
|
||
fputs_filtered ("\\f", stream);
|
||
break;
|
||
case '\r':
|
||
fputs_filtered ("\\r", stream);
|
||
break;
|
||
case '\033':
|
||
fputs_filtered ("\\e", stream);
|
||
break;
|
||
case '\007':
|
||
fputs_filtered ("\\a", stream);
|
||
break;
|
||
default:
|
||
fprintf_filtered (stream, "\\%.3o", (unsigned int) c);
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* FIXME: This is a copy of the same function from c-exp.y. It should
|
||
be replaced with a true Modula version. */
|
||
|
||
static void
|
||
m2_printchar (int c, struct type *type, struct ui_file *stream)
|
||
{
|
||
fputs_filtered ("'", stream);
|
||
LA_EMIT_CHAR (c, type, stream, '\'');
|
||
fputs_filtered ("'", stream);
|
||
}
|
||
|
||
/* Print the character string STRING, printing at most LENGTH characters.
|
||
Printing stops early if the number hits print_max; repeat counts
|
||
are printed as appropriate. Print ellipses at the end if we
|
||
had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.
|
||
FIXME: This is a copy of the same function from c-exp.y. It should
|
||
be replaced with a true Modula version. */
|
||
|
||
static void
|
||
m2_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)
|
||
{
|
||
unsigned int i;
|
||
unsigned int things_printed = 0;
|
||
int in_quotes = 0;
|
||
int need_comma = 0;
|
||
|
||
if (length == 0)
|
||
{
|
||
fputs_filtered ("\"\"", gdb_stdout);
|
||
return;
|
||
}
|
||
|
||
for (i = 0; i < length && things_printed < options->print_max; ++i)
|
||
{
|
||
/* Position of the character we are examining
|
||
to see whether it is repeated. */
|
||
unsigned int rep1;
|
||
/* Number of repetitions we have detected so far. */
|
||
unsigned int reps;
|
||
|
||
QUIT;
|
||
|
||
if (need_comma)
|
||
{
|
||
fputs_filtered (", ", stream);
|
||
need_comma = 0;
|
||
}
|
||
|
||
rep1 = i + 1;
|
||
reps = 1;
|
||
while (rep1 < length && string[rep1] == string[i])
|
||
{
|
||
++rep1;
|
||
++reps;
|
||
}
|
||
|
||
if (reps > options->repeat_count_threshold)
|
||
{
|
||
if (in_quotes)
|
||
{
|
||
fputs_filtered ("\", ", stream);
|
||
in_quotes = 0;
|
||
}
|
||
m2_printchar (string[i], type, stream);
|
||
fprintf_filtered (stream, " <repeats %u times>", reps);
|
||
i = rep1 - 1;
|
||
things_printed += options->repeat_count_threshold;
|
||
need_comma = 1;
|
||
}
|
||
else
|
||
{
|
||
if (!in_quotes)
|
||
{
|
||
fputs_filtered ("\"", stream);
|
||
in_quotes = 1;
|
||
}
|
||
LA_EMIT_CHAR (string[i], type, stream, '"');
|
||
++things_printed;
|
||
}
|
||
}
|
||
|
||
/* Terminate the quotes if necessary. */
|
||
if (in_quotes)
|
||
fputs_filtered ("\"", stream);
|
||
|
||
if (force_ellipses || i < length)
|
||
fputs_filtered ("...", stream);
|
||
}
|
||
|
||
static struct value *
|
||
evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
|
||
int *pos, enum noside noside)
|
||
{
|
||
enum exp_opcode op = exp->elts[*pos].opcode;
|
||
struct value *arg1;
|
||
struct value *arg2;
|
||
struct type *type;
|
||
|
||
switch (op)
|
||
{
|
||
case UNOP_HIGH:
|
||
(*pos)++;
|
||
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
|
||
|
||
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
|
||
return arg1;
|
||
else
|
||
{
|
||
arg1 = coerce_ref (arg1);
|
||
type = check_typedef (value_type (arg1));
|
||
|
||
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,
|
||
_("unbounded structure "
|
||
"missing _m2_high field"));
|
||
|
||
if (value_type (arg1) != type)
|
||
arg1 = value_cast (type, arg1);
|
||
}
|
||
}
|
||
return arg1;
|
||
|
||
case BINOP_SUBSCRIPT:
|
||
(*pos)++;
|
||
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
|
||
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
|
||
if (noside == EVAL_SKIP)
|
||
goto nosideret;
|
||
/* If the user attempts to subscript something that is not an
|
||
array or pointer type (like a plain int variable for example),
|
||
then report this as an error. */
|
||
|
||
arg1 = coerce_ref (arg1);
|
||
type = check_typedef (value_type (arg1));
|
||
|
||
if (m2_is_unbounded_array (type))
|
||
{
|
||
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);
|
||
}
|
||
/* i18n: Do not translate the "_m2_contents" part! */
|
||
arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL,
|
||
_("unbounded structure "
|
||
"missing _m2_contents field"));
|
||
|
||
if (value_type (arg1) != type)
|
||
arg1 = value_cast (type, arg1);
|
||
|
||
check_typedef (value_type (arg1));
|
||
return value_ind (value_ptradd (arg1, value_as_long (arg2)));
|
||
}
|
||
else
|
||
if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
|
||
{
|
||
if (TYPE_NAME (type))
|
||
error (_("cannot subscript something of type `%s'"),
|
||
TYPE_NAME (type));
|
||
else
|
||
error (_("cannot subscript requested type"));
|
||
}
|
||
|
||
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
||
return value_zero (TYPE_TARGET_TYPE (type), VALUE_LVAL (arg1));
|
||
else
|
||
return value_subscript (arg1, value_as_long (arg2));
|
||
|
||
default:
|
||
return evaluate_subexp_standard (expect_type, exp, pos, noside);
|
||
}
|
||
|
||
nosideret:
|
||
return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
|
||
}
|
||
|
||
|
||
/* Table of operators and their precedences for printing expressions. */
|
||
|
||
static const struct op_print m2_op_print_tab[] =
|
||
{
|
||
{"+", BINOP_ADD, PREC_ADD, 0},
|
||
{"+", UNOP_PLUS, PREC_PREFIX, 0},
|
||
{"-", BINOP_SUB, PREC_ADD, 0},
|
||
{"-", UNOP_NEG, PREC_PREFIX, 0},
|
||
{"*", BINOP_MUL, PREC_MUL, 0},
|
||
{"/", BINOP_DIV, PREC_MUL, 0},
|
||
{"DIV", BINOP_INTDIV, PREC_MUL, 0},
|
||
{"MOD", BINOP_REM, PREC_MUL, 0},
|
||
{":=", BINOP_ASSIGN, PREC_ASSIGN, 1},
|
||
{"OR", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0},
|
||
{"AND", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0},
|
||
{"NOT", UNOP_LOGICAL_NOT, PREC_PREFIX, 0},
|
||
{"=", BINOP_EQUAL, PREC_EQUAL, 0},
|
||
{"<>", BINOP_NOTEQUAL, PREC_EQUAL, 0},
|
||
{"<=", BINOP_LEQ, PREC_ORDER, 0},
|
||
{">=", BINOP_GEQ, PREC_ORDER, 0},
|
||
{">", BINOP_GTR, PREC_ORDER, 0},
|
||
{"<", BINOP_LESS, PREC_ORDER, 0},
|
||
{"^", UNOP_IND, PREC_PREFIX, 0},
|
||
{"@", BINOP_REPEAT, PREC_REPEAT, 0},
|
||
{"CAP", UNOP_CAP, PREC_BUILTIN_FUNCTION, 0},
|
||
{"CHR", UNOP_CHR, PREC_BUILTIN_FUNCTION, 0},
|
||
{"ORD", UNOP_ORD, PREC_BUILTIN_FUNCTION, 0},
|
||
{"FLOAT", UNOP_FLOAT, PREC_BUILTIN_FUNCTION, 0},
|
||
{"HIGH", UNOP_HIGH, PREC_BUILTIN_FUNCTION, 0},
|
||
{"MAX", UNOP_MAX, PREC_BUILTIN_FUNCTION, 0},
|
||
{"MIN", UNOP_MIN, PREC_BUILTIN_FUNCTION, 0},
|
||
{"ODD", UNOP_ODD, PREC_BUILTIN_FUNCTION, 0},
|
||
{"TRUNC", UNOP_TRUNC, PREC_BUILTIN_FUNCTION, 0},
|
||
{NULL, OP_NULL, PREC_BUILTIN_FUNCTION, 0}
|
||
};
|
||
|
||
/* The built-in types of Modula-2. */
|
||
|
||
enum m2_primitive_types {
|
||
m2_primitive_type_char,
|
||
m2_primitive_type_int,
|
||
m2_primitive_type_card,
|
||
m2_primitive_type_real,
|
||
m2_primitive_type_bool,
|
||
nr_m2_primitive_types
|
||
};
|
||
|
||
static void
|
||
m2_language_arch_info (struct gdbarch *gdbarch,
|
||
struct language_arch_info *lai)
|
||
{
|
||
const struct builtin_m2_type *builtin = builtin_m2_type (gdbarch);
|
||
|
||
lai->string_char_type = builtin->builtin_char;
|
||
lai->primitive_type_vector
|
||
= GDBARCH_OBSTACK_CALLOC (gdbarch, nr_m2_primitive_types + 1,
|
||
struct type *);
|
||
|
||
lai->primitive_type_vector [m2_primitive_type_char]
|
||
= builtin->builtin_char;
|
||
lai->primitive_type_vector [m2_primitive_type_int]
|
||
= builtin->builtin_int;
|
||
lai->primitive_type_vector [m2_primitive_type_card]
|
||
= builtin->builtin_card;
|
||
lai->primitive_type_vector [m2_primitive_type_real]
|
||
= builtin->builtin_real;
|
||
lai->primitive_type_vector [m2_primitive_type_bool]
|
||
= builtin->builtin_bool;
|
||
|
||
lai->bool_type_symbol = "BOOLEAN";
|
||
lai->bool_type_default = builtin->builtin_bool;
|
||
}
|
||
|
||
const struct exp_descriptor exp_descriptor_modula2 =
|
||
{
|
||
print_subexp_standard,
|
||
operator_length_standard,
|
||
operator_check_standard,
|
||
op_name_standard,
|
||
dump_subexp_body_standard,
|
||
evaluate_subexp_modula2
|
||
};
|
||
|
||
const struct language_defn m2_language_defn =
|
||
{
|
||
"modula-2",
|
||
"Modula-2",
|
||
language_m2,
|
||
range_check_on,
|
||
case_sensitive_on,
|
||
array_row_major,
|
||
macro_expansion_no,
|
||
&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 */
|
||
m2_emit_char, /* Function to print a single character */
|
||
m2_print_type, /* Print a type using appropriate syntax */
|
||
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 */
|
||
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 */
|
||
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,
|
||
m2_language_arch_info,
|
||
default_print_array_index,
|
||
default_pass_by_reference,
|
||
default_get_string,
|
||
NULL, /* la_get_symbol_name_cmp */
|
||
iterate_over_symbols,
|
||
&default_varobj_ops,
|
||
NULL,
|
||
NULL,
|
||
LANG_MAGIC
|
||
};
|
||
|
||
static void *
|
||
build_m2_types (struct gdbarch *gdbarch)
|
||
{
|
||
struct builtin_m2_type *builtin_m2_type
|
||
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_m2_type);
|
||
|
||
/* Modula-2 "pervasive" types. NOTE: these can be redefined!!! */
|
||
builtin_m2_type->builtin_int
|
||
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch), 0, "INTEGER");
|
||
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);
|
||
builtin_m2_type->builtin_char
|
||
= arch_character_type (gdbarch, TARGET_CHAR_BIT, 1, "CHAR");
|
||
builtin_m2_type->builtin_bool
|
||
= arch_boolean_type (gdbarch, gdbarch_int_bit (gdbarch), 1, "BOOLEAN");
|
||
|
||
return builtin_m2_type;
|
||
}
|
||
|
||
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);
|
||
}
|
||
|
||
|
||
/* Initialization for Modula-2 */
|
||
|
||
void
|
||
_initialize_m2_language (void)
|
||
{
|
||
m2_type_data = gdbarch_data_register_post_init (build_m2_types);
|
||
|
||
add_language (&m2_language_defn);
|
||
}
|