forked from Imagelibrary/binutils-gdb
This is sort of a continuation of Keith's parse_exp_1 constification
patch. It started out by undoing these bits:
@@ -754,9 +754,12 @@ validate_actionline (char **line, struct
tmp_p = p;
for (loc = t->base.loc; loc; loc = loc->next)
{
- p = tmp_p;
- exp = parse_exp_1 (&p, loc->address,
+ const char *q;
+
+ q = tmp_p;
+ exp = parse_exp_1 (&q, loc->address,
block_for_pc (loc->address), 1);
+ p = (char *) q;
and progressively making more things const upwards, fixing fallout,
rinse repeat, until GDB built again (--enable-targets=all).
That ended up constifying lookup_cmd/add_cmd and (lots of) friends,
and the completers.
I didn't try to constify the command hooks themselves, because I know
upfront there are commands that write to the command string argument,
and I think I managed to stop at a nice non-hacky split point already.
I think the only non-really-super-obvious changes are
tracepoint.c:validate_actionline, and tracepoint.c:trace_dump_actions.
The rest is just mostly about 'char *' => 'const char *', 'char **'=>
'const char **', and the occasional (e.g., deprecated_cmd_warning)
case of 'char **'=> 'const char *', where/when I noticed that nothing
actually cares about the pointer to pointer output.
Tested on x86_64 Fedora 17, native and gdbserver.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* ada-lang.c (struct add_partial_datum) <text, text0, word>: Make
fields const.
(ada_make_symbol_completion_list): Make "text0" parameter const.
* ax-gdb.c (agent_eval_command_one): Make "exp" parameter const.
* breakpoint.c (condition_completer): Make "text" and "word"
parameters const. Adjust.
(check_tracepoint_command): Adjust to validate_actionline
prototype change.
(catch_syscall_completer): Make "text" and "word" parameters
const.
* cli/cli-cmds.c (show_user): Make "comname" local const.
(valid_command_p): Make "command" parameter const.
(alias_command): Make "alias_prefix" and "command_prefix" locals
const.
* cli/cli-decode.c (add_cmd): Make "name" parameter const.
(add_alias_cmd): Make "name" and "oldname" parameters const.
Adjust. No longer make copy of OLDNAME.
(add_prefix_cmd, add_abbrev_prefix_cmd, add_set_or_show_cmd)
(add_setshow_cmd_full, add_setshow_enum_cmd)
(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
(add_setshow_filename_cmd, add_setshow_string_cmd)
(add_setshow_string_noescape_cmd)
(add_setshow_optional_filename_cmd, add_setshow_integer_cmd)
(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd)
(add_setshow_zuinteger_unlimited_cmd, add_setshow_zuinteger_cmd)
(delete_cmd, add_info, add_info_alias, add_com, add_com_alias):
Make "name" parameter const.
(help_cmd): Rename "command" parameter to "arg". New const local
"command".
(find_cmd): Make "command" parameter const.
(lookup_cmd_1): Make "text" parameter pointer to const. Adjust to
deprecated_cmd_warning prototype change.
(undef_cmd_error): Make "cmdtype" parameter const.
(lookup_cmd): Make "line" parameter const.
(deprecated_cmd_warning): Change type of "text" parameter to
pointer to const char, from pointer to pointer to char. Adjust.
(lookup_cmd_composition): Make "text" parameter const.
(complete_on_cmdlist, complete_on_enum): Make "text" and "word"
parameters const.
* cli/cli-decode.h (struct cmd_list_element) <name>: Make field
const.
* cli/cli-script.c (validate_comname): Make "tem" local const.
(define_command): New const local "tem_c". Use it in calls to
lookup_cmd.
(document_command): Make "tem" and "comfull" locals const.
(show_user_1): Make "prefix" and "name" parameters const.
* cli-script.h (show_user_1): Make "prefix" and "name" parameters
const.
* command.h (add_cmd, add_alias_cmd, add_prefix_cmd)
(add_abbrev_prefix_cmd, completer_ftype, lookup_cmd, lookup_cmd_1)
(deprecated_cmd_warning, lookup_cmd_composition, add_com)
(add_com_alias, add_info, add_info_alias, complete_on_cmdlist)
(complete_on_enum, add_setshow_enum_cmd)
(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
(add_setshow_filename_cmd, add_setshow_string_cmd)
(add_setshow_string_noescape_cmd)
(add_setshow_optional_filename_cmd, add_setshow_integer_cmd)
(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd)
(add_setshow_zuinteger_cmd, add_setshow_zuinteger_unlimited_cmd):
Change prototypes, constifying strings.
* completer.c (noop_completer, filename_completer): Make "text"
and "prefix" parameters const.
(location_completer, expression_completer)
(complete_line_internal): Make "text" and "prefix" parameters
const and adjust.
(command_completer, signal_completer): Make "text" and "prefix"
parameters const.
* completer.h (noop_completer, filename_completer)
(expression_completer, location_completer, command_completer)
(signal_completer): Change prototypes.
* corefile.c (complete_set_gnutarget): Make "text" and "word"
parameters const.
* cp-abi.c (cp_abi_completer): Likewise.
* expression.h (parse_expression_for_completion): Change
prototype.
* f-lang.c (f_make_symbol_completion_list): Make "text" and "word"
parameters const.
* infcmd.c (_initialize_infcmd): Make "cmd_name" local const.
* infrun.c (handle_completer): Make "text" and "word" parameters
const.
* interps.c (interpreter_completer): Make "text" and "word"
parameters const.
* language.h (struct language_defn)
<la_make_symbol_completion_list>: Make "text" and "word"
parameters const.
* parse.c (parse_exp_1): Move const hack to parse_exp_in_context.
(parse_exp_in_context): Rename to ...
(parse_exp_in_context_1): ... this.
(parse_exp_in_context): Reimplement, with const hack from
parse_exp_1.
(parse_expression_for_completion): Make "string" parameter const.
* printcmd.c (decode_format): Make "string_ptr" parameter pointer
to pointer to const char. Adjust.
(print_command_1): Make "exp" parameter const.
(output_command): Rename to ...
(output_command_const): ... this. Make "exp" parameter const.
(output_command): Reimplement.
(x_command): Adjust.
(display_command): Rename "exp" parameter to "arg". New "exp"
local, const version of "arg".
* python/py-auto-load.c (gdbpy_initialize_auto_load): Make
"cmd_name" local const.
* python/py-cmd.c (cmdpy_destroyer): Cast const away in xfree
call.
(cmdpy_completer): Make "text" and "word" parameters const.
(gdbpy_parse_command_name): Make "prefix_text2" local const.
* python/py-param.c (add_setshow_generic): Make "tmp_name" local
const.
* remote.c (_initialize_remote): Make "cmd_name" local const.
* symtab.c (language_search_unquoted_string): Make "text" and "p"
parameters const. Adjust.
(completion_list_add_fields): Make "sym_text", "text" and "word"
parameters const.
(struct add_name_data) <sym_text, text, word>: Make fields const.
(default_make_symbol_completion_list_break_on): Make "text" and
"word" parameters const. Adjust locals.
(default_make_symbol_completion_list)
(make_symbol_completion_list, make_symbol_completion_type)
(make_symbol_completion_list_fn): Make "text" and "word"
parameters const.
(make_file_symbol_completion_list): Make "text", "word" and
"srcfile" parameters const. Adjust locals.
(add_filename_to_list): Make "text" and "word" parameters const.
(struct add_partial_filename_data) <text, word>: Make fields
const.
(make_source_files_completion_list): Make "text" and "word"
parameters const.
* symtab.h (default_make_symbol_completion_list_break_on)
(default_make_symbol_completion_list, make_symbol_completion_list)
(make_symbol_completion_type enum type_code)
(make_symbol_completion_list_fn make_file_symbol_completion_list)
(make_source_files_completion_list): Change prototype.
* top.c (execute_command): Adjust to pass pointer to pointer to
const char to lookup_cmd, and to deprecated_cmd_warning prototype
change.
(set_verbose): Make "cmdname" local const.
* tracepoint.c (decode_agent_options): Make "exp" parameter const,
and adjust.
(validate_actionline): Make "line" parameter a pointer to const
char, and adjust.
(encode_actions_1): Make "action_exp" local const, and adjust.
(encode_actions): Adjust.
(replace_comma): Delete.
(trace_dump_actions): Make "action_exp" and "next_comma" locals
const, and adjust. Don't frob the action string while splitting
it at commas. Instead, make a copy of each split substring in
turn.
(trace_dump_command): Adjust to validate_actionline prototype
change.
* tracepoint.h (decode_agent_options, decode_agent_options)
(encode_actions, validate_actionline): Change prototypes.
* valprint.h (output_command): Delete declaration.
(output_command_const): Declare.
* value.c (function_destroyer): Cast const away in xfree call.
352 lines
10 KiB
C
352 lines
10 KiB
C
/* Fortran language support routines for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 1993-2013 Free Software Foundation, Inc.
|
||
|
||
Contributed by Motorola. Adapted from the C parser by Farooq Butt
|
||
(fmbutt@engage.sps.mot.com).
|
||
|
||
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 "gdb_string.h"
|
||
#include "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "parser-defs.h"
|
||
#include "language.h"
|
||
#include "f-lang.h"
|
||
#include "valprint.h"
|
||
#include "value.h"
|
||
#include "cp-support.h"
|
||
#include "charset.h"
|
||
#include "c-lang.h"
|
||
|
||
|
||
/* Local functions */
|
||
|
||
extern void _initialize_f_language (void);
|
||
|
||
static void f_printchar (int c, struct type *type, struct ui_file * stream);
|
||
static void f_emit_char (int c, struct type *type,
|
||
struct ui_file * stream, int quoter);
|
||
|
||
/* Return the encoding that should be used for the character type
|
||
TYPE. */
|
||
|
||
static const char *
|
||
f_get_encoding (struct type *type)
|
||
{
|
||
const char *encoding;
|
||
|
||
switch (TYPE_LENGTH (type))
|
||
{
|
||
case 1:
|
||
encoding = target_charset (get_type_arch (type));
|
||
break;
|
||
case 4:
|
||
if (gdbarch_byte_order (get_type_arch (type)) == BFD_ENDIAN_BIG)
|
||
encoding = "UTF-32BE";
|
||
else
|
||
encoding = "UTF-32LE";
|
||
break;
|
||
|
||
default:
|
||
error (_("unrecognized character type"));
|
||
}
|
||
|
||
return encoding;
|
||
}
|
||
|
||
/* 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 F77 version. */
|
||
|
||
static void
|
||
f_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
|
||
{
|
||
const char *encoding = f_get_encoding (type);
|
||
|
||
generic_emit_char (c, type, stream, quoter, encoding);
|
||
}
|
||
|
||
/* Implementation of la_printchar. */
|
||
|
||
static void
|
||
f_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 F77 version. */
|
||
|
||
static void
|
||
f_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)
|
||
{
|
||
const char *type_encoding = f_get_encoding (type);
|
||
|
||
if (TYPE_LENGTH (type) == 4)
|
||
fputs_filtered ("4_", stream);
|
||
|
||
if (!encoding || !*encoding)
|
||
encoding = type_encoding;
|
||
|
||
generic_printstr (stream, type, string, length, encoding,
|
||
force_ellipses, '\'', 0, options);
|
||
}
|
||
|
||
|
||
/* Table of operators and their precedences for printing expressions. */
|
||
|
||
static const struct op_print f_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},
|
||
{".EQ.", BINOP_EQUAL, PREC_EQUAL, 0},
|
||
{".NE.", BINOP_NOTEQUAL, PREC_EQUAL, 0},
|
||
{".LE.", BINOP_LEQ, PREC_ORDER, 0},
|
||
{".GE.", BINOP_GEQ, PREC_ORDER, 0},
|
||
{".GT.", BINOP_GTR, PREC_ORDER, 0},
|
||
{".LT.", BINOP_LESS, PREC_ORDER, 0},
|
||
{"**", UNOP_IND, PREC_PREFIX, 0},
|
||
{"@", BINOP_REPEAT, PREC_REPEAT, 0},
|
||
{NULL, 0, 0, 0}
|
||
};
|
||
|
||
enum f_primitive_types {
|
||
f_primitive_type_character,
|
||
f_primitive_type_logical,
|
||
f_primitive_type_logical_s1,
|
||
f_primitive_type_logical_s2,
|
||
f_primitive_type_logical_s8,
|
||
f_primitive_type_integer,
|
||
f_primitive_type_integer_s2,
|
||
f_primitive_type_real,
|
||
f_primitive_type_real_s8,
|
||
f_primitive_type_real_s16,
|
||
f_primitive_type_complex_s8,
|
||
f_primitive_type_complex_s16,
|
||
f_primitive_type_void,
|
||
nr_f_primitive_types
|
||
};
|
||
|
||
static void
|
||
f_language_arch_info (struct gdbarch *gdbarch,
|
||
struct language_arch_info *lai)
|
||
{
|
||
const struct builtin_f_type *builtin = builtin_f_type (gdbarch);
|
||
|
||
lai->string_char_type = builtin->builtin_character;
|
||
lai->primitive_type_vector
|
||
= GDBARCH_OBSTACK_CALLOC (gdbarch, nr_f_primitive_types + 1,
|
||
struct type *);
|
||
|
||
lai->primitive_type_vector [f_primitive_type_character]
|
||
= builtin->builtin_character;
|
||
lai->primitive_type_vector [f_primitive_type_logical]
|
||
= builtin->builtin_logical;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s1]
|
||
= builtin->builtin_logical_s1;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s2]
|
||
= builtin->builtin_logical_s2;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s8]
|
||
= builtin->builtin_logical_s8;
|
||
lai->primitive_type_vector [f_primitive_type_real]
|
||
= builtin->builtin_real;
|
||
lai->primitive_type_vector [f_primitive_type_real_s8]
|
||
= builtin->builtin_real_s8;
|
||
lai->primitive_type_vector [f_primitive_type_real_s16]
|
||
= builtin->builtin_real_s16;
|
||
lai->primitive_type_vector [f_primitive_type_complex_s8]
|
||
= builtin->builtin_complex_s8;
|
||
lai->primitive_type_vector [f_primitive_type_complex_s16]
|
||
= builtin->builtin_complex_s16;
|
||
lai->primitive_type_vector [f_primitive_type_void]
|
||
= builtin->builtin_void;
|
||
|
||
lai->bool_type_symbol = "logical";
|
||
lai->bool_type_default = builtin->builtin_logical_s2;
|
||
}
|
||
|
||
/* Remove the modules separator :: from the default break list. */
|
||
|
||
static char *
|
||
f_word_break_characters (void)
|
||
{
|
||
static char *retval;
|
||
|
||
if (!retval)
|
||
{
|
||
char *s;
|
||
|
||
retval = xstrdup (default_word_break_characters ());
|
||
s = strchr (retval, ':');
|
||
if (s)
|
||
{
|
||
char *last_char = &s[strlen (s) - 1];
|
||
|
||
*s = *last_char;
|
||
*last_char = 0;
|
||
}
|
||
}
|
||
return retval;
|
||
}
|
||
|
||
/* Consider the modules separator :: as a valid symbol name character
|
||
class. */
|
||
|
||
static VEC (char_ptr) *
|
||
f_make_symbol_completion_list (const char *text, const char *word,
|
||
enum type_code code)
|
||
{
|
||
return default_make_symbol_completion_list_break_on (text, word, ":", code);
|
||
}
|
||
|
||
const struct language_defn f_language_defn =
|
||
{
|
||
"fortran",
|
||
language_fortran,
|
||
range_check_on,
|
||
case_sensitive_off,
|
||
array_column_major,
|
||
macro_expansion_no,
|
||
&exp_descriptor_standard,
|
||
f_parse, /* parser */
|
||
f_error, /* parser error function */
|
||
null_post_parser,
|
||
f_printchar, /* Print character constant */
|
||
f_printstr, /* function to print string constant */
|
||
f_emit_char, /* Function to print a single character */
|
||
f_print_type, /* Print a type using appropriate syntax */
|
||
default_print_typedef, /* Print a typedef using appropriate syntax */
|
||
f_val_print, /* Print a value using appropriate syntax */
|
||
c_value_print, /* FIXME */
|
||
default_read_var_value, /* la_read_var_value */
|
||
NULL, /* Language specific skip_trampoline */
|
||
NULL, /* name_of_this */
|
||
cp_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 */
|
||
f_op_print_tab, /* expression operators for printing */
|
||
0, /* arrays are first-class (not c-style) */
|
||
1, /* String lower bound */
|
||
f_word_break_characters,
|
||
f_make_symbol_completion_list,
|
||
f_language_arch_info,
|
||
default_print_array_index,
|
||
default_pass_by_reference,
|
||
default_get_string,
|
||
NULL, /* la_get_symbol_name_cmp */
|
||
iterate_over_symbols,
|
||
LANG_MAGIC
|
||
};
|
||
|
||
static void *
|
||
build_fortran_types (struct gdbarch *gdbarch)
|
||
{
|
||
struct builtin_f_type *builtin_f_type
|
||
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_f_type);
|
||
|
||
builtin_f_type->builtin_void
|
||
= arch_type (gdbarch, TYPE_CODE_VOID, 1, "VOID");
|
||
|
||
builtin_f_type->builtin_character
|
||
= arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, "character");
|
||
|
||
builtin_f_type->builtin_logical_s1
|
||
= arch_boolean_type (gdbarch, TARGET_CHAR_BIT, 1, "logical*1");
|
||
|
||
builtin_f_type->builtin_integer_s2
|
||
= arch_integer_type (gdbarch, gdbarch_short_bit (gdbarch), 0,
|
||
"integer*2");
|
||
|
||
builtin_f_type->builtin_logical_s2
|
||
= arch_boolean_type (gdbarch, gdbarch_short_bit (gdbarch), 1,
|
||
"logical*2");
|
||
|
||
builtin_f_type->builtin_logical_s8
|
||
= arch_boolean_type (gdbarch, gdbarch_long_long_bit (gdbarch), 1,
|
||
"logical*8");
|
||
|
||
builtin_f_type->builtin_integer
|
||
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch), 0,
|
||
"integer");
|
||
|
||
builtin_f_type->builtin_logical
|
||
= arch_boolean_type (gdbarch, gdbarch_int_bit (gdbarch), 1,
|
||
"logical*4");
|
||
|
||
builtin_f_type->builtin_real
|
||
= arch_float_type (gdbarch, gdbarch_float_bit (gdbarch),
|
||
"real", NULL);
|
||
builtin_f_type->builtin_real_s8
|
||
= arch_float_type (gdbarch, gdbarch_double_bit (gdbarch),
|
||
"real*8", NULL);
|
||
builtin_f_type->builtin_real_s16
|
||
= arch_float_type (gdbarch, gdbarch_long_double_bit (gdbarch),
|
||
"real*16", NULL);
|
||
|
||
builtin_f_type->builtin_complex_s8
|
||
= arch_complex_type (gdbarch, "complex*8",
|
||
builtin_f_type->builtin_real);
|
||
builtin_f_type->builtin_complex_s16
|
||
= arch_complex_type (gdbarch, "complex*16",
|
||
builtin_f_type->builtin_real_s8);
|
||
builtin_f_type->builtin_complex_s32
|
||
= arch_complex_type (gdbarch, "complex*32",
|
||
builtin_f_type->builtin_real_s16);
|
||
|
||
return builtin_f_type;
|
||
}
|
||
|
||
static struct gdbarch_data *f_type_data;
|
||
|
||
const struct builtin_f_type *
|
||
builtin_f_type (struct gdbarch *gdbarch)
|
||
{
|
||
return gdbarch_data (gdbarch, f_type_data);
|
||
}
|
||
|
||
void
|
||
_initialize_f_language (void)
|
||
{
|
||
f_type_data = gdbarch_data_register_post_init (build_fortran_types);
|
||
|
||
add_language (&f_language_defn);
|
||
}
|