2005-12-17 23:34:03 +01:00
|
|
|
|
/* Ada language support routines for GDB, the GNU debugger. Copyright (C)
|
2005-01-28 20:56:01 +01:00
|
|
|
|
|
2009-02-05 13:16:25 +01:00
|
|
|
|
1992, 1993, 1994, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2007, 2008,
|
|
|
|
|
2009 Free Software Foundation, Inc.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-08-23 20:08:50 +02:00
|
|
|
|
This file is part of GDB.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-08-23 20:08:50 +02:00
|
|
|
|
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.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-08-23 20:08:50 +02:00
|
|
|
|
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.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-08-23 20:08:50 +02:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#include "defs.h"
|
2002-06-04 17:28:49 +02:00
|
|
|
|
#include <stdio.h>
|
2002-08-18 20:24:29 +02:00
|
|
|
|
#include "gdb_string.h"
|
2002-06-04 17:28:49 +02:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include "demangle.h"
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#include "gdb_regex.h"
|
|
|
|
|
#include "frame.h"
|
2002-06-04 17:28:49 +02:00
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "parser-defs.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "c-lang.h"
|
|
|
|
|
#include "inferior.h"
|
|
|
|
|
#include "symfile.h"
|
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "breakpoint.h"
|
|
|
|
|
#include "gdbcore.h"
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#include "hashtab.h"
|
|
|
|
|
#include "gdb_obstack.h"
|
2002-06-04 17:28:49 +02:00
|
|
|
|
#include "ada-lang.h"
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#include "completer.h"
|
|
|
|
|
#include "gdb_stat.h"
|
|
|
|
|
#ifdef UI_OUT
|
2002-06-04 17:28:49 +02:00
|
|
|
|
#include "ui-out.h"
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#endif
|
2003-02-19 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add block.c.
(block_h): New.
(COMMON_OBS): Add block.o.
(block.o): New.
(x86-64-tdep.o): Add $(block_h).
(values.o, valops.o, tracepoint.o, symtab.o, symmisc.o, symfile.o)
(stack.o, printcmd.o, p-exp.tab.o, parse.o, objfiles.o)
(objc-exp.tab.o, objc-lang.o, nlmread.o, mips-tdep.o, mdebugread.o)
(m2-exp.tab.o, linespec.o, jv-lang.o, jv-exp.tab.o, infcmd.o)
(f-valprint.o, findvar.o, f-exp.tab.o, expprint.o, coffread.o)
(c-exp.tab.o, buildsym.o, breakpoint.o, blockframe.o, ax-gdb.o)
(alpha-tdep.o, ada-lang.o, ada-exp.tab.o, mi-cmd-stack.o): Ditto.
* value.h: Add opaque declaration for struct block.
* parser-defs.h, objc-lang.h, buildsym.h, breakpoint.h: Ditto.
* ada-lang.h: Ditto.
* x86-64-tdep.c: #include "block.h"
* values.c, valops.c, tracepoint.c, symtab.c, symmisc.c: Ditto.
* symfile.c, stack.c, printcmd.c, p-exp.y, parse.c: Ditto.
* objfiles.c, objc-exp.y, objc-lang.c, nlmread.c: Ditto.
* mips-tdep.c, mdebugread.c, m2-exp.y, linespec.c: Ditto.
* jv-lang.c, jv-exp.y, infcmd.c, f-valprint.c: Ditto.
* findvar.c, f-exp.y, expprint.c, coffread.c, c-exp.y: Ditto.
* buildsym.c, breakpoint.c, blockframe.c, ax-gdb.c: Ditto.
* alpha-tdep.c, ada-lang.c, ada-exp.y: Ditto.
* blockframe.c (blockvector_for_pc_sect): Move to "block.c".
(blockvector_for_pc, block_for_pc_sect, block_for_pc): Ditto.
* symtab.c (block_function): Ditto.
(contained_in): Ditto.
* frame.h: Move block_for_pc and block_for_pc_sect declarations to
block.h. Add opaque declaration for struct block.
* symtab.h: Move block_function and contained_in declarations to
block.h. Add opaque declarations for struct block, struct
blockvector.
(struct block): Move to block.h.
(struct blockvector): Ditto.
(BLOCK_START, BLOCK_END, BLOCK_FUNCTION, BLOCK_SUPERBLOCK)
(BLOCK_GCC_COMPILED, BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM)
(BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE)
(ALL_BLOCK_SYMBOLS, BLOCK_SHOULD_SORT, BLOCKVECTOR_NBLOCKS)
(BLOCKVECTOR_BLOCK, GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK):
Ditto.
* block.c: New file.
* block.h: New file.
2003-02-19 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: #include "block.h"
2003-02-20 01:01:07 +01:00
|
|
|
|
#include "block.h"
|
2003-04-21 Andrew Cagney <cagney@redhat.com>
* infcall.c: New file.
* infcall.h: New file.
* valarith.c: Include "infcall.h".
* scm-lang.c, objc-lang.cm, hppa-tdep.c, gcore.c: Ditto.
* eval.c, ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (valarith.o, scm-lang.o): Update dependencies.
(objc-lang.o, hppa-tdep.o, gcore.o): Update dependencies.
(eval.o, ada-valprint.o, ada-lang.o): Update dependencies.
(SFILES): Add "infcall.c"
(COMMON_OBS): Add "infcall.o".
(infcall.o): Specify dependencies.
* value.h (call_function_by_hand): Delete declaration.
* inferior.h (run_stack_dummy): Delete declaration.
* infcmd.c (breakpoint_auto_delete_contents): Move to "infcall.c".
(run_stack_dummy): Move to "infcall.c", merged into
call_function_by_hand.
* valops.c (call_function_by_hand): Moved to "infcall.c".
(find_function_addr, value_arg_coerce): Ditto.
(unwindonsignal_p, coerce_float_to_double): Ditto.
(_initialize_valops): Move "set/show coerce-float-to-double", and
"set/show unwindonsignal" commands to "infcall.c".
* v850-tdep.c, target.h: Update comments.
* sparc-tdep.c (sparc_fix_call_dummy): Update comments.
* sh-tdep.c (sh_init_extra_frame_info): Update comments.
(sh64_init_extra_frame_info): Update comments.
* mn10300-tdep.c: Update comments.
* mcore-tdep.c (mcore_init_extra_frame_info): Update comments.
* config/sparc/tm-sparc.h: Update comments.
* breakpoint.h: Update comments.
* avr-tdep.c (avr_init_extra_frame_info): Update comments.
* arm-tdep.c: Update comment.
2003-04-21 18:48:41 +02:00
|
|
|
|
#include "infcall.h"
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
#include "dictionary.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-12 19:31:35 +01:00
|
|
|
|
#include "exceptions.h"
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
#include "annotate.h"
|
|
|
|
|
#include "valprint.h"
|
2007-01-08 04:14:19 +01:00
|
|
|
|
#include "source.h"
|
2007-03-29 23:57:02 +02:00
|
|
|
|
#include "observer.h"
|
2008-02-07 20:06:51 +01:00
|
|
|
|
#include "vec.h"
|
2010-01-20 04:34:25 +01:00
|
|
|
|
#include "stack.h"
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
#include "psymtab.h"
|
2010-10-05 00:32:31 +02:00
|
|
|
|
#include "value.h"
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Define whether or not the C operator '/' truncates towards zero for
|
|
|
|
|
differently signed operands (truncation direction is undefined in C).
|
|
|
|
|
Copied from valarith.c. */
|
|
|
|
|
|
|
|
|
|
#ifndef TRUNCATION_TOWARDS_ZERO
|
|
|
|
|
#define TRUNCATION_TOWARDS_ZERO ((-5 / 2) == -2)
|
|
|
|
|
#endif
|
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
static void modify_general_field (struct type *, char *, LONGEST, int, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *desc_base_type (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *desc_bounds_type (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *desc_bounds (struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int fat_pntr_bounds_bitpos (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int fat_pntr_bounds_bitsize (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-05-18 15:55:49 +02:00
|
|
|
|
static struct type *desc_data_target_type (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *desc_data (struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int fat_pntr_data_bitpos (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int fat_pntr_data_bitsize (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *desc_one_bound (struct value *, int, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int desc_bound_bitpos (struct type *, int, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int desc_bound_bitsize (struct type *, int, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *desc_index_type (struct type *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int desc_arity (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int ada_type_match (struct type *, struct type *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int ada_args_match (struct symbol *, struct value **, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-10-05 00:32:31 +02:00
|
|
|
|
static struct value *make_array_descriptor (struct type *, struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static void ada_add_block_symbols (struct obstack *,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct block *, const char *,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
domain_enum, struct objfile *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static int is_nonfunction (struct ada_symbol_info *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static void add_defn_to_vec (struct obstack *, struct symbol *,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct block *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static int num_defns_collected (struct obstack *);
|
|
|
|
|
|
|
|
|
|
static struct ada_symbol_info *defns_collected (struct obstack *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *resolve_subexp (struct expression **, int *, int,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static void replace_operator_with_call (struct expression **, int, int, int,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct symbol *, struct block *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int possible_user_operator_p (enum exp_opcode, struct value **);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *ada_op_name (enum exp_opcode);
|
|
|
|
|
|
|
|
|
|
static const char *ada_decoded_op_name (enum exp_opcode);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int numeric_type_p (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int integer_type_p (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int scalar_type_p (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int discrete_type_p (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
static enum ada_renaming_category parse_old_style_renaming (struct type *,
|
|
|
|
|
const char **,
|
|
|
|
|
int *,
|
|
|
|
|
const char **);
|
|
|
|
|
|
|
|
|
|
static struct symbol *find_old_style_renaming_symbol (const char *,
|
|
|
|
|
struct block *);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct type *ada_lookup_struct_elt_type (struct type *, char *,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
int, int, int *);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *evaluate_subexp_type (struct expression *, int *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-01-12 06:49:00 +01:00
|
|
|
|
static struct type *ada_find_parallel_type_with_name (struct type *,
|
|
|
|
|
const char *);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int is_dynamic_field (struct type *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2005-01-28 20:56:01 +01:00
|
|
|
|
static struct type *to_fixed_variant_branch_type (struct type *,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR, struct value *);
|
|
|
|
|
|
|
|
|
|
static struct type *to_fixed_array_type (struct type *, struct value *, int);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-05-17 18:55:31 +02:00
|
|
|
|
static struct type *to_fixed_range_type (struct type *, struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *to_static_fixed_type (struct type *);
|
2008-01-03 14:11:51 +01:00
|
|
|
|
static struct type *static_unwrap_type (struct type *type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *unwrap_value (struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
static struct type *constrained_packed_array_type (struct type *, long *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
static struct type *decode_constrained_packed_array_type (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
static long decode_packed_array_bitsize (struct type *);
|
|
|
|
|
|
|
|
|
|
static struct value *decode_constrained_packed_array (struct value *);
|
|
|
|
|
|
|
|
|
|
static int ada_is_packed_array_type (struct type *);
|
|
|
|
|
|
|
|
|
|
static int ada_is_unconstrained_packed_array_type (struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *value_subscript_packed (struct value *, int,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value **);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
static void move_bits (gdb_byte *, int, const gdb_byte *, int, int, int);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *coerce_unspec_val_to_type (struct value *,
|
|
|
|
|
struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *get_var_value (char *, char *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int lesseq_defined_than (struct symbol *, struct symbol *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int equiv_types (struct type *, struct type *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int is_name_suffix (const char *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-10-04 08:34:40 +02:00
|
|
|
|
static int advance_wild_match (const char **, const char *, int);
|
|
|
|
|
|
|
|
|
|
static int wild_match (const char *, const char *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *ada_coerce_ref (struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static LONGEST pos_atr (struct value *);
|
|
|
|
|
|
2008-09-11 16:19:09 +02:00
|
|
|
|
static struct value *value_pos_atr (struct type *, struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *value_val_atr (struct type *, struct value *);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct symbol *standard_lookup (const char *, const struct block *,
|
|
|
|
|
domain_enum);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *ada_search_struct_field (char *, struct value *, int,
|
|
|
|
|
struct type *);
|
|
|
|
|
|
|
|
|
|
static struct value *ada_value_primitive_field (struct value *, int, int,
|
|
|
|
|
struct type *);
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static int find_struct_field (char *, struct type *, int,
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
struct type **, int *, int *, int *, int *);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
static struct value *ada_to_fixed_value_create (struct type *, CORE_ADDR,
|
|
|
|
|
struct value *);
|
|
|
|
|
|
|
|
|
|
static int ada_resolve_function (struct ada_symbol_info *, int,
|
|
|
|
|
struct value **, int, const char *,
|
|
|
|
|
struct type *);
|
|
|
|
|
|
|
|
|
|
static struct value *ada_coerce_to_simple_array (struct value *);
|
|
|
|
|
|
|
|
|
|
static int ada_is_direct_array_type (struct type *);
|
|
|
|
|
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
static void ada_language_arch_info (struct gdbarch *,
|
|
|
|
|
struct language_arch_info *);
|
2004-10-15 11:12:24 +02:00
|
|
|
|
|
|
|
|
|
static void check_size (const struct type *);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
static struct value *ada_index_struct_field (int, struct value *, int,
|
|
|
|
|
struct type *);
|
|
|
|
|
|
|
|
|
|
static struct value *assign_aggregate (struct value *, struct value *,
|
|
|
|
|
struct expression *, int *, enum noside);
|
|
|
|
|
|
|
|
|
|
static void aggregate_assign_from_choices (struct value *, struct value *,
|
|
|
|
|
struct expression *,
|
|
|
|
|
int *, LONGEST *, int *,
|
|
|
|
|
int, LONGEST, LONGEST);
|
|
|
|
|
|
|
|
|
|
static void aggregate_assign_positional (struct value *, struct value *,
|
|
|
|
|
struct expression *,
|
|
|
|
|
int *, LONGEST *, int *, int,
|
|
|
|
|
LONGEST, LONGEST);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void aggregate_assign_others (struct value *, struct value *,
|
|
|
|
|
struct expression *,
|
|
|
|
|
int *, LONGEST *, int, LONGEST, LONGEST);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void add_component_interval (LONGEST, LONGEST, LONGEST *, int *, int);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct value *ada_evaluate_subexp (struct type *, struct expression *,
|
|
|
|
|
int *, enum noside);
|
|
|
|
|
|
|
|
|
|
static void ada_forward_operator_length (struct expression *, int, int *,
|
|
|
|
|
int *);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Maximum-sized dynamic type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static unsigned int varsize_limit;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* FIXME: brobecker/2003-09-17: No longer a const because it is
|
|
|
|
|
returned by a function that does not return a const char *. */
|
|
|
|
|
static char *ada_completer_word_break_characters =
|
|
|
|
|
#ifdef VMS
|
|
|
|
|
" \t\n!@#%^&*()+=|~`}{[]\";:?/,-";
|
|
|
|
|
#else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
" \t\n!@#$%^&*()+=|~`}{[]\";:?/,-";
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#endif
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The name of the symbol to use to get the name of the main subprogram. */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static const char ADA_MAIN_PROGRAM_SYMBOL_NAME[]
|
2004-06-02 11:55:36 +02:00
|
|
|
|
= "__gnat_ada_main_program_name";
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Limit on the number of warnings to raise per expression evaluation. */
|
|
|
|
|
static int warning_limit = 2;
|
|
|
|
|
|
|
|
|
|
/* Number of warning messages issued; reset to 0 by cleanups after
|
|
|
|
|
expression evaluation. */
|
|
|
|
|
static int warnings_issued = 0;
|
|
|
|
|
|
|
|
|
|
static const char *known_runtime_file_name_patterns[] = {
|
|
|
|
|
ADA_KNOWN_RUNTIME_FILE_NAME_PATTERNS NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const char *known_auxiliary_function_name_patterns[] = {
|
|
|
|
|
ADA_KNOWN_AUXILIARY_FUNCTION_NAME_PATTERNS NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Space for allocating results of ada_lookup_symbol_list. */
|
|
|
|
|
static struct obstack symbol_list_obstack;
|
|
|
|
|
|
2010-05-28 03:32:08 +02:00
|
|
|
|
/* Inferior-specific data. */
|
|
|
|
|
|
|
|
|
|
/* Per-inferior data for this module. */
|
|
|
|
|
|
|
|
|
|
struct ada_inferior_data
|
|
|
|
|
{
|
|
|
|
|
/* The ada__tags__type_specific_data type, which is used when decoding
|
|
|
|
|
tagged types. With older versions of GNAT, this type was directly
|
|
|
|
|
accessible through a component ("tsd") in the object tag. But this
|
|
|
|
|
is no longer the case, so we cache it for each inferior. */
|
|
|
|
|
struct type *tsd_type;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Our key to this module's inferior data. */
|
|
|
|
|
static const struct inferior_data *ada_inferior_data;
|
|
|
|
|
|
|
|
|
|
/* A cleanup routine for our inferior data. */
|
|
|
|
|
static void
|
|
|
|
|
ada_inferior_data_cleanup (struct inferior *inf, void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct ada_inferior_data *data;
|
|
|
|
|
|
|
|
|
|
data = inferior_data (inf, ada_inferior_data);
|
|
|
|
|
if (data != NULL)
|
|
|
|
|
xfree (data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return our inferior data for the given inferior (INF).
|
|
|
|
|
|
|
|
|
|
This function always returns a valid pointer to an allocated
|
|
|
|
|
ada_inferior_data structure. If INF's inferior data has not
|
|
|
|
|
been previously set, this functions creates a new one with all
|
|
|
|
|
fields set to zero, sets INF's inferior to it, and then returns
|
|
|
|
|
a pointer to that newly allocated ada_inferior_data. */
|
|
|
|
|
|
|
|
|
|
static struct ada_inferior_data *
|
|
|
|
|
get_ada_inferior_data (struct inferior *inf)
|
|
|
|
|
{
|
|
|
|
|
struct ada_inferior_data *data;
|
|
|
|
|
|
|
|
|
|
data = inferior_data (inf, ada_inferior_data);
|
|
|
|
|
if (data == NULL)
|
|
|
|
|
{
|
|
|
|
|
data = XZALLOC (struct ada_inferior_data);
|
|
|
|
|
set_inferior_data (inf, ada_inferior_data, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Perform all necessary cleanups regarding our module's inferior data
|
|
|
|
|
that is required after the inferior INF just exited. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_inferior_exit (struct inferior *inf)
|
|
|
|
|
{
|
|
|
|
|
ada_inferior_data_cleanup (inf, NULL);
|
|
|
|
|
set_inferior_data (inf, ada_inferior_data, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Utilities */
|
|
|
|
|
|
2008-02-05 23:17:41 +01:00
|
|
|
|
/* Given DECODED_NAME a string holding a symbol name in its
|
|
|
|
|
decoded form (ie using the Ada dotted notation), returns
|
|
|
|
|
its unqualified name. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
ada_unqualified_name (const char *decoded_name)
|
|
|
|
|
{
|
|
|
|
|
const char *result = strrchr (decoded_name, '.');
|
|
|
|
|
|
|
|
|
|
if (result != NULL)
|
|
|
|
|
result++; /* Skip the dot... */
|
|
|
|
|
else
|
|
|
|
|
result = decoded_name;
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a string starting with '<', followed by STR, and '>'.
|
|
|
|
|
The result is good until the next call. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
add_angle_brackets (const char *str)
|
|
|
|
|
{
|
|
|
|
|
static char *result = NULL;
|
|
|
|
|
|
|
|
|
|
xfree (result);
|
2009-04-14 21:04:24 +02:00
|
|
|
|
result = xstrprintf ("<%s>", str);
|
2008-02-05 23:17:41 +01:00
|
|
|
|
return result;
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *
|
|
|
|
|
ada_get_gdb_completer_word_break_characters (void)
|
|
|
|
|
{
|
|
|
|
|
return ada_completer_word_break_characters;
|
|
|
|
|
}
|
|
|
|
|
|
2005-10-03 23:21:20 +02:00
|
|
|
|
/* Print an array element index using the Ada syntax. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_print_array_index (struct value *index_value, struct ui_file *stream,
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
const struct value_print_options *options)
|
2005-10-03 23:21:20 +02:00
|
|
|
|
{
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
LA_VALUE_PRINT (index_value, stream, options);
|
2005-10-03 23:21:20 +02:00
|
|
|
|
fprintf_filtered (stream, " => ");
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-23 21:13:26 +02:00
|
|
|
|
/* Assuming VECT points to an array of *SIZE objects of size
|
2002-06-04 17:28:49 +02:00
|
|
|
|
ELEMENT_SIZE, grow it to contain at least MIN_SIZE objects,
|
2004-10-23 21:13:26 +02:00
|
|
|
|
updating *SIZE as necessary and returning the (new) array. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-10-23 21:13:26 +02:00
|
|
|
|
void *
|
|
|
|
|
grow_vect (void *vect, size_t *size, size_t min_size, int element_size)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (*size < min_size)
|
|
|
|
|
{
|
|
|
|
|
*size *= 2;
|
|
|
|
|
if (*size < min_size)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*size = min_size;
|
2004-10-23 21:13:26 +02:00
|
|
|
|
vect = xrealloc (vect, *size * element_size);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2004-10-23 21:13:26 +02:00
|
|
|
|
return vect;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* True (non-zero) iff TARGET matches FIELD_NAME up to any trailing
|
2004-06-02 11:55:36 +02:00
|
|
|
|
suffix of FIELD_NAME beginning "___". */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
field_name_match (const char *field_name, const char *target)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int len = strlen (target);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(strncmp (field_name, target, len) == 0
|
|
|
|
|
&& (field_name[len] == '\0'
|
|
|
|
|
|| (strncmp (field_name + len, "___", 3) == 0
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& strcmp (field_name + strlen (field_name) - 6,
|
|
|
|
|
"___XVN") != 0)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-03-24 02:51:48 +01:00
|
|
|
|
/* Assuming TYPE is a TYPE_CODE_STRUCT or a TYPE_CODE_TYPDEF to
|
|
|
|
|
a TYPE_CODE_STRUCT, find the field whose name matches FIELD_NAME,
|
|
|
|
|
and return its index. This function also handles fields whose name
|
|
|
|
|
have ___ suffixes because the compiler sometimes alters their name
|
|
|
|
|
by adding such a suffix to represent fields with certain constraints.
|
|
|
|
|
If the field could not be found, return a negative number if
|
|
|
|
|
MAYBE_MISSING is set. Otherwise raise an error. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ada_get_field_index (const struct type *type, const char *field_name,
|
|
|
|
|
int maybe_missing)
|
|
|
|
|
{
|
|
|
|
|
int fieldno;
|
2009-03-24 02:51:48 +01:00
|
|
|
|
struct type *struct_type = check_typedef ((struct type *) type);
|
|
|
|
|
|
|
|
|
|
for (fieldno = 0; fieldno < TYPE_NFIELDS (struct_type); fieldno++)
|
|
|
|
|
if (field_name_match (TYPE_FIELD_NAME (struct_type, fieldno), field_name))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return fieldno;
|
|
|
|
|
|
|
|
|
|
if (!maybe_missing)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Unable to find field %s in struct %s. Aborting"),
|
2009-03-24 02:51:48 +01:00
|
|
|
|
field_name, TYPE_NAME (struct_type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The length of the prefix of NAME prior to any "___" suffix. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_name_prefix_len (const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *p = strstr (name, "___");
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (p == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return strlen (name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return p - name;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Return non-zero if SUFFIX is a suffix of STR.
|
|
|
|
|
Return zero if STR is null. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
is_suffix (const char *str, const char *suffix)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int len1, len2;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (str == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
len1 = strlen (str);
|
|
|
|
|
len2 = strlen (suffix);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return (len1 >= len2 && strcmp (str + len1 - len2, suffix) == 0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The contents of value VAL, treated as a value of type TYPE. The
|
|
|
|
|
result is an lval in memory if VAL is. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
coerce_unspec_val_to_type (struct value *val, struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (value_type (val) == type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return val;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *result;
|
|
|
|
|
|
|
|
|
|
/* Make sure that the object size is not unreasonable before
|
|
|
|
|
trying to allocate some memory for it. */
|
2004-10-15 11:12:24 +02:00
|
|
|
|
check_size (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
result = allocate_value (type);
|
2009-01-13 11:34:31 +01:00
|
|
|
|
set_value_component_location (result, val);
|
2005-02-08 05:57:03 +01:00
|
|
|
|
set_value_bitsize (result, value_bitsize (val));
|
|
|
|
|
set_value_bitpos (result, value_bitpos (val));
|
2009-05-28 02:53:52 +02:00
|
|
|
|
set_value_address (result, value_address (val));
|
2005-02-02 23:34:36 +01:00
|
|
|
|
if (value_lazy (val)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
|| TYPE_LENGTH (type) > TYPE_LENGTH (value_type (val)))
|
2005-02-07 16:04:43 +01:00
|
|
|
|
set_value_lazy (result, 1);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
memcpy (value_contents_raw (result), value_contents (val),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
static const gdb_byte *
|
|
|
|
|
cond_offset_host (const gdb_byte *valaddr, long offset)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (valaddr == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
return valaddr + offset;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2002-07-25 03:14:26 +02:00
|
|
|
|
cond_offset_target (CORE_ADDR address, long offset)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (address == 0)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return address + offset;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Issue a warning (as for the definition of warning in utils.c, but
|
|
|
|
|
with exactly one argument rather than ...), unless the limit on the
|
|
|
|
|
number of warnings has passed during the evaluation of the current
|
|
|
|
|
expression. */
|
2004-10-10 18:03:23 +02:00
|
|
|
|
|
2004-10-11 07:26:25 +02:00
|
|
|
|
/* FIXME: cagney/2004-10-10: This function is mimicking the behavior
|
|
|
|
|
provided by "complaint". */
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 23:14:59 +02:00
|
|
|
|
static void lim_warning (const char *format, ...) ATTRIBUTE_PRINTF (1, 2);
|
2004-10-11 07:26:25 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static void
|
2004-10-10 18:03:23 +02:00
|
|
|
|
lim_warning (const char *format, ...)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-10 18:03:23 +02:00
|
|
|
|
va_list args;
|
|
|
|
|
|
2010-05-18 21:23:37 +02:00
|
|
|
|
va_start (args, format);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
warnings_issued += 1;
|
|
|
|
|
if (warnings_issued <= warning_limit)
|
2004-10-10 18:03:23 +02:00
|
|
|
|
vwarning (format, args);
|
|
|
|
|
|
|
|
|
|
va_end (args);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-10-15 11:12:24 +02:00
|
|
|
|
/* Issue an error if the size of an object of type T is unreasonable,
|
|
|
|
|
i.e. if it would be a bad idea to allocate a value of this type in
|
|
|
|
|
GDB. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
check_size (const struct type *type)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_LENGTH (type) > varsize_limit)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("object size is larger than varsize-limit"));
|
2004-10-15 11:12:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-09 21:29:56 +02:00
|
|
|
|
/* Maximum value of a SIZE-byte signed integer type. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static LONGEST
|
2004-07-09 21:29:56 +02:00
|
|
|
|
max_of_size (int size)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
LONGEST top_bit = (LONGEST) 1 << (size * 8 - 2);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return top_bit | (top_bit - 1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-09 21:29:56 +02:00
|
|
|
|
/* Minimum value of a SIZE-byte signed integer type. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static LONGEST
|
2004-07-09 21:29:56 +02:00
|
|
|
|
min_of_size (int size)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-07-09 21:29:56 +02:00
|
|
|
|
return -max_of_size (size) - 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-09 21:29:56 +02:00
|
|
|
|
/* Maximum value of a SIZE-byte unsigned integer type. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static ULONGEST
|
2004-07-09 21:29:56 +02:00
|
|
|
|
umax_of_size (int size)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ULONGEST top_bit = (ULONGEST) 1 << (size * 8 - 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return top_bit | (top_bit - 1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-09 21:29:56 +02:00
|
|
|
|
/* Maximum value of integral type T, as a signed quantity. */
|
|
|
|
|
static LONGEST
|
|
|
|
|
max_of_type (struct type *t)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-07-09 21:29:56 +02:00
|
|
|
|
if (TYPE_UNSIGNED (t))
|
|
|
|
|
return (LONGEST) umax_of_size (TYPE_LENGTH (t));
|
|
|
|
|
else
|
|
|
|
|
return max_of_size (TYPE_LENGTH (t));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Minimum value of integral type T, as a signed quantity. */
|
|
|
|
|
static LONGEST
|
|
|
|
|
min_of_type (struct type *t)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_UNSIGNED (t))
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
return min_of_size (TYPE_LENGTH (t));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The largest value in the domain of TYPE, a discrete type, as an integer. */
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
LONGEST
|
|
|
|
|
ada_discrete_type_high_bound (struct type *type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_RANGE:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return TYPE_HIGH_BOUND (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case TYPE_CODE_ENUM:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return TYPE_FIELD_BITPOS (type, TYPE_NFIELDS (type) - 1);
|
|
|
|
|
case TYPE_CODE_BOOL:
|
|
|
|
|
return 1;
|
|
|
|
|
case TYPE_CODE_CHAR:
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case TYPE_CODE_INT:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return max_of_type (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
default:
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
error (_("Unexpected type in ada_discrete_type_high_bound."));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The largest value in the domain of TYPE, a discrete type, as an integer. */
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
LONGEST
|
|
|
|
|
ada_discrete_type_low_bound (struct type *type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_RANGE:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return TYPE_LOW_BOUND (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case TYPE_CODE_ENUM:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return TYPE_FIELD_BITPOS (type, 0);
|
|
|
|
|
case TYPE_CODE_BOOL:
|
|
|
|
|
return 0;
|
|
|
|
|
case TYPE_CODE_CHAR:
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case TYPE_CODE_INT:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return min_of_type (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
default:
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
error (_("Unexpected type in ada_discrete_type_low_bound."));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The identity on non-range types. For range types, the underlying
|
2004-06-27 21:06:23 +02:00
|
|
|
|
non-range scalar type. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
base_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
while (type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE)
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (type == TYPE_TARGET_TYPE (type) || TYPE_TARGET_TYPE (type) == NULL)
|
|
|
|
|
return type;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
}
|
|
|
|
|
return type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Language Selection */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* If the main program is in Ada, return language_ada, otherwise return LANG
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
(the main program is in Ada iif the adainit symbol is found). */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
enum language
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
ada_update_initial_language (enum language lang)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (lookup_minimal_symbol ("adainit", (const char *) NULL,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(struct objfile *) NULL) != NULL)
|
|
|
|
|
return language_ada;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return lang;
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
|
|
|
|
/* If the main procedure is written in Ada, then return its name.
|
|
|
|
|
The result is good until the next call. Return NULL if the main
|
|
|
|
|
procedure doesn't appear to be in Ada. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
ada_main_name (void)
|
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *msym;
|
2009-04-16 19:16:18 +02:00
|
|
|
|
static char *main_program_name = NULL;
|
2004-09-18 12:11:06 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* For Ada, the name of the main procedure is stored in a specific
|
|
|
|
|
string constant, generated by the binder. Look for that symbol,
|
|
|
|
|
extract its address, and then read that string. If we didn't find
|
|
|
|
|
that string, then most probably the main procedure is not written
|
|
|
|
|
in Ada. */
|
|
|
|
|
msym = lookup_minimal_symbol (ADA_MAIN_PROGRAM_SYMBOL_NAME, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
if (msym != NULL)
|
|
|
|
|
{
|
2009-04-16 19:16:18 +02:00
|
|
|
|
CORE_ADDR main_program_name_addr;
|
|
|
|
|
int err_code;
|
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
main_program_name_addr = SYMBOL_VALUE_ADDRESS (msym);
|
|
|
|
|
if (main_program_name_addr == 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Invalid address for Ada main program name."));
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2009-04-16 19:16:18 +02:00
|
|
|
|
xfree (main_program_name);
|
|
|
|
|
target_read_string (main_program_name_addr, &main_program_name,
|
|
|
|
|
1024, &err_code);
|
|
|
|
|
|
|
|
|
|
if (err_code != 0)
|
|
|
|
|
return NULL;
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return main_program_name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The main procedure doesn't seem to be in Ada. */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Symbols */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Table of Ada operators and their GNAT-encoded names. Last entry is pair
|
|
|
|
|
of NULLs. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const struct ada_opname_map ada_opname_table[] = {
|
|
|
|
|
{"Oadd", "\"+\"", BINOP_ADD},
|
|
|
|
|
{"Osubtract", "\"-\"", BINOP_SUB},
|
|
|
|
|
{"Omultiply", "\"*\"", BINOP_MUL},
|
|
|
|
|
{"Odivide", "\"/\"", BINOP_DIV},
|
|
|
|
|
{"Omod", "\"mod\"", BINOP_MOD},
|
|
|
|
|
{"Orem", "\"rem\"", BINOP_REM},
|
|
|
|
|
{"Oexpon", "\"**\"", BINOP_EXP},
|
|
|
|
|
{"Olt", "\"<\"", BINOP_LESS},
|
|
|
|
|
{"Ole", "\"<=\"", BINOP_LEQ},
|
|
|
|
|
{"Ogt", "\">\"", BINOP_GTR},
|
|
|
|
|
{"Oge", "\">=\"", BINOP_GEQ},
|
|
|
|
|
{"Oeq", "\"=\"", BINOP_EQUAL},
|
|
|
|
|
{"One", "\"/=\"", BINOP_NOTEQUAL},
|
|
|
|
|
{"Oand", "\"and\"", BINOP_BITWISE_AND},
|
|
|
|
|
{"Oor", "\"or\"", BINOP_BITWISE_IOR},
|
|
|
|
|
{"Oxor", "\"xor\"", BINOP_BITWISE_XOR},
|
|
|
|
|
{"Oconcat", "\"&\"", BINOP_CONCAT},
|
|
|
|
|
{"Oabs", "\"abs\"", UNOP_ABS},
|
|
|
|
|
{"Onot", "\"not\"", UNOP_LOGICAL_NOT},
|
|
|
|
|
{"Oadd", "\"+\"", UNOP_PLUS},
|
|
|
|
|
{"Osubtract", "\"-\"", UNOP_NEG},
|
|
|
|
|
{NULL, NULL}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
};
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The "encoded" form of DECODED, according to GNAT conventions.
|
|
|
|
|
The result is valid until the next call to ada_encode. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
char *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_encode (const char *decoded)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *encoding_buffer = NULL;
|
|
|
|
|
static size_t encoding_buffer_size = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *p;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int k;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (decoded == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
GROW_VECT (encoding_buffer, encoding_buffer_size,
|
|
|
|
|
2 * strlen (decoded) + 10);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
k = 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (p = decoded; *p != '\0'; p += 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-09-30 22:14:13 +02:00
|
|
|
|
if (*p == '.')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
encoding_buffer[k] = encoding_buffer[k + 1] = '_';
|
|
|
|
|
k += 2;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (*p == '"')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
const struct ada_opname_map *mapping;
|
|
|
|
|
|
|
|
|
|
for (mapping = ada_opname_table;
|
2004-06-27 21:28:20 +02:00
|
|
|
|
mapping->encoded != NULL
|
|
|
|
|
&& strncmp (mapping->decoded, p,
|
|
|
|
|
strlen (mapping->decoded)) != 0; mapping += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
;
|
|
|
|
|
if (mapping->encoded == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("invalid Ada operator name: %s"), p);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
strcpy (encoding_buffer + k, mapping->encoded);
|
|
|
|
|
k += strlen (mapping->encoded);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
encoding_buffer[k] = *p;
|
|
|
|
|
k += 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
encoding_buffer[k] = '\0';
|
|
|
|
|
return encoding_buffer;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return NAME folded to lower case, or, if surrounded by single
|
2004-06-02 11:55:36 +02:00
|
|
|
|
quotes, unfolded, but with the quotes stripped away. Result good
|
|
|
|
|
to next call. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *
|
|
|
|
|
ada_fold_name (const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static char *fold_buffer = NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static size_t fold_buffer_size = 0;
|
|
|
|
|
|
|
|
|
|
int len = strlen (name);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
GROW_VECT (fold_buffer, fold_buffer_size, len + 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (name[0] == '\'')
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
strncpy (fold_buffer, name + 1, len - 2);
|
|
|
|
|
fold_buffer[len - 2] = '\000';
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
for (i = 0; i <= len; i += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
fold_buffer[i] = tolower (name[i]);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return fold_buffer;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Return nonzero if C is either a digit or a lowercase alphabet character. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_lower_alphanum (const char c)
|
|
|
|
|
{
|
|
|
|
|
return (isdigit (c) || (isalpha (c) && islower (c)));
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Remove either of these suffixes:
|
|
|
|
|
. .{DIGIT}+
|
|
|
|
|
. ${DIGIT}+
|
|
|
|
|
. ___{DIGIT}+
|
|
|
|
|
. __{DIGIT}+.
|
|
|
|
|
These are suffixes introduced by the compiler for entities such as
|
|
|
|
|
nested subprogram for instance, in order to avoid name clashes.
|
|
|
|
|
They do not serve any purpose for the debugger. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_remove_trailing_digits (const char *encoded, int *len)
|
|
|
|
|
{
|
|
|
|
|
if (*len > 1 && isdigit (encoded[*len - 1]))
|
|
|
|
|
{
|
|
|
|
|
int i = *len - 2;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
while (i > 0 && isdigit (encoded[i]))
|
|
|
|
|
i--;
|
|
|
|
|
if (i >= 0 && encoded[i] == '.')
|
|
|
|
|
*len = i;
|
|
|
|
|
else if (i >= 0 && encoded[i] == '$')
|
|
|
|
|
*len = i;
|
|
|
|
|
else if (i >= 2 && strncmp (encoded + i - 2, "___", 3) == 0)
|
|
|
|
|
*len = i - 2;
|
|
|
|
|
else if (i >= 1 && strncmp (encoded + i - 1, "__", 2) == 0)
|
|
|
|
|
*len = i - 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove the suffix introduced by the compiler for protected object
|
|
|
|
|
subprograms. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_remove_po_subprogram_suffix (const char *encoded, int *len)
|
|
|
|
|
{
|
|
|
|
|
/* Remove trailing N. */
|
|
|
|
|
|
|
|
|
|
/* Protected entry subprograms are broken into two
|
|
|
|
|
separate subprograms: The first one is unprotected, and has
|
|
|
|
|
a 'N' suffix; the second is the protected version, and has
|
|
|
|
|
the 'P' suffix. The second calls the first one after handling
|
|
|
|
|
the protection. Since the P subprograms are internally generated,
|
|
|
|
|
we leave these names undecoded, giving the user a clue that this
|
|
|
|
|
entity is internal. */
|
|
|
|
|
|
|
|
|
|
if (*len > 1
|
|
|
|
|
&& encoded[*len - 1] == 'N'
|
|
|
|
|
&& (isdigit (encoded[*len - 2]) || islower (encoded[*len - 2])))
|
|
|
|
|
*len = *len - 1;
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-19 23:34:50 +01:00
|
|
|
|
/* Remove trailing X[bn]* suffixes (indicating names in package bodies). */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_remove_Xbn_suffix (const char *encoded, int *len)
|
|
|
|
|
{
|
|
|
|
|
int i = *len - 1;
|
|
|
|
|
|
|
|
|
|
while (i > 0 && (encoded[i] == 'b' || encoded[i] == 'n'))
|
|
|
|
|
i--;
|
|
|
|
|
|
|
|
|
|
if (encoded[i] != 'X')
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (isalnum (encoded[i-1]))
|
|
|
|
|
*len = i;
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* If ENCODED follows the GNAT entity encoding conventions, then return
|
|
|
|
|
the decoded form of ENCODED. Otherwise, return "<%s>" where "%s" is
|
|
|
|
|
replaced by ENCODED.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
The resulting string is valid until the next call of ada_decode.
|
2008-01-01 13:39:49 +01:00
|
|
|
|
If the string is unchanged by decoding, the original string pointer
|
2004-06-02 11:55:36 +02:00
|
|
|
|
is returned. */
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
ada_decode (const char *encoded)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
int len0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *p;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
char *decoded;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int at_start_name;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *decoding_buffer = NULL;
|
|
|
|
|
static size_t decoding_buffer_size = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* The name of the Ada main procedure starts with "_ada_".
|
|
|
|
|
This prefix is not part of the decoded name, so skip this part
|
|
|
|
|
if we see this prefix. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (strncmp (encoded, "_ada_", 5) == 0)
|
|
|
|
|
encoded += 5;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* If the name starts with '_', then it is not a properly encoded
|
|
|
|
|
name, so do not attempt to decode it. Similarly, if the name
|
|
|
|
|
starts with '<', the name should not be decoded. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (encoded[0] == '_' || encoded[0] == '<')
|
2002-06-04 17:28:49 +02:00
|
|
|
|
goto Suppress;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
len0 = strlen (encoded);
|
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
ada_remove_trailing_digits (encoded, &len0);
|
|
|
|
|
ada_remove_po_subprogram_suffix (encoded, &len0);
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Remove the ___X.* suffix if present. Do not forget to verify that
|
|
|
|
|
the suffix is located before the current "end" of ENCODED. We want
|
|
|
|
|
to avoid re-matching parts of ENCODED that have previously been
|
|
|
|
|
marked as discarded (by decrementing LEN0). */
|
|
|
|
|
p = strstr (encoded, "___");
|
|
|
|
|
if (p != NULL && p - encoded < len0 - 3)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (p[3] == 'X')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
len0 = p - encoded;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto Suppress;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Remove any trailing TKB suffix. It tells us that this symbol
|
|
|
|
|
is for the body of a task, but that information does not actually
|
|
|
|
|
appear in the decoded name. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len0 > 3 && strncmp (encoded + len0 - 3, "TKB", 3) == 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
len0 -= 3;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2009-11-19 23:36:05 +01:00
|
|
|
|
/* Remove any trailing TB suffix. The TB suffix is slightly different
|
|
|
|
|
from the TKB suffix because it is used for non-anonymous task
|
|
|
|
|
bodies. */
|
|
|
|
|
|
|
|
|
|
if (len0 > 2 && strncmp (encoded + len0 - 2, "TB", 2) == 0)
|
|
|
|
|
len0 -= 2;
|
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Remove trailing "B" suffixes. */
|
|
|
|
|
/* FIXME: brobecker/2006-04-19: Not sure what this are used for... */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len0 > 1 && strncmp (encoded + len0 - 1, "B", 1) == 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
len0 -= 1;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Make decoded big enough for possible expansion by operator name. */
|
2008-01-01 13:39:49 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
GROW_VECT (decoding_buffer, decoding_buffer_size, 2 * len0 + 1);
|
|
|
|
|
decoded = decoding_buffer;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Remove trailing __{digit}+ or trailing ${digit}+. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len0 > 1 && isdigit (encoded[len0 - 1]))
|
2002-08-18 20:11:12 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
i = len0 - 2;
|
|
|
|
|
while ((i >= 0 && isdigit (encoded[i]))
|
|
|
|
|
|| (i >= 1 && encoded[i] == '_' && isdigit (encoded[i - 1])))
|
|
|
|
|
i -= 1;
|
|
|
|
|
if (i > 1 && encoded[i] == '_' && encoded[i - 1] == '_')
|
|
|
|
|
len0 = i - 1;
|
|
|
|
|
else if (encoded[i] == '$')
|
|
|
|
|
len0 = i;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* The first few characters that are not alphabetic are not part
|
|
|
|
|
of any encoding we use, so we can copy them over verbatim. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (i = 0, j = 0; i < len0 && !isalpha (encoded[i]); i += 1, j += 1)
|
|
|
|
|
decoded[j] = encoded[i];
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
at_start_name = 1;
|
|
|
|
|
while (i < len0)
|
|
|
|
|
{
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Is this a symbol function? */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (at_start_name && encoded[i] == 'O')
|
|
|
|
|
{
|
|
|
|
|
int k;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (k = 0; ada_opname_table[k].encoded != NULL; k += 1)
|
|
|
|
|
{
|
|
|
|
|
int op_len = strlen (ada_opname_table[k].encoded);
|
2004-06-28 20:59:14 +02:00
|
|
|
|
if ((strncmp (ada_opname_table[k].encoded + 1, encoded + i + 1,
|
|
|
|
|
op_len - 1) == 0)
|
|
|
|
|
&& !isalnum (encoded[i + op_len]))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
strcpy (decoded + j, ada_opname_table[k].decoded);
|
|
|
|
|
at_start_name = 0;
|
|
|
|
|
i += op_len;
|
|
|
|
|
j += strlen (ada_opname_table[k].decoded);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (ada_opname_table[k].encoded != NULL)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
at_start_name = 0;
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Replace "TK__" with "__", which will eventually be translated
|
|
|
|
|
into "." (just below). */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (i < len0 - 4 && strncmp (encoded + i, "TK__", 4) == 0)
|
|
|
|
|
i += 2;
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Replace "__B_{DIGITS}+__" sequences by "__", which will eventually
|
|
|
|
|
be translated into "." (just below). These are internal names
|
|
|
|
|
generated for anonymous blocks inside which our symbol is nested. */
|
|
|
|
|
|
|
|
|
|
if (len0 - i > 5 && encoded [i] == '_' && encoded [i+1] == '_'
|
|
|
|
|
&& encoded [i+2] == 'B' && encoded [i+3] == '_'
|
|
|
|
|
&& isdigit (encoded [i+4]))
|
|
|
|
|
{
|
|
|
|
|
int k = i + 5;
|
|
|
|
|
|
|
|
|
|
while (k < len0 && isdigit (encoded[k]))
|
|
|
|
|
k++; /* Skip any extra digit. */
|
|
|
|
|
|
|
|
|
|
/* Double-check that the "__B_{DIGITS}+" sequence we found
|
|
|
|
|
is indeed followed by "__". */
|
|
|
|
|
if (len0 - k > 2 && encoded [k] == '_' && encoded [k+1] == '_')
|
|
|
|
|
i = k;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Remove _E{DIGITS}+[sb] */
|
|
|
|
|
|
|
|
|
|
/* Just as for protected object subprograms, there are 2 categories
|
|
|
|
|
of subprograms created by the compiler for each entry. The first
|
|
|
|
|
one implements the actual entry code, and has a suffix following
|
|
|
|
|
the convention above; the second one implements the barrier and
|
|
|
|
|
uses the same convention as above, except that the 'E' is replaced
|
|
|
|
|
by a 'B'.
|
|
|
|
|
|
|
|
|
|
Just as above, we do not decode the name of barrier functions
|
|
|
|
|
to give the user a clue that the code he is debugging has been
|
|
|
|
|
internally generated. */
|
|
|
|
|
|
|
|
|
|
if (len0 - i > 3 && encoded [i] == '_' && encoded[i+1] == 'E'
|
|
|
|
|
&& isdigit (encoded[i+2]))
|
|
|
|
|
{
|
|
|
|
|
int k = i + 3;
|
|
|
|
|
|
|
|
|
|
while (k < len0 && isdigit (encoded[k]))
|
|
|
|
|
k++;
|
|
|
|
|
|
|
|
|
|
if (k < len0
|
|
|
|
|
&& (encoded[k] == 'b' || encoded[k] == 's'))
|
|
|
|
|
{
|
|
|
|
|
k++;
|
|
|
|
|
/* Just as an extra precaution, make sure that if this
|
|
|
|
|
suffix is followed by anything else, it is a '_'.
|
|
|
|
|
Otherwise, we matched this sequence by accident. */
|
|
|
|
|
if (k == len0
|
|
|
|
|
|| (k < len0 && encoded[k] == '_'))
|
|
|
|
|
i = k;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove trailing "N" in [a-z0-9]+N__. The N is added by
|
|
|
|
|
the GNAT front-end in protected object subprograms. */
|
|
|
|
|
|
|
|
|
|
if (i < len0 + 3
|
|
|
|
|
&& encoded[i] == 'N' && encoded[i+1] == '_' && encoded[i+2] == '_')
|
|
|
|
|
{
|
|
|
|
|
/* Backtrack a bit up until we reach either the begining of
|
|
|
|
|
the encoded name, or "__". Make sure that we only find
|
|
|
|
|
digits or lowercase characters. */
|
|
|
|
|
const char *ptr = encoded + i - 1;
|
|
|
|
|
|
|
|
|
|
while (ptr >= encoded && is_lower_alphanum (ptr[0]))
|
|
|
|
|
ptr--;
|
|
|
|
|
if (ptr < encoded
|
|
|
|
|
|| (ptr > encoded && ptr[0] == '_' && ptr[-1] == '_'))
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (encoded[i] == 'X' && i != 0 && isalnum (encoded[i - 1]))
|
|
|
|
|
{
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* This is a X[bn]* sequence not separated from the previous
|
|
|
|
|
part of the name with a non-alpha-numeric character (in other
|
|
|
|
|
words, immediately following an alpha-numeric character), then
|
|
|
|
|
verify that it is placed at the end of the encoded name. If
|
|
|
|
|
not, then the encoding is not valid and we should abort the
|
|
|
|
|
decoding. Otherwise, just skip it, it is used in body-nested
|
|
|
|
|
package names. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
do
|
|
|
|
|
i += 1;
|
|
|
|
|
while (i < len0 && (encoded[i] == 'b' || encoded[i] == 'n'));
|
|
|
|
|
if (i < len0)
|
|
|
|
|
goto Suppress;
|
|
|
|
|
}
|
2008-09-30 22:14:13 +02:00
|
|
|
|
else if (i < len0 - 2 && encoded[i] == '_' && encoded[i + 1] == '_')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Replace '__' by '.'. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
decoded[j] = '.';
|
|
|
|
|
at_start_name = 1;
|
|
|
|
|
i += 2;
|
|
|
|
|
j += 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* It's a character part of the decoded name, so just copy it
|
|
|
|
|
over. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
decoded[j] = encoded[i];
|
|
|
|
|
i += 1;
|
|
|
|
|
j += 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
decoded[j] = '\000';
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-01 13:39:49 +01:00
|
|
|
|
/* Decoded names should never contain any uppercase character.
|
|
|
|
|
Double-check this, and abort the decoding if we find one. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (i = 0; decoded[i] != '\0'; i += 1)
|
|
|
|
|
if (isupper (decoded[i]) || decoded[i] == ' ')
|
2002-06-04 17:28:49 +02:00
|
|
|
|
goto Suppress;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (strcmp (decoded, encoded) == 0)
|
|
|
|
|
return encoded;
|
|
|
|
|
else
|
|
|
|
|
return decoded;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
Suppress:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
GROW_VECT (decoding_buffer, decoding_buffer_size, strlen (encoded) + 3);
|
|
|
|
|
decoded = decoding_buffer;
|
|
|
|
|
if (encoded[0] == '<')
|
|
|
|
|
strcpy (decoded, encoded);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (decoded, decoding_buffer_size, "<%s>", encoded);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return decoded;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Table for keeping permanent unique copies of decoded names. Once
|
|
|
|
|
allocated, names in this table are never released. While this is a
|
|
|
|
|
storage leak, it should not be significant unless there are massive
|
|
|
|
|
changes in the set of decoded names in successive versions of a
|
|
|
|
|
symbol table loaded during a single session. */
|
|
|
|
|
static struct htab *decoded_names_store;
|
|
|
|
|
|
|
|
|
|
/* Returns the decoded name of GSYMBOL, as for ada_decode, caching it
|
|
|
|
|
in the language-specific part of GSYMBOL, if it has not been
|
|
|
|
|
previously computed. Tries to save the decoded name in the same
|
|
|
|
|
obstack as GSYMBOL, if possible, and otherwise on the heap (so that,
|
|
|
|
|
in any case, the decoded symbol has a lifetime at least that of
|
|
|
|
|
GSYMBOL).
|
|
|
|
|
The GSYMBOL parameter is "mutable" in the C++ sense: logically
|
|
|
|
|
const, but nevertheless modified to a semantically equivalent form
|
|
|
|
|
when a decoded name is cached in it.
|
2004-06-27 21:06:23 +02:00
|
|
|
|
*/
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
char *
|
|
|
|
|
ada_decode_symbol (const struct general_symbol_info *gsymbol)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
char **resultp =
|
2010-07-16 20:39:10 +02:00
|
|
|
|
(char **) &gsymbol->language_specific.mangled_lang.demangled_name;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (*resultp == NULL)
|
|
|
|
|
{
|
|
|
|
|
const char *decoded = ada_decode (gsymbol->name);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
if (gsymbol->obj_section != NULL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
struct objfile *objf = gsymbol->obj_section->objfile;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
*resultp = obsavestring (decoded, strlen (decoded),
|
|
|
|
|
&objf->objfile_obstack);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Sometimes, we can't find a corresponding objfile, in which
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case, we put the result on the heap. Since we only decode
|
|
|
|
|
when needed, we hope this usually does not cause a
|
|
|
|
|
significant memory leak (FIXME). */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (*resultp == NULL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
char **slot = (char **) htab_find_slot (decoded_names_store,
|
|
|
|
|
decoded, INSERT);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (*slot == NULL)
|
|
|
|
|
*slot = xstrdup (decoded);
|
|
|
|
|
*resultp = *slot;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return *resultp;
|
|
|
|
|
}
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
|
static char *
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_la_decode (const char *encoded, int options)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
return xstrdup (ada_decode (encoded));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns non-zero iff SYM_NAME matches NAME, ignoring any trailing
|
2004-06-02 11:55:36 +02:00
|
|
|
|
suffixes that encode debugging information or leading _ada_ on
|
|
|
|
|
SYM_NAME (see is_name_suffix commentary for the debugging
|
|
|
|
|
information that is ignored). If WILD, then NAME need only match a
|
|
|
|
|
suffix of SYM_NAME minus the same suffixes. Also returns 0 if
|
|
|
|
|
either argument is NULL. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_match_name (const char *sym_name, const char *name, int wild)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (sym_name == NULL || name == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
else if (wild)
|
2010-10-04 08:34:40 +02:00
|
|
|
|
return wild_match (sym_name, name) == 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int len_name = strlen (name);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return (strncmp (sym_name, name, len_name) == 0
|
|
|
|
|
&& is_name_suffix (sym_name + len_name))
|
|
|
|
|
|| (strncmp (sym_name, "_ada_", 5) == 0
|
|
|
|
|
&& strncmp (sym_name + 5, name, len_name) == 0
|
|
|
|
|
&& is_name_suffix (sym_name + len_name + 5));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Arrays */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-05-17 18:55:31 +02:00
|
|
|
|
/* Assuming that INDEX_DESC_TYPE is an ___XA structure, a structure
|
|
|
|
|
generated by the GNAT compiler to describe the index type used
|
|
|
|
|
for each dimension of an array, check whether it follows the latest
|
|
|
|
|
known encoding. If not, fix it up to conform to the latest encoding.
|
|
|
|
|
Otherwise, do nothing. This function also does nothing if
|
|
|
|
|
INDEX_DESC_TYPE is NULL.
|
|
|
|
|
|
|
|
|
|
The GNAT encoding used to describle the array index type evolved a bit.
|
|
|
|
|
Initially, the information would be provided through the name of each
|
|
|
|
|
field of the structure type only, while the type of these fields was
|
|
|
|
|
described as unspecified and irrelevant. The debugger was then expected
|
|
|
|
|
to perform a global type lookup using the name of that field in order
|
|
|
|
|
to get access to the full index type description. Because these global
|
|
|
|
|
lookups can be very expensive, the encoding was later enhanced to make
|
|
|
|
|
the global lookup unnecessary by defining the field type as being
|
|
|
|
|
the full index type description.
|
|
|
|
|
|
|
|
|
|
The purpose of this routine is to allow us to support older versions
|
|
|
|
|
of the compiler by detecting the use of the older encoding, and by
|
|
|
|
|
fixing up the INDEX_DESC_TYPE to follow the new one (at this point,
|
|
|
|
|
we essentially replace each field's meaningless type by the associated
|
|
|
|
|
index subtype). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ada_fixup_array_indexes_type (struct type *index_desc_type)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (index_desc_type == NULL)
|
|
|
|
|
return;
|
|
|
|
|
gdb_assert (TYPE_NFIELDS (index_desc_type) > 0);
|
|
|
|
|
|
|
|
|
|
/* Check if INDEX_DESC_TYPE follows the older encoding (it is sufficient
|
|
|
|
|
to check one field only, no need to check them all). If not, return
|
|
|
|
|
now.
|
|
|
|
|
|
|
|
|
|
If our INDEX_DESC_TYPE was generated using the older encoding,
|
|
|
|
|
the field type should be a meaningless integer type whose name
|
|
|
|
|
is not equal to the field name. */
|
|
|
|
|
if (TYPE_NAME (TYPE_FIELD_TYPE (index_desc_type, 0)) != NULL
|
|
|
|
|
&& strcmp (TYPE_NAME (TYPE_FIELD_TYPE (index_desc_type, 0)),
|
|
|
|
|
TYPE_FIELD_NAME (index_desc_type, 0)) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Fixup each field of INDEX_DESC_TYPE. */
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (index_desc_type); i++)
|
|
|
|
|
{
|
|
|
|
|
char *name = TYPE_FIELD_NAME (index_desc_type, i);
|
|
|
|
|
struct type *raw_type = ada_check_typedef (ada_find_any_type (name));
|
|
|
|
|
|
|
|
|
|
if (raw_type)
|
|
|
|
|
TYPE_FIELD_TYPE (index_desc_type, i) = raw_type;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Names of MAX_ADA_DIMENS bounds in P_BOUNDS fields of array descriptors. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static char *bound_name[] = {
|
|
|
|
|
"LB0", "UB0", "LB1", "UB1", "LB2", "UB2", "LB3", "UB3",
|
2002-06-04 17:28:49 +02:00
|
|
|
|
"LB4", "UB4", "LB5", "UB5", "LB6", "UB6", "LB7", "UB7"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Maximum number of array dimensions we are prepared to handle. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#define MAX_ADA_DIMENS (sizeof(bound_name) / (2*sizeof(char *)))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Like modify_field, but allows bitpos > wordlength. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static void
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_general_field (struct type *type, char *addr,
|
|
|
|
|
LONGEST fieldval, int bitpos, int bitsize)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_field (type, addr + bitpos / 8, fieldval, bitpos % 8, bitsize);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The desc_* routines return primitive portions of array descriptors
|
|
|
|
|
(fat pointers). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* The descriptor or array type, if any, indicated by TYPE; removes
|
2004-06-02 11:55:36 +02:00
|
|
|
|
level of indirection, if needed. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
desc_base_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return NULL;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (type != NULL
|
|
|
|
|
&& (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_REF))
|
2004-10-08 11:40:12 +02:00
|
|
|
|
return ada_check_typedef (TYPE_TARGET_TYPE (type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE indicates a "thin" array pointer type. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
is_thin_pntr (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2002-06-04 17:28:49 +02:00
|
|
|
|
is_suffix (ada_type_name (desc_base_type (type)), "___XUT")
|
|
|
|
|
|| is_suffix (ada_type_name (desc_base_type (type)), "___XUT___XVE");
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The descriptor type for thin pointer type TYPE. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
thin_descriptor_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *base_type = desc_base_type (type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (base_type == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
if (is_suffix (ada_type_name (base_type), "___XVE"))
|
|
|
|
|
return base_type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *alt_type = ada_find_parallel_type (base_type, "___XVE");
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (alt_type == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return base_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return alt_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* A pointer to the array data for thin-pointer value VAL. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
thin_data_pntr (struct value *val)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = value_type (val);
|
2009-05-18 15:55:49 +02:00
|
|
|
|
struct type *data_type = desc_data_target_type (thin_descriptor_type (type));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2009-05-18 15:55:49 +02:00
|
|
|
|
data_type = lookup_pointer_type (data_type);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
2009-05-18 15:55:49 +02:00
|
|
|
|
return value_cast (data_type, value_copy (val));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2009-05-28 02:53:52 +02:00
|
|
|
|
return value_from_longest (data_type, value_address (val));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE indicates a "thick" array pointer type. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
is_thick_pntr (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
return (type != NULL && TYPE_CODE (type) == TYPE_CODE_STRUCT
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& lookup_struct_elt_type (type, "P_BOUNDS", 1) != NULL);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* If TYPE is the type of an array descriptor (fat or thin pointer) or a
|
|
|
|
|
pointer to one, the type of its bounds data; otherwise, NULL. */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
desc_bounds_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *r;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
else if (is_thin_pntr (type))
|
|
|
|
|
{
|
|
|
|
|
type = thin_descriptor_type (type);
|
|
|
|
|
if (type == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
r = lookup_struct_elt_type (type, "BOUNDS", 1);
|
|
|
|
|
if (r != NULL)
|
2004-10-08 11:40:12 +02:00
|
|
|
|
return ada_check_typedef (r);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
|
|
|
|
{
|
|
|
|
|
r = lookup_struct_elt_type (type, "P_BOUNDS", 1);
|
|
|
|
|
if (r != NULL)
|
2004-10-08 11:40:12 +02:00
|
|
|
|
return ada_check_typedef (TYPE_TARGET_TYPE (ada_check_typedef (r)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If ARR is an array descriptor (fat or thin pointer), or pointer to
|
2004-06-02 11:55:36 +02:00
|
|
|
|
one, a pointer to its bounds data. Otherwise NULL. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
desc_bounds (struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = ada_check_typedef (value_type (arr));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (is_thin_pntr (type))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *bounds_type =
|
2004-06-02 11:55:36 +02:00
|
|
|
|
desc_bounds_type (thin_descriptor_type (type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
LONGEST addr;
|
|
|
|
|
|
2007-08-06 22:07:44 +02:00
|
|
|
|
if (bounds_type == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Bad GNAT array descriptor"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* NOTE: The following calculation is not really kosher, but
|
2002-08-18 20:11:12 +02:00
|
|
|
|
since desc_type is an XVE-encoded type (and shouldn't be),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the correct calculation is a real pain. FIXME (and fix GCC). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
addr = value_as_long (arr);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2009-05-28 02:53:52 +02:00
|
|
|
|
addr = value_address (arr);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value_from_longest (lookup_pointer_type (bounds_type),
|
|
|
|
|
addr - TYPE_LENGTH (bounds_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (is_thick_pntr (type))
|
2010-10-01 18:25:00 +02:00
|
|
|
|
{
|
|
|
|
|
struct value *p_bounds = value_struct_elt (&arr, NULL, "P_BOUNDS", NULL,
|
|
|
|
|
_("Bad GNAT array descriptor"));
|
|
|
|
|
struct type *p_bounds_type = value_type (p_bounds);
|
|
|
|
|
|
|
|
|
|
if (p_bounds_type
|
|
|
|
|
&& TYPE_CODE (p_bounds_type) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
struct type *target_type = TYPE_TARGET_TYPE (p_bounds_type);
|
|
|
|
|
|
|
|
|
|
if (TYPE_STUB (target_type))
|
|
|
|
|
p_bounds = value_cast (lookup_pointer_type
|
|
|
|
|
(ada_check_typedef (target_type)),
|
|
|
|
|
p_bounds);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
error (_("Bad GNAT array descriptor"));
|
|
|
|
|
|
|
|
|
|
return p_bounds;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* If TYPE is the type of an array-descriptor (fat pointer), the bit
|
|
|
|
|
position of the field containing the address of the bounds data. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
fat_pntr_bounds_bitpos (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return TYPE_FIELD_BITPOS (desc_base_type (type), 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE is the type of an array-descriptor (fat pointer), the bit
|
2004-06-02 11:55:36 +02:00
|
|
|
|
size of the field containing the address of the bounds data. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
fat_pntr_bounds_bitsize (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_FIELD_BITSIZE (type, 1) > 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return TYPE_FIELD_BITSIZE (type, 1);
|
|
|
|
|
else
|
2004-10-08 11:40:12 +02:00
|
|
|
|
return 8 * TYPE_LENGTH (ada_check_typedef (TYPE_FIELD_TYPE (type, 1)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* If TYPE is the type of an array descriptor (fat or thin pointer) or a
|
2009-05-18 15:55:49 +02:00
|
|
|
|
pointer to one, the type of its array data (a array-with-no-bounds type);
|
|
|
|
|
otherwise, NULL. Use ada_type_of_array to get an array type with bounds
|
|
|
|
|
data. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2009-05-18 15:55:49 +02:00
|
|
|
|
desc_data_target_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* NOTE: The following is bogus; see comment in desc_bounds. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (is_thin_pntr (type))
|
2009-05-18 15:55:49 +02:00
|
|
|
|
return desc_base_type (TYPE_FIELD_TYPE (thin_descriptor_type (type), 1));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (is_thick_pntr (type))
|
2009-05-18 15:55:49 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *data_type = lookup_struct_elt_type (type, "P_ARRAY", 1);
|
|
|
|
|
|
|
|
|
|
if (data_type
|
|
|
|
|
&& TYPE_CODE (ada_check_typedef (data_type)) == TYPE_CODE_PTR)
|
2010-10-01 18:25:00 +02:00
|
|
|
|
return ada_check_typedef (TYPE_TARGET_TYPE (data_type));
|
2009-05-18 15:55:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If ARR is an array descriptor (fat or thin pointer), a pointer to
|
|
|
|
|
its array data. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
desc_data (struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = value_type (arr);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (is_thin_pntr (type))
|
|
|
|
|
return thin_data_pntr (arr);
|
|
|
|
|
else if (is_thick_pntr (type))
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return value_struct_elt (&arr, NULL, "P_ARRAY", NULL,
|
2004-12-12 18:06:26 +01:00
|
|
|
|
_("Bad GNAT array descriptor"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* If TYPE is the type of an array-descriptor (fat pointer), the bit
|
2004-06-02 11:55:36 +02:00
|
|
|
|
position of the field containing the address of the data. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
fat_pntr_data_bitpos (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return TYPE_FIELD_BITPOS (desc_base_type (type), 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE is the type of an array-descriptor (fat pointer), the bit
|
2004-06-02 11:55:36 +02:00
|
|
|
|
size of the field containing the address of the data. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
fat_pntr_data_bitsize (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
|
|
|
|
if (TYPE_FIELD_BITSIZE (type, 0) > 0)
|
|
|
|
|
return TYPE_FIELD_BITSIZE (type, 0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return TARGET_CHAR_BIT * TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0));
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* If BOUNDS is an array-bounds structure (or pointer to one), return
|
2002-06-04 17:28:49 +02:00
|
|
|
|
the Ith lower bound stored in it, if WHICH is 0, and the Ith upper
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bound, if WHICH is 1. The first bound is I=1. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
desc_one_bound (struct value *bounds, int i, int which)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return value_struct_elt (&bounds, NULL, bound_name[2 * i + which - 2], NULL,
|
2004-12-12 18:06:26 +01:00
|
|
|
|
_("Bad GNAT array descriptor bounds"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If BOUNDS is an array-bounds structure type, return the bit position
|
|
|
|
|
of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bound, if WHICH is 1. The first bound is I=1. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
desc_bound_bitpos (struct type *type, int i, int which)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return TYPE_FIELD_BITPOS (desc_base_type (type), 2 * i + which - 2);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If BOUNDS is an array-bounds structure type, return the bit field size
|
|
|
|
|
of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bound, if WHICH is 1. The first bound is I=1. */
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
desc_bound_bitsize (struct type *type, int i, int which)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_FIELD_BITSIZE (type, 2 * i + which - 2) > 0)
|
|
|
|
|
return TYPE_FIELD_BITSIZE (type, 2 * i + which - 2);
|
|
|
|
|
else
|
|
|
|
|
return 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (type, 2 * i + which - 2));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE is the type of an array-bounds structure, the type of its
|
2004-06-02 11:55:36 +02:00
|
|
|
|
Ith bound (numbering from 1). Otherwise, NULL. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
desc_index_type (struct type *type, int i)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return lookup_struct_elt_type (type, bound_name[2 * i - 2], 1);
|
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The number of index positions in the array-bounds type TYPE.
|
|
|
|
|
Return 0 if TYPE is NULL. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
desc_arity (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
|
|
|
|
if (type != NULL)
|
|
|
|
|
return TYPE_NFIELDS (type) / 2;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Non-zero iff TYPE is a simple array type (not a pointer to one) or
|
|
|
|
|
an array descriptor type (representing an unconstrained array
|
|
|
|
|
type). */
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static int
|
|
|
|
|
ada_is_direct_array_type (struct type *type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return (TYPE_CODE (type) == TYPE_CODE_ARRAY
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|| ada_is_array_descriptor_type (type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Non-zero iff TYPE represents any kind of array in Ada, or a pointer
|
|
|
|
|
* to one. */
|
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
|
static int
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
ada_is_array_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
while (type != NULL
|
|
|
|
|
&& (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_REF))
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
return ada_is_direct_array_type (type);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Non-zero iff TYPE is a simple array type or pointer to one. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_is_simple_array_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (TYPE_CODE (type) == TYPE_CODE_ARRAY
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
|
|
|
&& TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Non-zero iff TYPE belongs to a GNAT array descriptor. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_is_array_descriptor_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-05-18 15:55:49 +02:00
|
|
|
|
struct type *data_type = desc_data_target_type (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2009-05-18 15:55:49 +02:00
|
|
|
|
return (data_type != NULL
|
|
|
|
|
&& TYPE_CODE (data_type) == TYPE_CODE_ARRAY
|
|
|
|
|
&& desc_arity (desc_bounds_type (type)) > 0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Non-zero iff type is a partially mal-formed GNAT array
|
2004-06-02 11:55:36 +02:00
|
|
|
|
descriptor. FIXME: This is to compensate for some problems with
|
2002-06-04 17:28:49 +02:00
|
|
|
|
debugging output from GNAT. Re-examine periodically to see if it
|
2004-06-02 11:55:36 +02:00
|
|
|
|
is still needed. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_bogus_array_descriptor (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2002-06-04 17:28:49 +02:00
|
|
|
|
type != NULL
|
|
|
|
|
&& TYPE_CODE (type) == TYPE_CODE_STRUCT
|
|
|
|
|
&& (lookup_struct_elt_type (type, "P_BOUNDS", 1) != NULL
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| lookup_struct_elt_type (type, "P_ARRAY", 1) != NULL)
|
|
|
|
|
&& !ada_is_array_descriptor_type (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* If ARR has a record type in the form of a standard GNAT array descriptor,
|
2002-06-04 17:28:49 +02:00
|
|
|
|
(fat pointer) returns the type of the array data described---specifically,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
a pointer-to-array type. If BOUNDS is non-zero, the bounds data are filled
|
2002-06-04 17:28:49 +02:00
|
|
|
|
in from the descriptor; otherwise, they are left unspecified. If
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the ARR denotes a null array descriptor and BOUNDS is non-zero,
|
|
|
|
|
returns NULL. The result is simply the type of ARR if ARR is not
|
2002-06-04 17:28:49 +02:00
|
|
|
|
a descriptor. */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_type_of_array (struct value *arr, int bounds)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (value_type (arr)))
|
|
|
|
|
return decode_constrained_packed_array_type (value_type (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (!ada_is_array_descriptor_type (value_type (arr)))
|
|
|
|
|
return value_type (arr);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
|
|
|
|
if (!bounds)
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
{
|
|
|
|
|
struct type *array_type =
|
|
|
|
|
ada_check_typedef (desc_data_target_type (value_type (arr)));
|
|
|
|
|
|
|
|
|
|
if (ada_is_unconstrained_packed_array_type (value_type (arr)))
|
|
|
|
|
TYPE_FIELD_BITSIZE (array_type, 0) =
|
|
|
|
|
decode_packed_array_bitsize (value_type (arr));
|
|
|
|
|
|
|
|
|
|
return array_type;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *elt_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int arity;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *descriptor;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
elt_type = ada_array_element_type (value_type (arr), -1);
|
|
|
|
|
arity = ada_array_arity (value_type (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (elt_type == NULL || arity == 0)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return ada_check_typedef (value_type (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
descriptor = desc_bounds (arr);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (value_as_long (descriptor) == 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
while (arity > 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
struct type *range_type = alloc_type_copy (value_type (arr));
|
|
|
|
|
struct type *array_type = alloc_type_copy (value_type (arr));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *low = desc_one_bound (descriptor, arity, 0);
|
|
|
|
|
struct value *high = desc_one_bound (descriptor, arity, 1);
|
|
|
|
|
|
2010-05-18 21:23:37 +02:00
|
|
|
|
arity -= 1;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
create_range_type (range_type, value_type (low),
|
2006-01-02 10:39:21 +01:00
|
|
|
|
longest_to_int (value_as_long (low)),
|
|
|
|
|
longest_to_int (value_as_long (high)));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
elt_type = create_array_type (array_type, elt_type, range_type);
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
|
|
|
|
|
if (ada_is_unconstrained_packed_array_type (value_type (arr)))
|
|
|
|
|
TYPE_FIELD_BITSIZE (elt_type, 0) =
|
|
|
|
|
decode_packed_array_bitsize (value_type (arr));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return lookup_pointer_type (elt_type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If ARR does not represent an array, returns ARR unchanged.
|
2004-06-02 11:55:36 +02:00
|
|
|
|
Otherwise, returns either a standard GDB array with bounds set
|
|
|
|
|
appropriately or, if ARR is a non-null fat pointer, a pointer to a standard
|
|
|
|
|
GDB array. Returns NULL if ARR is a null fat pointer. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *
|
|
|
|
|
ada_coerce_to_simple_array_ptr (struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_array_descriptor_type (value_type (arr)))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *arrType = ada_type_of_array (arr, 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (arrType == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return value_cast (arrType, value_copy (desc_data (arr)));
|
|
|
|
|
}
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
else if (ada_is_constrained_packed_array_type (value_type (arr)))
|
|
|
|
|
return decode_constrained_packed_array (arr);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If ARR does not represent an array, returns ARR unchanged.
|
|
|
|
|
Otherwise, returns a standard GDB array describing ARR (which may
|
2004-06-02 11:55:36 +02:00
|
|
|
|
be ARR itself if it already is in the proper form). */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_coerce_to_simple_array (struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_array_descriptor_type (value_type (arr)))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *arrVal = ada_coerce_to_simple_array_ptr (arr);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (arrVal == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Bounds unavailable for null array pointer."));
|
2006-01-02 10:39:21 +01:00
|
|
|
|
check_size (TYPE_TARGET_TYPE (value_type (arrVal)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return value_ind (arrVal);
|
|
|
|
|
}
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
else if (ada_is_constrained_packed_array_type (value_type (arr)))
|
|
|
|
|
return decode_constrained_packed_array (arr);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE represents a GNAT array type, return it translated to an
|
|
|
|
|
ordinary GDB array type (possibly with BITSIZE fields indicating
|
2004-06-02 11:55:36 +02:00
|
|
|
|
packing). For other types, is the identity. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_coerce_to_simple_array_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (type))
|
|
|
|
|
return decode_constrained_packed_array_type (type);
|
2009-05-18 15:47:44 +02:00
|
|
|
|
|
|
|
|
|
if (ada_is_array_descriptor_type (type))
|
2009-05-18 15:55:49 +02:00
|
|
|
|
return ada_check_typedef (desc_data_target_type (type));
|
2009-05-18 15:47:44 +02:00
|
|
|
|
|
|
|
|
|
return type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Non-zero iff TYPE represents a standard GNAT packed-array type. */
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
static int
|
|
|
|
|
ada_is_packed_array_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type = desc_base_type (type);
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2002-06-04 17:28:49 +02:00
|
|
|
|
ada_type_name (type) != NULL
|
|
|
|
|
&& strstr (ada_type_name (type), "___XP") != NULL;
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
/* Non-zero iff TYPE represents a standard GNAT constrained
|
|
|
|
|
packed-array type. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ada_is_constrained_packed_array_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
return ada_is_packed_array_type (type)
|
|
|
|
|
&& !ada_is_array_descriptor_type (type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Non-zero iff TYPE represents an array descriptor for a
|
|
|
|
|
unconstrained packed-array type. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_is_unconstrained_packed_array_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
return ada_is_packed_array_type (type)
|
|
|
|
|
&& ada_is_array_descriptor_type (type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given that TYPE encodes a packed array type (constrained or unconstrained),
|
|
|
|
|
return the size of its elements in bits. */
|
|
|
|
|
|
|
|
|
|
static long
|
|
|
|
|
decode_packed_array_bitsize (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
char *raw_name = ada_type_name (ada_check_typedef (type));
|
|
|
|
|
char *tail;
|
|
|
|
|
long bits;
|
|
|
|
|
|
|
|
|
|
if (!raw_name)
|
|
|
|
|
raw_name = ada_type_name (desc_base_type (type));
|
|
|
|
|
|
|
|
|
|
if (!raw_name)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
tail = strstr (raw_name, "___XP");
|
|
|
|
|
|
|
|
|
|
if (sscanf (tail + sizeof ("___XP") - 1, "%ld", &bits) != 1)
|
|
|
|
|
{
|
|
|
|
|
lim_warning
|
|
|
|
|
(_("could not understand bit size information on packed array"));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return bits;
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Given that TYPE is a standard GDB array type with all bounds filled
|
|
|
|
|
in, and that the element size of its ultimate scalar constituents
|
|
|
|
|
(that is, either its elements, or, if it is an array of arrays, its
|
|
|
|
|
elements' elements, etc.) is *ELT_BITS, return an identical type,
|
|
|
|
|
but with the bit sizes of its elements (and those of any
|
|
|
|
|
constituent arrays) recorded in the BITSIZE components of its
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_BITSIZE values, and with *ELT_BITS set to its total size
|
|
|
|
|
in bits. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
constrained_packed_array_type (struct type *type, long *elt_bits)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *new_elt_type;
|
|
|
|
|
struct type *new_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
LONGEST low_bound, high_bound;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
|
|
|
|
|
return type;
|
|
|
|
|
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
new_type = alloc_type_copy (type);
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
new_elt_type =
|
|
|
|
|
constrained_packed_array_type (ada_check_typedef (TYPE_TARGET_TYPE (type)),
|
|
|
|
|
elt_bits);
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
create_array_type (new_type, new_elt_type, TYPE_INDEX_TYPE (type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_FIELD_BITSIZE (new_type, 0) = *elt_bits;
|
|
|
|
|
TYPE_NAME (new_type) = ada_type_name (type);
|
|
|
|
|
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
if (get_discrete_bounds (TYPE_INDEX_TYPE (type),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&low_bound, &high_bound) < 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
low_bound = high_bound = 0;
|
|
|
|
|
if (high_bound < low_bound)
|
|
|
|
|
*elt_bits = TYPE_LENGTH (new_type) = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
*elt_bits *= (high_bound - low_bound + 1);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
TYPE_LENGTH (new_type) =
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(*elt_bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (new_type) = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return new_type;
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
/* The array type encoded by TYPE, where
|
|
|
|
|
ada_is_constrained_packed_array_type (TYPE). */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
decode_constrained_packed_array_type (struct type *type)
|
2002-08-18 20:11:12 +02:00
|
|
|
|
{
|
2008-01-04 21:45:05 +01:00
|
|
|
|
char *raw_name = ada_type_name (ada_check_typedef (type));
|
|
|
|
|
char *name;
|
|
|
|
|
char *tail;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *shadow_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
long bits;
|
|
|
|
|
|
2008-01-04 21:45:05 +01:00
|
|
|
|
if (!raw_name)
|
|
|
|
|
raw_name = ada_type_name (desc_base_type (type));
|
|
|
|
|
|
|
|
|
|
if (!raw_name)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
name = (char *) alloca (strlen (raw_name) + 1);
|
|
|
|
|
tail = strstr (raw_name, "___XP");
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
memcpy (name, raw_name, tail - raw_name);
|
|
|
|
|
name[tail - raw_name] = '\000';
|
|
|
|
|
|
2010-01-12 06:49:00 +01:00
|
|
|
|
shadow_type = ada_find_parallel_type_with_name (type, name);
|
|
|
|
|
|
|
|
|
|
if (shadow_type == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("could not find bounds information on packed array"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2009-03-20 23:00:11 +01:00
|
|
|
|
CHECK_TYPEDEF (shadow_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (shadow_type) != TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("could not understand bounds information on packed array"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
bits = decode_packed_array_bitsize (type);
|
|
|
|
|
return constrained_packed_array_type (shadow_type, &bits);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
/* Given that ARR is a struct value *indicating a GNAT constrained packed
|
|
|
|
|
array, returns a simple array that denotes that array. Its type is a
|
2002-06-04 17:28:49 +02:00
|
|
|
|
standard GDB array type except that the BITSIZEs of the array
|
|
|
|
|
target types are set to the number of bits in each element, and the
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type length is set appropriately. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
decode_constrained_packed_array (struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
arr = ada_coerce_ref (arr);
|
2009-06-23 18:43:24 +02:00
|
|
|
|
|
|
|
|
|
/* If our value is a pointer, then dererence it. Make sure that
|
|
|
|
|
this operation does not cause the target type to be fixed, as
|
|
|
|
|
this would indirectly cause this array to be decoded. The rest
|
|
|
|
|
of the routine assumes that the array hasn't been decoded yet,
|
|
|
|
|
so we use the basic "value_ind" routine to perform the dereferencing,
|
|
|
|
|
as opposed to using "ada_value_ind". */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (arr)) == TYPE_CODE_PTR)
|
2009-06-23 18:43:24 +02:00
|
|
|
|
arr = value_ind (arr);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
type = decode_constrained_packed_array_type (value_type (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (type == NULL)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("can't unpack array"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2004-10-08 11:40:12 +02:00
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
if (gdbarch_bits_big_endian (get_type_arch (value_type (arr)))
|
2008-01-18 18:07:40 +01:00
|
|
|
|
&& ada_is_modular_type (value_type (arr)))
|
2004-10-08 11:40:12 +02:00
|
|
|
|
{
|
|
|
|
|
/* This is a (right-justified) modular type representing a packed
|
|
|
|
|
array with no wrapper. In order to interpret the value through
|
|
|
|
|
the (left-justified) packed array type we just built, we must
|
|
|
|
|
first left-justify it. */
|
|
|
|
|
int bit_size, bit_pos;
|
|
|
|
|
ULONGEST mod;
|
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
mod = ada_modulus (value_type (arr)) - 1;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
bit_size = 0;
|
|
|
|
|
while (mod > 0)
|
|
|
|
|
{
|
|
|
|
|
bit_size += 1;
|
|
|
|
|
mod >>= 1;
|
|
|
|
|
}
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
bit_pos = HOST_CHAR_BIT * TYPE_LENGTH (value_type (arr)) - bit_size;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
arr = ada_value_primitive_packed_val (arr, NULL,
|
|
|
|
|
bit_pos / HOST_CHAR_BIT,
|
|
|
|
|
bit_pos % HOST_CHAR_BIT,
|
|
|
|
|
bit_size,
|
|
|
|
|
type);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return coerce_unspec_val_to_type (arr, type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The value of the element of packed array ARR at the ARITY indices
|
2004-06-02 11:55:36 +02:00
|
|
|
|
given in IND. ARR must be a simple array. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
value_subscript_packed (struct value *arr, int arity, struct value **ind)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int bits, elt_off, bit_off;
|
|
|
|
|
long elt_total_bit_offset;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *elt_type;
|
|
|
|
|
struct value *v;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
bits = 0;
|
|
|
|
|
elt_total_bit_offset = 0;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
elt_type = ada_check_typedef (value_type (arr));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (i = 0; i < arity; i += 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (elt_type) != TYPE_CODE_ARRAY
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| TYPE_FIELD_BITSIZE (elt_type, 0) == 0)
|
|
|
|
|
error
|
2004-12-12 18:06:26 +01:00
|
|
|
|
(_("attempt to do packed indexing of something other than a packed array"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *range_type = TYPE_INDEX_TYPE (elt_type);
|
|
|
|
|
LONGEST lowerbound, upperbound;
|
|
|
|
|
LONGEST idx;
|
|
|
|
|
|
|
|
|
|
if (get_discrete_bounds (range_type, &lowerbound, &upperbound) < 0)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("don't know bounds of array"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
lowerbound = upperbound = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-11 16:19:09 +02:00
|
|
|
|
idx = pos_atr (ind[i]);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (idx < lowerbound || idx > upperbound)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("packed array index %ld out of bounds"), (long) idx);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bits = TYPE_FIELD_BITSIZE (elt_type, 0);
|
|
|
|
|
elt_total_bit_offset += (idx - lowerbound) * bits;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
elt_type = ada_check_typedef (TYPE_TARGET_TYPE (elt_type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
elt_off = elt_total_bit_offset / HOST_CHAR_BIT;
|
|
|
|
|
bit_off = elt_total_bit_offset % HOST_CHAR_BIT;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
|
|
|
|
v = ada_value_primitive_packed_val (arr, NULL, elt_off, bit_off,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bits, elt_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Non-zero iff TYPE includes negative integer values. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
has_negatives (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
return !TYPE_UNSIGNED (type);
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
return TYPE_LOW_BOUND (type) < 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Create a new value of type TYPE from the contents of OBJ starting
|
|
|
|
|
at byte OFFSET, and bit offset BIT_OFFSET within that byte,
|
|
|
|
|
proceeding for BIT_SIZE bits. If OBJ is an lval in memory, then
|
2004-06-02 11:55:36 +02:00
|
|
|
|
assigning through the result will set the field fetched from.
|
|
|
|
|
VALADDR is ignored unless OBJ is NULL, in which case,
|
|
|
|
|
VALADDR+OFFSET must address the start of storage containing the
|
|
|
|
|
packed value. The value returned in this case is never an lval.
|
|
|
|
|
Assumes 0 <= BIT_OFFSET < HOST_CHAR_BIT. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
|
2005-01-28 Andrew Cagney <cagney@gnu.org>
* language.h (struct language_defn): Make la_val_print's buffer
parameter a const bfd_byte.
* cp-valprint.c (cp_print_value_fields, cp_print_value): Update.
* ada-lang.c (ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* valprint.c (val_print_array_elements): Update.
* valprint.h (val_print_array_elements): Update.
* ada-lang.h (ada_val_print, ada_aligned_value_addr)
(ada_value_primitive_packed_val, ada_which_variant_applies): Update.
* ada-valprint.c (ada_val_print, struct ada_val_print_args)
(ada_val_print_1, ada_print_floating, printable_val_type)
(print_record, val_print_packed_array_elements)
(print_field_values, print_variant_part): Update.
* c-lang.h (c_val_print, cp_print_value_fields): Update.
* c-valprint.c (c_val_print): Update.
* f-lang.h (f_val_print): Update.
* f-valprint.c (f_val_print, f77_print_array_1)
(f77_print_array): Update.
* jv-lang.h (java_val_print): Update.
* jv-valprint.c (java_print_value_fields, java_val_print): Update.
* language.c (unk_lang_val_print): Update.
* m2-lang.h (m2_val_print): Update.
* m2-valprint.c (m2_val_print): Update.
* p-lang.h (pascal_val_print): Update.
(pascal_object_print_value_fields): Update.
* p-valprint.c (pascal_val_print)
(pascal_object_print_value_fields, pascal_object_print_value)
(pascal_object_print_value): Update.
* scm-lang.h (scm_val_print): Update.
* scm-valprint.c (scm_val_print): Update.
* value.h (val_print): Update.
2005-01-29 02:59:31 +01:00
|
|
|
|
long offset, int bit_offset, int bit_size,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *v;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int src, /* Index into the source area */
|
|
|
|
|
targ, /* Index into the target area */
|
|
|
|
|
srcBitsLeft, /* Number of source bits left to move */
|
|
|
|
|
nsrc, ntarg, /* Number of source and target bytes */
|
|
|
|
|
unusedLS, /* Number of bits in next significant
|
|
|
|
|
byte of source that are unused */
|
|
|
|
|
accumSize; /* Number of meaningful bits in accum */
|
|
|
|
|
unsigned char *bytes; /* First byte containing data to unpack */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
unsigned char *unpacked;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
unsigned long accum; /* Staging area for bits being transferred */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
unsigned char sign;
|
|
|
|
|
int len = (bit_size + bit_offset + HOST_CHAR_BIT - 1) / 8;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Transmit bytes from least to most significant; delta is the direction
|
|
|
|
|
the indices move. */
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
int delta = gdbarch_bits_big_endian (get_type_arch (type)) ? -1 : 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (obj == NULL)
|
|
|
|
|
{
|
|
|
|
|
v = allocate_value (type);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
bytes = (unsigned char *) (valaddr + offset);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2008-04-30 23:13:49 +02:00
|
|
|
|
else if (VALUE_LVAL (obj) == lval_memory && value_lazy (obj))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
v = value_at (type,
|
2009-05-28 02:53:52 +02:00
|
|
|
|
value_address (obj) + offset);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
bytes = (unsigned char *) alloca (len);
|
2009-05-28 02:53:52 +02:00
|
|
|
|
read_memory (value_address (v), bytes, len);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
v = allocate_value (type);
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
bytes = (unsigned char *) value_contents (obj) + offset;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
|
|
|
|
if (obj != NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-05-28 02:53:52 +02:00
|
|
|
|
CORE_ADDR new_addr;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2009-01-13 11:34:31 +01:00
|
|
|
|
set_value_component_location (v, obj);
|
2009-05-28 02:53:52 +02:00
|
|
|
|
new_addr = value_address (obj) + offset;
|
2005-02-08 05:57:03 +01:00
|
|
|
|
set_value_bitpos (v, bit_offset + value_bitpos (obj));
|
|
|
|
|
set_value_bitsize (v, bit_size);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (value_bitpos (v) >= HOST_CHAR_BIT)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2009-05-28 02:53:52 +02:00
|
|
|
|
++new_addr;
|
2005-02-08 05:57:03 +01:00
|
|
|
|
set_value_bitpos (v, value_bitpos (v) - HOST_CHAR_BIT);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2009-05-28 02:53:52 +02:00
|
|
|
|
set_value_address (v, new_addr);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2005-02-08 05:57:03 +01:00
|
|
|
|
set_value_bitsize (v, bit_size);
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
unpacked = (unsigned char *) value_contents (v);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
srcBitsLeft = bit_size;
|
|
|
|
|
nsrc = len;
|
|
|
|
|
ntarg = TYPE_LENGTH (type);
|
|
|
|
|
sign = 0;
|
|
|
|
|
if (bit_size == 0)
|
|
|
|
|
{
|
|
|
|
|
memset (unpacked, 0, TYPE_LENGTH (type));
|
|
|
|
|
return v;
|
|
|
|
|
}
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
else if (gdbarch_bits_big_endian (get_type_arch (type)))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
src = len - 1;
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (has_negatives (type)
|
|
|
|
|
&& ((bytes[0] << bit_offset) & (1 << (HOST_CHAR_BIT - 1))))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
sign = ~0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
|
|
|
|
unusedLS =
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(HOST_CHAR_BIT - (bit_size + bit_offset) % HOST_CHAR_BIT)
|
|
|
|
|
% HOST_CHAR_BIT;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
/* Non-scalar values must be aligned at a byte boundary... */
|
|
|
|
|
accumSize =
|
|
|
|
|
(HOST_CHAR_BIT - bit_size % HOST_CHAR_BIT) % HOST_CHAR_BIT;
|
|
|
|
|
/* ... And are placed at the beginning (most-significant) bytes
|
|
|
|
|
of the target. */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
targ = (bit_size + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT - 1;
|
2009-03-13 00:41:16 +01:00
|
|
|
|
ntarg = targ + 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
accumSize = 0;
|
|
|
|
|
targ = TYPE_LENGTH (type) - 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int sign_bit_offset = (bit_size + bit_offset - 1) % 8;
|
|
|
|
|
|
|
|
|
|
src = targ = 0;
|
|
|
|
|
unusedLS = bit_offset;
|
|
|
|
|
accumSize = 0;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (has_negatives (type) && (bytes[len - 1] & (1 << sign_bit_offset)))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
sign = ~0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
accum = 0;
|
|
|
|
|
while (nsrc > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Mask for removing bits of the next source byte that are not
|
2004-06-02 11:55:36 +02:00
|
|
|
|
part of the value. */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
unsigned int unusedMSMask =
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(1 << (srcBitsLeft >= HOST_CHAR_BIT ? HOST_CHAR_BIT : srcBitsLeft)) -
|
|
|
|
|
1;
|
|
|
|
|
/* Sign-extend bits for this byte. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
unsigned int signMask = sign & ~unusedMSMask;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
accum |=
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(((bytes[src] >> unusedLS) & unusedMSMask) | signMask) << accumSize;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
accumSize += HOST_CHAR_BIT - unusedLS;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (accumSize >= HOST_CHAR_BIT)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
unpacked[targ] = accum & ~(~0L << HOST_CHAR_BIT);
|
|
|
|
|
accumSize -= HOST_CHAR_BIT;
|
|
|
|
|
accum >>= HOST_CHAR_BIT;
|
|
|
|
|
ntarg -= 1;
|
|
|
|
|
targ += delta;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
srcBitsLeft -= HOST_CHAR_BIT - unusedLS;
|
|
|
|
|
unusedLS = 0;
|
|
|
|
|
nsrc -= 1;
|
|
|
|
|
src += delta;
|
|
|
|
|
}
|
|
|
|
|
while (ntarg > 0)
|
|
|
|
|
{
|
|
|
|
|
accum |= sign << accumSize;
|
|
|
|
|
unpacked[targ] = accum & ~(~0L << HOST_CHAR_BIT);
|
|
|
|
|
accumSize -= HOST_CHAR_BIT;
|
|
|
|
|
accum >>= HOST_CHAR_BIT;
|
|
|
|
|
ntarg -= 1;
|
|
|
|
|
targ += delta;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Move N bits from SOURCE, starting at bit offset SRC_OFFSET to
|
|
|
|
|
TARGET, starting at bit offset TARG_OFFSET. SOURCE and TARGET must
|
2004-06-02 11:55:36 +02:00
|
|
|
|
not overlap. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static void
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
move_bits (gdb_byte *target, int targ_offset, const gdb_byte *source,
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
int src_offset, int n, int bits_big_endian_p)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int accum, mask;
|
|
|
|
|
int accum_bits, chunk_size;
|
|
|
|
|
|
|
|
|
|
target += targ_offset / HOST_CHAR_BIT;
|
|
|
|
|
targ_offset %= HOST_CHAR_BIT;
|
|
|
|
|
source += src_offset / HOST_CHAR_BIT;
|
|
|
|
|
src_offset %= HOST_CHAR_BIT;
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
if (bits_big_endian_p)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
accum = (unsigned char) *source;
|
|
|
|
|
source += 1;
|
|
|
|
|
accum_bits = HOST_CHAR_BIT - src_offset;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
while (n > 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int unused_right;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
accum = (accum << HOST_CHAR_BIT) + (unsigned char) *source;
|
|
|
|
|
accum_bits += HOST_CHAR_BIT;
|
|
|
|
|
source += 1;
|
|
|
|
|
chunk_size = HOST_CHAR_BIT - targ_offset;
|
|
|
|
|
if (chunk_size > n)
|
|
|
|
|
chunk_size = n;
|
|
|
|
|
unused_right = HOST_CHAR_BIT - (chunk_size + targ_offset);
|
|
|
|
|
mask = ((1 << chunk_size) - 1) << unused_right;
|
|
|
|
|
*target =
|
|
|
|
|
(*target & ~mask)
|
|
|
|
|
| ((accum >> (accum_bits - chunk_size - unused_right)) & mask);
|
|
|
|
|
n -= chunk_size;
|
|
|
|
|
accum_bits -= chunk_size;
|
|
|
|
|
target += 1;
|
|
|
|
|
targ_offset = 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
accum = (unsigned char) *source >> src_offset;
|
|
|
|
|
source += 1;
|
|
|
|
|
accum_bits = HOST_CHAR_BIT - src_offset;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
while (n > 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
accum = accum + ((unsigned char) *source << accum_bits);
|
|
|
|
|
accum_bits += HOST_CHAR_BIT;
|
|
|
|
|
source += 1;
|
|
|
|
|
chunk_size = HOST_CHAR_BIT - targ_offset;
|
|
|
|
|
if (chunk_size > n)
|
|
|
|
|
chunk_size = n;
|
|
|
|
|
mask = ((1 << chunk_size) - 1) << targ_offset;
|
|
|
|
|
*target = (*target & ~mask) | ((accum << targ_offset) & mask);
|
|
|
|
|
n -= chunk_size;
|
|
|
|
|
accum_bits -= chunk_size;
|
|
|
|
|
accum >>= chunk_size;
|
|
|
|
|
target += 1;
|
|
|
|
|
targ_offset = 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Store the contents of FROMVAL into the location of TOVAL.
|
|
|
|
|
Return a new value with the location of TOVAL and contents of
|
|
|
|
|
FROMVAL. Handles assignment into packed fields that have
|
2004-06-02 11:55:36 +02:00
|
|
|
|
floating-point or non-scalar types. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_assign (struct value *toval, struct value *fromval)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = value_type (toval);
|
|
|
|
|
int bits = value_bitsize (toval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
toval = ada_coerce_ref (toval);
|
|
|
|
|
fromval = ada_coerce_ref (fromval);
|
|
|
|
|
|
|
|
|
|
if (ada_is_direct_array_type (value_type (toval)))
|
|
|
|
|
toval = ada_coerce_to_simple_array (toval);
|
|
|
|
|
if (ada_is_direct_array_type (value_type (fromval)))
|
|
|
|
|
fromval = ada_coerce_to_simple_array (fromval);
|
|
|
|
|
|
2005-02-08 01:25:31 +01:00
|
|
|
|
if (!deprecated_value_modifiable (toval))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Left operand of assignment is not a modifiable lvalue."));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (VALUE_LVAL (toval) == lval_memory
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& bits > 0
|
2002-08-18 20:11:12 +02:00
|
|
|
|
&& (TYPE_CODE (type) == TYPE_CODE_FLT
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_STRUCT))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
int len = (value_bitpos (toval)
|
|
|
|
|
+ bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
|
2008-06-06 08:48:36 +02:00
|
|
|
|
int from_size;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *buffer = (char *) alloca (len);
|
|
|
|
|
struct value *val;
|
2009-05-28 02:53:52 +02:00
|
|
|
|
CORE_ADDR to_addr = value_address (toval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_FLT)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
fromval = value_cast (type, fromval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
read_memory (to_addr, buffer, len);
|
2008-06-06 08:48:36 +02:00
|
|
|
|
from_size = value_bitsize (fromval);
|
|
|
|
|
if (from_size == 0)
|
|
|
|
|
from_size = TYPE_LENGTH (value_type (fromval)) * TARGET_CHAR_BIT;
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
if (gdbarch_bits_big_endian (get_type_arch (type)))
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
move_bits (buffer, value_bitpos (toval),
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
value_contents (fromval), from_size - bits, bits, 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
move_bits (buffer, value_bitpos (toval),
|
|
|
|
|
value_contents (fromval), 0, bits, 0);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
write_memory (to_addr, buffer, len);
|
2009-12-02 20:29:42 +01:00
|
|
|
|
observer_notify_memory_changed (to_addr, len, buffer);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
val = value_copy (toval);
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
memcpy (value_contents_raw (val), value_contents (fromval),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (type));
|
2005-02-07 Andrew Cagney <cagney@gnu.org>
* value.h (deprecated_set_value_type): Declare.
* value.c (deprecated_set_value_type): Define.
* hpacc-abi.c, gnu-v2-abi.c, cp-valprint.c: Update.
* c-valprint.c, jv-lang.c, objc-lang.c, ada-lang.c: Update.
* infcall.c, printcmd.c, valops.c, eval.c, p-exp.y: Update.
* ax-gdb.c, tracepoint.c: Update.
2005-02-08 00:51:03 +01:00
|
|
|
|
deprecated_set_value_type (val, type);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value_assign (toval, fromval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Given that COMPONENT is a memory lvalue that is part of the lvalue
|
|
|
|
|
* CONTAINER, assign the contents of VAL to COMPONENTS's place in
|
|
|
|
|
* CONTAINER. Modifies the VALUE_CONTENTS of CONTAINER only, not
|
|
|
|
|
* COMPONENT, and not the inferior's memory. The current contents
|
|
|
|
|
* of COMPONENT are ignored. */
|
|
|
|
|
static void
|
|
|
|
|
value_assign_to_component (struct value *container, struct value *component,
|
|
|
|
|
struct value *val)
|
|
|
|
|
{
|
|
|
|
|
LONGEST offset_in_container =
|
2009-05-28 02:53:52 +02:00
|
|
|
|
(LONGEST) (value_address (component) - value_address (container));
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
int bit_offset_in_container =
|
|
|
|
|
value_bitpos (component) - value_bitpos (container);
|
|
|
|
|
int bits;
|
|
|
|
|
|
|
|
|
|
val = value_cast (value_type (component), val);
|
|
|
|
|
|
|
|
|
|
if (value_bitsize (component) == 0)
|
|
|
|
|
bits = TARGET_CHAR_BIT * TYPE_LENGTH (value_type (component));
|
|
|
|
|
else
|
|
|
|
|
bits = value_bitsize (component);
|
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
if (gdbarch_bits_big_endian (get_type_arch (value_type (container))))
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
move_bits (value_contents_writeable (container) + offset_in_container,
|
|
|
|
|
value_bitpos (container) + bit_offset_in_container,
|
|
|
|
|
value_contents (val),
|
|
|
|
|
TYPE_LENGTH (value_type (component)) * TARGET_CHAR_BIT - bits,
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
bits, 1);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
else
|
|
|
|
|
move_bits (value_contents_writeable (container) + offset_in_container,
|
|
|
|
|
value_bitpos (container) + bit_offset_in_container,
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
value_contents (val), 0, bits, 0);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The value of the element of array ARR at the ARITY indices given in IND.
|
|
|
|
|
ARR may be either a simple array, GNAT array descriptor, or pointer
|
2002-06-04 17:28:49 +02:00
|
|
|
|
thereto. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *
|
|
|
|
|
ada_value_subscript (struct value *arr, int arity, struct value **ind)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int k;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *elt;
|
|
|
|
|
struct type *elt_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
elt = ada_coerce_to_simple_array (arr);
|
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
elt_type = ada_check_typedef (value_type (elt));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (elt_type) == TYPE_CODE_ARRAY
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& TYPE_FIELD_BITSIZE (elt_type, 0) > 0)
|
|
|
|
|
return value_subscript_packed (elt, arity, ind);
|
|
|
|
|
|
|
|
|
|
for (k = 0; k < arity; k += 1)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (elt_type) != TYPE_CODE_ARRAY)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("too many subscripts (%d expected)"), k);
|
* value.h (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* valarith.c (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* wrapper.h (gdb_value_subscript): Use LONGEST instead of
value as type of the index argument.
* wrapper.c (gdb_value_subscript): Likewise.
Update calls to gdb_value_subscript, value_subscript,
value_subscripted_rvalue, value_bitstring_subscript and
value_ptradd to use LONGEST instead of value as index
argument type. Use value_ptradd instead of value_ptrsub.
* ada-lang.c (ada_value_subscript, ada_value_ptr_subscript,
ada_tag_name_2): Update.
* ada-tasks.c (read_atcb): Update.
* eval.c (evaluate_subexp_standard): Update.
* valarith.c (value_subscript): Update.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Update.
* gnu-v3-abi.c (gnuv3_get_virtual_fn, gnuv3_baseclass_offset,
gnuv3_method_ptr_to_value): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* m2-lang.c (evaluate_subexp_modula2): Update.
* python/python-value.c (valpy_getitem, valpy_binop): Update.
* wrapper.c (gdb_value_subscript): Update.
* varobj.c (c_describe_child): Update.
2009-06-29 15:24:41 +02:00
|
|
|
|
elt = value_subscript (elt, pos_atr (ind[k]));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
return elt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming ARR is a pointer to a standard GDB array of type TYPE, the
|
|
|
|
|
value of the element of *ARR at the ARITY indices given in
|
2004-06-02 11:55:36 +02:00
|
|
|
|
IND. Does not read the entire array into memory. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
|
static struct value *
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_value_ptr_subscript (struct value *arr, struct type *type, int arity,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value **ind)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int k;
|
|
|
|
|
|
|
|
|
|
for (k = 0; k < arity; k += 1)
|
|
|
|
|
{
|
|
|
|
|
LONGEST lwb, upb;
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) != TYPE_CODE_ARRAY)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("too many subscripts (%d expected)"), k);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
arr = value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value_copy (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
get_discrete_bounds (TYPE_INDEX_TYPE (type), &lwb, &upb);
|
* value.h (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* valarith.c (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* wrapper.h (gdb_value_subscript): Use LONGEST instead of
value as type of the index argument.
* wrapper.c (gdb_value_subscript): Likewise.
Update calls to gdb_value_subscript, value_subscript,
value_subscripted_rvalue, value_bitstring_subscript and
value_ptradd to use LONGEST instead of value as index
argument type. Use value_ptradd instead of value_ptrsub.
* ada-lang.c (ada_value_subscript, ada_value_ptr_subscript,
ada_tag_name_2): Update.
* ada-tasks.c (read_atcb): Update.
* eval.c (evaluate_subexp_standard): Update.
* valarith.c (value_subscript): Update.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Update.
* gnu-v3-abi.c (gnuv3_get_virtual_fn, gnuv3_baseclass_offset,
gnuv3_method_ptr_to_value): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* m2-lang.c (evaluate_subexp_modula2): Update.
* python/python-value.c (valpy_getitem, valpy_binop): Update.
* wrapper.c (gdb_value_subscript): Update.
* varobj.c (c_describe_child): Update.
2009-06-29 15:24:41 +02:00
|
|
|
|
arr = value_ptradd (arr, pos_atr (ind[k]) - lwb);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value_ind (arr);
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-01 12:30:57 +02:00
|
|
|
|
/* Given that ARRAY_PTR is a pointer or reference to an array of type TYPE (the
|
2008-12-15 11:40:28 +01:00
|
|
|
|
actual type of ARRAY_PTR is ignored), returns the Ada slice of HIGH-LOW+1
|
|
|
|
|
elements starting at index LOW. The lower bound of this array is LOW, as
|
|
|
|
|
per Ada rules. */
|
2004-07-01 12:30:57 +02:00
|
|
|
|
static struct value *
|
2008-12-15 11:40:28 +01:00
|
|
|
|
ada_value_slice_from_ptr (struct value *array_ptr, struct type *type,
|
|
|
|
|
int low, int high)
|
2004-07-01 12:30:57 +02:00
|
|
|
|
{
|
2004-09-18 12:11:06 +02:00
|
|
|
|
CORE_ADDR base = value_as_address (array_ptr)
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
+ ((low - ada_discrete_type_low_bound (TYPE_INDEX_TYPE (type)))
|
2004-07-01 12:30:57 +02:00
|
|
|
|
* TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
|
2004-09-18 12:11:06 +02:00
|
|
|
|
struct type *index_type =
|
|
|
|
|
create_range_type (NULL, TYPE_TARGET_TYPE (TYPE_INDEX_TYPE (type)),
|
2004-07-01 12:30:57 +02:00
|
|
|
|
low, high);
|
2004-09-18 12:11:06 +02:00
|
|
|
|
struct type *slice_type =
|
2004-07-01 12:30:57 +02:00
|
|
|
|
create_array_type (NULL, TYPE_TARGET_TYPE (type), index_type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-12-15 11:40:28 +01:00
|
|
|
|
return value_at_lazy (slice_type, base);
|
2004-07-01 12:30:57 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_slice (struct value *array, int low, int high)
|
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = value_type (array);
|
2004-09-18 12:11:06 +02:00
|
|
|
|
struct type *index_type =
|
2004-07-01 12:30:57 +02:00
|
|
|
|
create_range_type (NULL, TYPE_INDEX_TYPE (type), low, high);
|
2004-09-18 12:11:06 +02:00
|
|
|
|
struct type *slice_type =
|
2004-07-01 12:30:57 +02:00
|
|
|
|
create_array_type (NULL, TYPE_TARGET_TYPE (type), index_type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-09-18 12:11:06 +02:00
|
|
|
|
return value_cast (slice_type, value_slice (array, low, high - low + 1));
|
2004-07-01 12:30:57 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* If type is a record type in the form of a standard GNAT array
|
|
|
|
|
descriptor, returns the number of dimensions for type. If arr is a
|
|
|
|
|
simple array, returns the number of "array of"s that prefix its
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type designation. Otherwise, returns 0. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_array_arity (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int arity;
|
|
|
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
|
|
|
|
arity = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return desc_arity (desc_bounds_type (type));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
while (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
arity += 1;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (TYPE_TARGET_TYPE (type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return arity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE is a record type in the form of a standard GNAT array
|
|
|
|
|
descriptor or a simple array type, returns the element type for
|
|
|
|
|
TYPE after indexing by NINDICES indices, or by all indices if
|
2004-06-02 11:55:36 +02:00
|
|
|
|
NINDICES is -1. Otherwise, returns NULL. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_array_element_type (struct type *type, int nindices)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int k;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *p_array_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-05-18 15:55:49 +02:00
|
|
|
|
p_array_type = desc_data_target_type (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
k = ada_array_arity (type);
|
|
|
|
|
if (k == 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Initially p_array_type = elt_type(*)[]...(k times)...[]. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (nindices >= 0 && k > nindices)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
k = nindices;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
while (k > 0 && p_array_type != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
p_array_type = ada_check_typedef (TYPE_TARGET_TYPE (p_array_type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
k -= 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return p_array_type;
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
|
|
|
|
while (nindices != 0 && TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
nindices -= 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The type of nth index in arrays of given type (n numbering from 1).
|
2009-06-29 19:26:29 +02:00
|
|
|
|
Does not examine memory. Throws an error if N is invalid or TYPE
|
|
|
|
|
is not an array type. NAME is the name of the Ada attribute being
|
|
|
|
|
evaluated ('range, 'first, 'last, or 'length); it is used in building
|
|
|
|
|
the error message. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
ada_index_type (struct type *type, int n, const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *result_type;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
type = desc_base_type (type);
|
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
if (n < 0 || n > ada_array_arity (type))
|
|
|
|
|
error (_("invalid dimension number to '%s"), name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ada_is_simple_array_type (type))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i < n; i += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
result_type = TYPE_TARGET_TYPE (TYPE_INDEX_TYPE (type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* FIXME: The stabs type r(0,0);bound;bound in an array type
|
|
|
|
|
has a target type of TYPE_CODE_UNDEF. We compensate here, but
|
2004-06-27 21:06:23 +02:00
|
|
|
|
perhaps stabsread.c would make more sense. */
|
2009-06-29 19:22:10 +02:00
|
|
|
|
if (result_type && TYPE_CODE (result_type) == TYPE_CODE_UNDEF)
|
|
|
|
|
result_type = NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2009-06-29 19:22:10 +02:00
|
|
|
|
{
|
|
|
|
|
result_type = desc_index_type (desc_bounds_type (type), n);
|
|
|
|
|
if (result_type == NULL)
|
|
|
|
|
error (_("attempt to take bound of something that is not an array"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given that arr is an array type, returns the lower bound of the
|
|
|
|
|
Nth index (numbering from 1) if WHICH is 0, and the upper bound if
|
2004-06-02 11:55:36 +02:00
|
|
|
|
WHICH is 1. This returns bounds 0 .. -1 if ARR_TYPE is an
|
2009-06-29 19:22:10 +02:00
|
|
|
|
array-descriptor type. It works for other arrays with bounds supplied
|
|
|
|
|
by run-time quantities other than discriminants. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-03 15:07:10 +01:00
|
|
|
|
static LONGEST
|
2009-06-29 19:22:10 +02:00
|
|
|
|
ada_array_bound_from_type (struct type * arr_type, int n, int which)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-06-29 19:28:59 +02:00
|
|
|
|
struct type *type, *elt_type, *index_type_desc, *index_type;
|
|
|
|
|
int i;
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
|
|
|
|
|
gdb_assert (which == 0 || which == 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (arr_type))
|
|
|
|
|
arr_type = decode_constrained_packed_array_type (arr_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (arr_type == NULL || !ada_is_simple_array_type (arr_type))
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return (LONGEST) - which;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (arr_type) == TYPE_CODE_PTR)
|
|
|
|
|
type = TYPE_TARGET_TYPE (arr_type);
|
|
|
|
|
else
|
|
|
|
|
type = arr_type;
|
|
|
|
|
|
2009-06-29 19:28:59 +02:00
|
|
|
|
elt_type = type;
|
|
|
|
|
for (i = n; i > 1; i--)
|
|
|
|
|
elt_type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
index_type_desc = ada_find_parallel_type (type, "___XA");
|
2010-05-17 18:55:31 +02:00
|
|
|
|
ada_fixup_array_indexes_type (index_type_desc);
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
if (index_type_desc != NULL)
|
2010-05-17 18:55:31 +02:00
|
|
|
|
index_type = to_fixed_range_type (TYPE_FIELD_TYPE (index_type_desc, n - 1),
|
|
|
|
|
NULL);
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
else
|
2009-06-29 19:28:59 +02:00
|
|
|
|
index_type = TYPE_INDEX_TYPE (elt_type);
|
Fix TYPE_HIGH_BOUND for TYPE_CODE_RANGE using arbitrary TYPE_NFIELDS in
preparation for supporting DW_AT_byte_stride.
* ada-lang.c (packed_array_type, ada_index_type): Use TYPE_INDEX_TYPE.
(ada_array_bound_from_type): Move `index_type' declaration to the
function start. New variable `retval'. Return the bounds for
TYPE_CODE_RANGE using TYPE_LOW_BOUND and TYPE_HIGH_BOUND. Abort on
invalid index type codes.
* ada-typeprint.c (print_range): Set `upper_bound' for TYPE_CODE_RANGE
now using TYPE_HIGH_BOUND.
* ada-valprint.c (val_print_packed_array_elements): Use `index_type'.
* eval.c (evaluate_subexp_standard): Use TYPE_INDEX_TYPE.
* gdbtypes.c (create_range_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
refer to the number of fields only through TYPE_NFIELDS.
(create_array_type): Use TYPE_INDEX_TYPE.
(check_typedef): Use TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
* gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): Use TYPE_INDEX_TYPE.
(TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): Use
TYPE_INDEX_TYPE, TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* hppa-tdep.c (hppa_alignof <TYPE_CODE_ARRAY>): Use TYPE_INDEX_TYPE.
* mdebugread.c (parse_type): Use TYPE_LOW_BOUND, TYPE_HIGH_BOUND,
* valarith.c (value_bit_index): Use TYPE_INDEX_TYPE.
2008-12-28 15:14:19 +01:00
|
|
|
|
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
return
|
|
|
|
|
(LONGEST) (which == 0
|
|
|
|
|
? ada_discrete_type_low_bound (index_type)
|
|
|
|
|
: ada_discrete_type_high_bound (index_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given that arr is an array value, returns the lower bound of the
|
2008-01-03 15:07:10 +01:00
|
|
|
|
nth index (numbering from 1) if WHICH is 0, and the upper bound if
|
|
|
|
|
WHICH is 1. This routine will also work for arrays with bounds
|
2004-06-02 11:55:36 +02:00
|
|
|
|
supplied by run-time quantities other than discriminants. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
static LONGEST
|
2002-09-08 19:44:22 +02:00
|
|
|
|
ada_array_bound (struct value *arr, int n, int which)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *arr_type = value_type (arr);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (arr_type))
|
|
|
|
|
return ada_array_bound (decode_constrained_packed_array (arr), n, which);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (ada_is_simple_array_type (arr_type))
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return ada_array_bound_from_type (arr_type, n, which);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return value_as_long (desc_one_bound (desc_bounds (arr), n, which));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given that arr is an array value, returns the length of the
|
|
|
|
|
nth index. This routine will also work for arrays with bounds
|
2004-06-02 11:55:36 +02:00
|
|
|
|
supplied by run-time quantities other than discriminants.
|
|
|
|
|
Does not work for arrays indexed by enumeration types with representation
|
|
|
|
|
clauses at the moment. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
static LONGEST
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_array_length (struct value *arr, int n)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *arr_type = ada_check_typedef (value_type (arr));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (arr_type))
|
|
|
|
|
return ada_array_length (decode_constrained_packed_array (arr), n);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ada_is_simple_array_type (arr_type))
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return (ada_array_bound_from_type (arr_type, n, 1)
|
|
|
|
|
- ada_array_bound_from_type (arr_type, n, 0) + 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return (value_as_long (desc_one_bound (desc_bounds (arr), n, 1))
|
|
|
|
|
- value_as_long (desc_one_bound (desc_bounds (arr), n, 0)) + 1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An empty array whose type is that of ARR_TYPE (an array type),
|
|
|
|
|
with bounds LOW to LOW-1. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
empty_array (struct type *arr_type, int low)
|
|
|
|
|
{
|
2004-09-18 12:11:06 +02:00
|
|
|
|
struct type *index_type =
|
2004-07-01 12:30:57 +02:00
|
|
|
|
create_range_type (NULL, TYPE_TARGET_TYPE (TYPE_INDEX_TYPE (arr_type)),
|
|
|
|
|
low, low - 1);
|
|
|
|
|
struct type *elt_type = ada_array_element_type (arr_type, 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-07-01 12:30:57 +02:00
|
|
|
|
return allocate_value (create_array_type (NULL, elt_type, index_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Name resolution */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The "decoded" name for the user-definable Ada operator corresponding
|
|
|
|
|
to OP. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static const char *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_decoded_op_name (enum exp_opcode op)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (i = 0; ada_opname_table[i].encoded != NULL; i += 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (ada_opname_table[i].op == op)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_opname_table[i].decoded;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Could not find operator name for opcode"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Same as evaluate_type (*EXP), but resolves ambiguous symbol
|
|
|
|
|
references (marked by OP_VAR_VALUE nodes in which the symbol has an
|
|
|
|
|
undefined namespace) and converts operators that are
|
|
|
|
|
user-defined into appropriate function calls. If CONTEXT_TYPE is
|
2002-06-04 17:28:49 +02:00
|
|
|
|
non-null, it provides a preferred result type [at the moment, only
|
|
|
|
|
type void has any effect---causing procedures to be preferred over
|
|
|
|
|
functions in calls]. A null CONTEXT_TYPE indicates that a non-void
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type is preferred. May change (expand) *EXP. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static void
|
|
|
|
|
resolve (struct expression **expp, int void_context_p)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-06-29 19:31:24 +02:00
|
|
|
|
struct type *context_type = NULL;
|
|
|
|
|
int pc = 0;
|
|
|
|
|
|
|
|
|
|
if (void_context_p)
|
|
|
|
|
context_type = builtin_type ((*expp)->gdbarch)->builtin_void;
|
|
|
|
|
|
|
|
|
|
resolve_subexp (expp, &pc, 1, context_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Resolve the operator of the subexpression beginning at
|
|
|
|
|
position *POS of *EXPP. "Resolving" consists of replacing
|
|
|
|
|
the symbols that have undefined namespaces in OP_VAR_VALUE nodes
|
|
|
|
|
with their resolutions, replacing built-in operators with
|
|
|
|
|
function calls to user-defined operators, where appropriate, and,
|
|
|
|
|
when DEPROCEDURE_P is non-zero, converting function-valued variables
|
|
|
|
|
into parameterless calls. May expand *EXPP. The CONTEXT_TYPE functions
|
|
|
|
|
are as in ada_resolve, above. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
resolve_subexp (struct expression **expp, int *pos, int deprocedure_p,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct type *context_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int pc = *pos;
|
|
|
|
|
int i;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct expression *exp; /* Convenience: == *expp. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
enum exp_opcode op = (*expp)->elts[pc].opcode;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value **argvec; /* Vector of operand types (alloca'ed). */
|
|
|
|
|
int nargs; /* Number of operands. */
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
int oplen;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
argvec = NULL;
|
|
|
|
|
nargs = 0;
|
|
|
|
|
exp = *expp;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Pass one: resolve operands, saving their types and updating *pos,
|
|
|
|
|
if needed. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
switch (op)
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_FUNCALL:
|
|
|
|
|
if (exp->elts[pc + 3].opcode == OP_VAR_VALUE
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
|
|
|
|
|
*pos += 7;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*pos += 3;
|
|
|
|
|
resolve_subexp (expp, pos, 0, NULL);
|
|
|
|
|
}
|
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_ADDR:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*pos += 1;
|
|
|
|
|
resolve_subexp (expp, pos, 0, NULL);
|
|
|
|
|
break;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case UNOP_QUAL:
|
|
|
|
|
*pos += 3;
|
2009-03-24 03:07:07 +01:00
|
|
|
|
resolve_subexp (expp, pos, 1, check_typedef (exp->elts[pc + 1].type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case OP_ATR_MODULUS:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_ATR_SIZE:
|
|
|
|
|
case OP_ATR_TAG:
|
|
|
|
|
case OP_ATR_FIRST:
|
|
|
|
|
case OP_ATR_LAST:
|
|
|
|
|
case OP_ATR_LENGTH:
|
|
|
|
|
case OP_ATR_POS:
|
|
|
|
|
case OP_ATR_VAL:
|
|
|
|
|
case OP_ATR_MIN:
|
|
|
|
|
case OP_ATR_MAX:
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case TERNOP_IN_RANGE:
|
|
|
|
|
case BINOP_IN_BOUNDS:
|
|
|
|
|
case UNOP_IN_RANGE:
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
case OP_OTHERS:
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
case OP_POSITIONAL:
|
|
|
|
|
case OP_DISCRETE_RANGE:
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
ada_forward_operator_length (exp, pc, &oplen, &nargs);
|
|
|
|
|
*pos += oplen;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BINOP_ASSIGN:
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *arg1;
|
|
|
|
|
|
|
|
|
|
*pos += 1;
|
|
|
|
|
arg1 = resolve_subexp (expp, pos, 0, NULL);
|
|
|
|
|
if (arg1 == NULL)
|
|
|
|
|
resolve_subexp (expp, pos, 1, NULL);
|
|
|
|
|
else
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
resolve_subexp (expp, pos, 1, value_type (arg1));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_CAST:
|
|
|
|
|
*pos += 3;
|
|
|
|
|
nargs = 1;
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case BINOP_ADD:
|
|
|
|
|
case BINOP_SUB:
|
|
|
|
|
case BINOP_MUL:
|
|
|
|
|
case BINOP_DIV:
|
|
|
|
|
case BINOP_REM:
|
|
|
|
|
case BINOP_MOD:
|
|
|
|
|
case BINOP_EXP:
|
|
|
|
|
case BINOP_CONCAT:
|
|
|
|
|
case BINOP_LOGICAL_AND:
|
|
|
|
|
case BINOP_LOGICAL_OR:
|
|
|
|
|
case BINOP_BITWISE_AND:
|
|
|
|
|
case BINOP_BITWISE_IOR:
|
|
|
|
|
case BINOP_BITWISE_XOR:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case BINOP_EQUAL:
|
|
|
|
|
case BINOP_NOTEQUAL:
|
|
|
|
|
case BINOP_LESS:
|
|
|
|
|
case BINOP_GTR:
|
|
|
|
|
case BINOP_LEQ:
|
|
|
|
|
case BINOP_GEQ:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case BINOP_REPEAT:
|
|
|
|
|
case BINOP_SUBSCRIPT:
|
|
|
|
|
case BINOP_COMMA:
|
2007-08-15 20:43:15 +02:00
|
|
|
|
*pos += 1;
|
|
|
|
|
nargs = 2;
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_NEG:
|
|
|
|
|
case UNOP_PLUS:
|
|
|
|
|
case UNOP_LOGICAL_NOT:
|
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
case UNOP_IND:
|
|
|
|
|
*pos += 1;
|
|
|
|
|
nargs = 1;
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_LONG:
|
|
|
|
|
case OP_DOUBLE:
|
|
|
|
|
case OP_VAR_VALUE:
|
|
|
|
|
*pos += 4;
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_TYPE:
|
|
|
|
|
case OP_BOOL:
|
|
|
|
|
case OP_LAST:
|
|
|
|
|
case OP_INTERNALVAR:
|
|
|
|
|
*pos += 3;
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_MEMVAL:
|
|
|
|
|
*pos += 3;
|
|
|
|
|
nargs = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-06-13 19:11:09 +02:00
|
|
|
|
case OP_REGISTER:
|
|
|
|
|
*pos += 4 + BYTES_TO_EXP_ELEM (exp->elts[pc + 1].longconst + 1);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
|
*pos += 4 + BYTES_TO_EXP_ELEM (exp->elts[pc + 1].longconst + 1);
|
|
|
|
|
nargs = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
|
*pos += 1;
|
|
|
|
|
nargs = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case OP_STRING:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
break;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
default:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Unexpected operator during name resolution"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
argvec = (struct value * *) alloca (sizeof (struct value *) * (nargs + 1));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (i = 0; i < nargs; i += 1)
|
|
|
|
|
argvec[i] = resolve_subexp (expp, pos, 1, NULL);
|
|
|
|
|
argvec[i] = NULL;
|
|
|
|
|
exp = *expp;
|
|
|
|
|
|
|
|
|
|
/* Pass two: perform any resolution on principal operator. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_VAR_VALUE:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
struct ada_symbol_info *candidates;
|
|
|
|
|
int n_candidates;
|
|
|
|
|
|
|
|
|
|
n_candidates =
|
|
|
|
|
ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME
|
|
|
|
|
(exp->elts[pc + 2].symbol),
|
|
|
|
|
exp->elts[pc + 1].block, VAR_DOMAIN,
|
|
|
|
|
&candidates);
|
|
|
|
|
|
|
|
|
|
if (n_candidates > 1)
|
|
|
|
|
{
|
|
|
|
|
/* Types tend to get re-introduced locally, so if there
|
|
|
|
|
are any local symbols that are not types, first filter
|
|
|
|
|
out all types. */
|
|
|
|
|
int j;
|
|
|
|
|
for (j = 0; j < n_candidates; j += 1)
|
|
|
|
|
switch (SYMBOL_CLASS (candidates[j].sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_COMPUTED:
|
|
|
|
|
goto FoundNonType;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
FoundNonType:
|
|
|
|
|
if (j < n_candidates)
|
|
|
|
|
{
|
|
|
|
|
j = 0;
|
|
|
|
|
while (j < n_candidates)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_CLASS (candidates[j].sym) == LOC_TYPEDEF)
|
|
|
|
|
{
|
|
|
|
|
candidates[j] = candidates[n_candidates - 1];
|
|
|
|
|
n_candidates -= 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
j += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n_candidates == 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("No definition found for %s"),
|
2004-06-27 21:06:23 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
|
|
|
|
|
else if (n_candidates == 1)
|
|
|
|
|
i = 0;
|
|
|
|
|
else if (deprocedure_p
|
|
|
|
|
&& !is_nonfunction (candidates, n_candidates))
|
|
|
|
|
{
|
2004-06-28 20:59:14 +02:00
|
|
|
|
i = ada_resolve_function
|
|
|
|
|
(candidates, n_candidates, NULL, 0,
|
|
|
|
|
SYMBOL_LINKAGE_NAME (exp->elts[pc + 2].symbol),
|
|
|
|
|
context_type);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (i < 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Could not find a match for %s"),
|
2004-06-27 21:06:23 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_filtered (_("Multiple matches for %s\n"),
|
2004-06-27 21:06:23 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
|
|
|
|
|
user_select_syms (candidates, n_candidates, 1);
|
|
|
|
|
i = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
exp->elts[pc + 1].block = candidates[i].block;
|
|
|
|
|
exp->elts[pc + 2].symbol = candidates[i].sym;
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (innermost_block == NULL
|
|
|
|
|
|| contained_in (candidates[i].block, innermost_block))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
innermost_block = candidates[i].block;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (deprocedure_p
|
|
|
|
|
&& (TYPE_CODE (SYMBOL_TYPE (exp->elts[pc + 2].symbol))
|
|
|
|
|
== TYPE_CODE_FUNC))
|
|
|
|
|
{
|
|
|
|
|
replace_operator_with_call (expp, pc, 0, 0,
|
|
|
|
|
exp->elts[pc + 2].symbol,
|
|
|
|
|
exp->elts[pc + 1].block);
|
|
|
|
|
exp = *expp;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_FUNCALL:
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (exp->elts[pc + 3].opcode == OP_VAR_VALUE
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct ada_symbol_info *candidates;
|
|
|
|
|
int n_candidates;
|
|
|
|
|
|
|
|
|
|
n_candidates =
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_lookup_symbol_list (SYMBOL_LINKAGE_NAME
|
|
|
|
|
(exp->elts[pc + 5].symbol),
|
|
|
|
|
exp->elts[pc + 4].block, VAR_DOMAIN,
|
|
|
|
|
&candidates);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (n_candidates == 1)
|
|
|
|
|
i = 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-06-28 20:59:14 +02:00
|
|
|
|
i = ada_resolve_function
|
|
|
|
|
(candidates, n_candidates,
|
|
|
|
|
argvec, nargs,
|
|
|
|
|
SYMBOL_LINKAGE_NAME (exp->elts[pc + 5].symbol),
|
|
|
|
|
context_type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (i < 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Could not find a match for %s"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 5].symbol));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
exp->elts[pc + 4].block = candidates[i].block;
|
|
|
|
|
exp->elts[pc + 5].symbol = candidates[i].sym;
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (innermost_block == NULL
|
|
|
|
|
|| contained_in (candidates[i].block, innermost_block))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
innermost_block = candidates[i].block;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case BINOP_ADD:
|
|
|
|
|
case BINOP_SUB:
|
|
|
|
|
case BINOP_MUL:
|
|
|
|
|
case BINOP_DIV:
|
|
|
|
|
case BINOP_REM:
|
|
|
|
|
case BINOP_MOD:
|
|
|
|
|
case BINOP_CONCAT:
|
|
|
|
|
case BINOP_BITWISE_AND:
|
|
|
|
|
case BINOP_BITWISE_IOR:
|
|
|
|
|
case BINOP_BITWISE_XOR:
|
|
|
|
|
case BINOP_EQUAL:
|
|
|
|
|
case BINOP_NOTEQUAL:
|
|
|
|
|
case BINOP_LESS:
|
|
|
|
|
case BINOP_GTR:
|
|
|
|
|
case BINOP_LEQ:
|
|
|
|
|
case BINOP_GEQ:
|
|
|
|
|
case BINOP_EXP:
|
|
|
|
|
case UNOP_NEG:
|
|
|
|
|
case UNOP_PLUS:
|
|
|
|
|
case UNOP_LOGICAL_NOT:
|
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
if (possible_user_operator_p (op, argvec))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct ada_symbol_info *candidates;
|
|
|
|
|
int n_candidates;
|
|
|
|
|
|
|
|
|
|
n_candidates =
|
|
|
|
|
ada_lookup_symbol_list (ada_encode (ada_decoded_op_name (op)),
|
|
|
|
|
(struct block *) NULL, VAR_DOMAIN,
|
|
|
|
|
&candidates);
|
|
|
|
|
i = ada_resolve_function (candidates, n_candidates, argvec, nargs,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_decoded_op_name (op), NULL);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (i < 0)
|
|
|
|
|
break;
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
replace_operator_with_call (expp, pc, nargs, 1,
|
|
|
|
|
candidates[i].sym, candidates[i].block);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
exp = *expp;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
break;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case OP_TYPE:
|
2008-01-03 20:15:10 +01:00
|
|
|
|
case OP_REGISTER:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*pos = pc;
|
|
|
|
|
return evaluate_subexp_type (exp, pos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return non-zero if formal type FTYPE matches actual type ATYPE. If
|
2004-06-02 11:55:36 +02:00
|
|
|
|
MAY_DEREF is non-zero, the formal may be a pointer and the actual
|
2009-11-19 23:37:35 +01:00
|
|
|
|
a non-pointer. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* The term "match" here is rather loose. The match is heuristic and
|
2009-11-19 23:37:35 +01:00
|
|
|
|
liberal. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-09-08 19:44:22 +02:00
|
|
|
|
ada_type_match (struct type *ftype, struct type *atype, int may_deref)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
ftype = ada_check_typedef (ftype);
|
|
|
|
|
atype = ada_check_typedef (atype);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_REF)
|
|
|
|
|
ftype = TYPE_TARGET_TYPE (ftype);
|
|
|
|
|
if (TYPE_CODE (atype) == TYPE_CODE_REF)
|
|
|
|
|
atype = TYPE_TARGET_TYPE (atype);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (TYPE_CODE (ftype))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
default:
|
2009-11-19 23:37:35 +01:00
|
|
|
|
return TYPE_CODE (ftype) == TYPE_CODE (atype);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case TYPE_CODE_PTR:
|
|
|
|
|
if (TYPE_CODE (atype) == TYPE_CODE_PTR)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_type_match (TYPE_TARGET_TYPE (ftype),
|
|
|
|
|
TYPE_TARGET_TYPE (atype), 0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-27 21:28:20 +02:00
|
|
|
|
return (may_deref
|
|
|
|
|
&& ada_type_match (TYPE_TARGET_TYPE (ftype), atype, 0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
switch (TYPE_CODE (atype))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (TYPE_CODE (atype) == TYPE_CODE_ARRAY
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| ada_is_array_descriptor_type (atype));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ada_is_array_descriptor_type (ftype))
|
|
|
|
|
return (TYPE_CODE (atype) == TYPE_CODE_ARRAY
|
|
|
|
|
|| ada_is_array_descriptor_type (atype));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return (TYPE_CODE (atype) == TYPE_CODE_STRUCT
|
|
|
|
|
&& !ada_is_array_descriptor_type (atype));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
case TYPE_CODE_FLT:
|
|
|
|
|
return (TYPE_CODE (atype) == TYPE_CODE (ftype));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return non-zero if the formals of FUNC "sufficiently match" the
|
|
|
|
|
vector of actual argument types ACTUALS of size N_ACTUALS. FUNC
|
|
|
|
|
may also be an enumeral, in which case it is treated as a 0-
|
2004-06-02 11:55:36 +02:00
|
|
|
|
argument function. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_args_match (struct symbol *func, struct value **actuals, int n_actuals)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *func_type = SYMBOL_TYPE (func);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (SYMBOL_CLASS (func) == LOC_CONST
|
|
|
|
|
&& TYPE_CODE (func_type) == TYPE_CODE_ENUM)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (n_actuals == 0);
|
|
|
|
|
else if (func_type == NULL || TYPE_CODE (func_type) != TYPE_CODE_FUNC)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (TYPE_NFIELDS (func_type) != n_actuals)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_actuals; i += 1)
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (actuals[i] == NULL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-05-18 21:23:37 +02:00
|
|
|
|
struct type *ftype = ada_check_typedef (TYPE_FIELD_TYPE (func_type,
|
|
|
|
|
i));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *atype = ada_check_typedef (value_type (actuals[i]));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (!ada_type_match (ftype, atype, 1))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* False iff function type FUNC_TYPE definitely does not produce a value
|
|
|
|
|
compatible with type CONTEXT_TYPE. Conservatively returns 1 if
|
|
|
|
|
FUNC_TYPE is not a valid function type with a non-null return type
|
|
|
|
|
or an enumerated type. A null CONTEXT_TYPE indicates any non-void type. */
|
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return_match (struct type *func_type, struct type *context_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *return_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (func_type == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (func_type) == TYPE_CODE_FUNC)
|
|
|
|
|
return_type = base_type (TYPE_TARGET_TYPE (func_type));
|
|
|
|
|
else
|
|
|
|
|
return_type = base_type (func_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (return_type == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
context_type = base_type (context_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (return_type) == TYPE_CODE_ENUM)
|
|
|
|
|
return context_type == NULL || return_type == context_type;
|
|
|
|
|
else if (context_type == NULL)
|
|
|
|
|
return TYPE_CODE (return_type) != TYPE_CODE_VOID;
|
|
|
|
|
else
|
|
|
|
|
return TYPE_CODE (return_type) == TYPE_CODE (context_type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Returns the index in SYMS[0..NSYMS-1] that contains the symbol for the
|
2002-06-04 17:28:49 +02:00
|
|
|
|
function (if any) that matches the types of the NARGS arguments in
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ARGS. If CONTEXT_TYPE is non-null and there is at least one match
|
|
|
|
|
that returns that type, then eliminate matches that don't. If
|
|
|
|
|
CONTEXT_TYPE is void and there is at least one match that does not
|
|
|
|
|
return void, eliminate all matches that do.
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
Asks the user if there is more than one match remaining. Returns -1
|
|
|
|
|
if there is no such symbol or none is selected. NAME is used
|
2004-06-02 11:55:36 +02:00
|
|
|
|
solely for messages. May re-arrange and modify SYMS in
|
|
|
|
|
the process; the index returned is for the modified vector. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static int
|
|
|
|
|
ada_resolve_function (struct ada_symbol_info syms[],
|
|
|
|
|
int nsyms, struct value **args, int nargs,
|
|
|
|
|
const char *name, struct type *context_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-06-29 19:31:24 +02:00
|
|
|
|
int fallback;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int k;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int m; /* Number of hits */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
m = 0;
|
2009-06-29 19:31:24 +02:00
|
|
|
|
/* In the first pass of the loop, we only accept functions matching
|
|
|
|
|
context_type. If none are found, we add a second pass of the loop
|
|
|
|
|
where every function is accepted. */
|
|
|
|
|
for (fallback = 0; m == 0 && fallback < 2; fallback++)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
for (k = 0; k < nsyms; k += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
struct type *type = ada_check_typedef (SYMBOL_TYPE (syms[k].sym));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
if (ada_args_match (syms[k].sym, args, nargs)
|
2009-06-29 19:31:24 +02:00
|
|
|
|
&& (fallback || return_match (type, context_type)))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
syms[m] = syms[k];
|
|
|
|
|
m += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (m == 0)
|
|
|
|
|
return -1;
|
|
|
|
|
else if (m > 1)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_filtered (_("Multiple matches for %s\n"), name);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
user_select_syms (syms, m, 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Returns true (non-zero) iff decoded name N0 should appear before N1
|
|
|
|
|
in a listing of choices during disambiguation (see sort_choices, below).
|
|
|
|
|
The idea is that overloadings of a subprogram name from the
|
|
|
|
|
same package should sort in their source order. We settle for ordering
|
|
|
|
|
such symbols by their trailing number (__N or $N). */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
encoded_ordered_before (char *N0, char *N1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (N1 == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
else if (N0 == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int k0, k1;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (k0 = strlen (N0) - 1; k0 > 0 && isdigit (N0[k0]); k0 -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (k1 = strlen (N1) - 1; k1 > 0 && isdigit (N1[k1]); k1 -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if ((N0[k0] == '_' || N0[k0] == '$') && N0[k0 + 1] != '\000'
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& (N1[k1] == '_' || N1[k1] == '$') && N1[k1 + 1] != '\000')
|
|
|
|
|
{
|
|
|
|
|
int n0, n1;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
n0 = k0;
|
|
|
|
|
while (N0[n0] == '_' && n0 > 0 && N0[n0 - 1] == '_')
|
|
|
|
|
n0 -= 1;
|
|
|
|
|
n1 = k1;
|
|
|
|
|
while (N1[n1] == '_' && n1 > 0 && N1[n1 - 1] == '_')
|
|
|
|
|
n1 -= 1;
|
|
|
|
|
if (n0 == n1 && strncmp (N0, N1, n0) == 0)
|
|
|
|
|
return (atoi (N0 + k0 + 1) < atoi (N1 + k1 + 1));
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (strcmp (N0, N1) < 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Sort SYMS[0..NSYMS-1] to put the choices in a canonical order by the
|
|
|
|
|
encoded names. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static void
|
2004-06-02 11:55:36 +02:00
|
|
|
|
sort_choices (struct ada_symbol_info syms[], int nsyms)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int i;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (i = 1; i < nsyms; i += 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct ada_symbol_info sym = syms[i];
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int j;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (j = i - 1; j >= 0; j -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (encoded_ordered_before (SYMBOL_LINKAGE_NAME (syms[j].sym),
|
|
|
|
|
SYMBOL_LINKAGE_NAME (sym.sym)))
|
|
|
|
|
break;
|
|
|
|
|
syms[j + 1] = syms[j];
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
syms[j + 1] = sym;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Given a list of NSYMS symbols in SYMS, select up to MAX_RESULTS>0
|
|
|
|
|
by asking the user (if necessary), returning the number selected,
|
|
|
|
|
and setting the first elements of SYMS items. Error if no symbols
|
|
|
|
|
selected. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* NOTE: Adapted from decode_line_2 in symtab.c, with which it ought
|
2004-06-02 11:55:36 +02:00
|
|
|
|
to be re-integrated one of these days. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
user_select_syms (struct ada_symbol_info *syms, int nsyms, int max_results)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
int *chosen = (int *) alloca (sizeof (int) * nsyms);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int n_chosen;
|
|
|
|
|
int first_choice = (max_results == 1) ? 1 : 2;
|
2008-04-03 23:39:16 +02:00
|
|
|
|
const char *select_mode = multiple_symbols_select_mode ();
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (max_results < 1)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Request to select 0 symbols!"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (nsyms <= 1)
|
|
|
|
|
return nsyms;
|
|
|
|
|
|
2008-04-03 23:39:16 +02:00
|
|
|
|
if (select_mode == multiple_symbols_cancel)
|
|
|
|
|
error (_("\
|
|
|
|
|
canceled because the command is ambiguous\n\
|
|
|
|
|
See set/show multiple-symbol."));
|
|
|
|
|
|
|
|
|
|
/* If select_mode is "all", then return all possible symbols.
|
|
|
|
|
Only do that if more than one symbol can be selected, of course.
|
|
|
|
|
Otherwise, display the menu as usual. */
|
|
|
|
|
if (select_mode == multiple_symbols_all && max_results > 1)
|
|
|
|
|
return nsyms;
|
|
|
|
|
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_unfiltered (_("[0] cancel\n"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (max_results > 1)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_unfiltered (_("[1] all\n"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
sort_choices (syms, nsyms);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < nsyms; i += 1)
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (syms[i].sym == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_CLASS (syms[i].sym) == LOC_BLOCK)
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct symtab_and_line sal =
|
|
|
|
|
find_function_start_sal (syms[i].sym, 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-12-12 18:06:26 +01:00
|
|
|
|
if (sal.symtab == NULL)
|
|
|
|
|
printf_unfiltered (_("[%d] %s at <no source file available>:%d\n"),
|
|
|
|
|
i + first_choice,
|
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym),
|
|
|
|
|
sal.line);
|
|
|
|
|
else
|
|
|
|
|
printf_unfiltered (_("[%d] %s at %s:%d\n"), i + first_choice,
|
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym),
|
|
|
|
|
sal.symtab->filename, sal.line);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int is_enumeral =
|
|
|
|
|
(SYMBOL_CLASS (syms[i].sym) == LOC_CONST
|
|
|
|
|
&& SYMBOL_TYPE (syms[i].sym) != NULL
|
|
|
|
|
&& TYPE_CODE (SYMBOL_TYPE (syms[i].sym)) == TYPE_CODE_ENUM);
|
2009-04-16 19:21:06 +02:00
|
|
|
|
struct symtab *symtab = syms[i].sym->symtab;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
if (SYMBOL_LINE (syms[i].sym) != 0 && symtab != NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_unfiltered (_("[%d] %s at %s:%d\n"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
i + first_choice,
|
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym),
|
|
|
|
|
symtab->filename, SYMBOL_LINE (syms[i].sym));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
else if (is_enumeral
|
|
|
|
|
&& TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 01:39:24 +01:00
|
|
|
|
printf_unfiltered (("[%d] "), i + first_choice);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_print_type (SYMBOL_TYPE (syms[i].sym), NULL,
|
|
|
|
|
gdb_stdout, -1, 0);
|
2004-12-12 18:06:26 +01:00
|
|
|
|
printf_unfiltered (_("'(%s) (enumeral)\n"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym));
|
|
|
|
|
}
|
|
|
|
|
else if (symtab != NULL)
|
|
|
|
|
printf_unfiltered (is_enumeral
|
2004-12-12 18:06:26 +01:00
|
|
|
|
? _("[%d] %s in %s (enumeral)\n")
|
|
|
|
|
: _("[%d] %s at %s:?\n"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
i + first_choice,
|
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym),
|
|
|
|
|
symtab->filename);
|
|
|
|
|
else
|
|
|
|
|
printf_unfiltered (is_enumeral
|
2004-12-12 18:06:26 +01:00
|
|
|
|
? _("[%d] %s (enumeral)\n")
|
|
|
|
|
: _("[%d] %s at ?\n"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
i + first_choice,
|
|
|
|
|
SYMBOL_PRINT_NAME (syms[i].sym));
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
n_chosen = get_selections (chosen, nsyms, max_results, max_results > 1,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
"overload-choice");
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_chosen; i += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
syms[i] = syms[chosen[i]];
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return n_chosen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read and validate a set of numeric choices from the user in the
|
2004-06-02 11:55:36 +02:00
|
|
|
|
range 0 .. N_CHOICES-1. Place the results in increasing
|
2002-06-04 17:28:49 +02:00
|
|
|
|
order in CHOICES[0 .. N-1], and return N.
|
|
|
|
|
|
|
|
|
|
The user types choices as a sequence of numbers on one line
|
|
|
|
|
separated by blanks, encoding them as follows:
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
+ A choice of 0 means to cancel the selection, throwing an error.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
+ If IS_ALL_CHOICE, a choice of 1 selects the entire set 0 .. N_CHOICES-1.
|
|
|
|
|
+ The user chooses k by typing k+IS_ALL_CHOICE+1.
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
The user is not allowed to choose more than MAX_RESULTS values.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
ANNOTATION_SUFFIX, if present, is used to annotate the input
|
2004-06-02 11:55:36 +02:00
|
|
|
|
prompts (for use with the -f switch). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
get_selections (int *choices, int n_choices, int max_results,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int is_all_choice, char *annotation_suffix)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *args;
|
2008-04-23 00:23:16 +02:00
|
|
|
|
char *prompt;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int n_chosen;
|
|
|
|
|
int first_choice = is_all_choice ? 2 : 1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
prompt = getenv ("PS2");
|
|
|
|
|
if (prompt == NULL)
|
2008-04-23 00:23:16 +02:00
|
|
|
|
prompt = "> ";
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-04-23 00:23:16 +02:00
|
|
|
|
args = command_line_input (prompt, 0, annotation_suffix);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (args == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error_no_arg (_("one or more choice numbers"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
n_chosen = 0;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Set choices[0 .. n_chosen-1] to the users' choices in ascending
|
|
|
|
|
order, as given in args. Choices are validated. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *args2;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int choice, j;
|
|
|
|
|
|
|
|
|
|
while (isspace (*args))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
args += 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (*args == '\0' && n_chosen == 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error_no_arg (_("one or more choice numbers"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (*args == '\0')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
choice = strtol (args, &args2, 10);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (args == args2 || choice < 0
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| choice > n_choices + first_choice - 1)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Argument must be choice number"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
args = args2;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (choice == 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("cancelled"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (choice < first_choice)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
n_chosen = n_choices;
|
|
|
|
|
for (j = 0; j < n_choices; j += 1)
|
|
|
|
|
choices[j] = j;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
choice -= first_choice;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (j = n_chosen - 1; j >= 0 && choice < choices[j]; j -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (j < 0 || choice != choices[j])
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int k;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (k = n_chosen - 1; k > j; k -= 1)
|
|
|
|
|
choices[k + 1] = choices[k];
|
|
|
|
|
choices[j + 1] = choice;
|
|
|
|
|
n_chosen += 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n_chosen > max_results)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Select no more than %d of the above"), max_results);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return n_chosen;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Replace the operator of length OPLEN at position PC in *EXPP with a call
|
|
|
|
|
on the function identified by SYM and BLOCK, and taking NARGS
|
|
|
|
|
arguments. Update *EXPP as needed to hold more space. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2002-08-18 20:11:12 +02:00
|
|
|
|
replace_operator_with_call (struct expression **expp, int pc, int nargs,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int oplen, struct symbol *sym,
|
|
|
|
|
struct block *block)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
/* A new expression, with 6 more elements (3 for funcall, 4 for function
|
2004-06-02 11:55:36 +02:00
|
|
|
|
symbol, -oplen for operator being replaced). */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct expression *newexp = (struct expression *)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
xmalloc (sizeof (struct expression)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
+ EXP_ELEM_TO_BYTES ((*expp)->nelts + 7 - oplen));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct expression *exp = *expp;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
newexp->nelts = exp->nelts + 7 - oplen;
|
|
|
|
|
newexp->language_defn = exp->language_defn;
|
|
|
|
|
memcpy (newexp->elts, exp->elts, EXP_ELEM_TO_BYTES (pc));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
memcpy (newexp->elts + pc + 7, exp->elts + pc + oplen,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
EXP_ELEM_TO_BYTES (exp->nelts - pc - oplen));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
newexp->elts[pc].opcode = newexp->elts[pc + 2].opcode = OP_FUNCALL;
|
|
|
|
|
newexp->elts[pc + 1].longconst = (LONGEST) nargs;
|
|
|
|
|
|
|
|
|
|
newexp->elts[pc + 3].opcode = newexp->elts[pc + 6].opcode = OP_VAR_VALUE;
|
|
|
|
|
newexp->elts[pc + 4].block = block;
|
|
|
|
|
newexp->elts[pc + 5].symbol = sym;
|
|
|
|
|
|
|
|
|
|
*expp = newexp;
|
2002-07-13 14:25:16 +02:00
|
|
|
|
xfree (exp);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Type-class predicates */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE is numeric (i.e., an INT, RANGE (of numeric type),
|
|
|
|
|
or FLOAT). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
numeric_type_p (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_FLT:
|
|
|
|
|
return 1;
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
return (type == TYPE_TARGET_TYPE (type)
|
|
|
|
|
|| numeric_type_p (TYPE_TARGET_TYPE (type)));
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE is integral (an INT or RANGE of INTs). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
integer_type_p (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
return 1;
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
return (type == TYPE_TARGET_TYPE (type)
|
|
|
|
|
|| integer_type_p (TYPE_TARGET_TYPE (type)));
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE is scalar (INT, RANGE, FLOAT, ENUM). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
scalar_type_p (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
case TYPE_CODE_FLT:
|
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff TYPE is discrete (INT, RANGE, ENUM). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
discrete_type_p (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (TYPE_CODE (type))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
case TYPE_CODE_ENUM:
|
2009-11-19 23:45:56 +01:00
|
|
|
|
case TYPE_CODE_BOOL:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Returns non-zero if OP with operands in the vector ARGS could be
|
|
|
|
|
a user-defined function. Errs on the side of pre-defined operators
|
|
|
|
|
(i.e., result 0). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
possible_user_operator_p (enum exp_opcode op, struct value *args[])
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct type *type0 =
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
(args[0] == NULL) ? NULL : ada_check_typedef (value_type (args[0]));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *type1 =
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
(args[1] == NULL) ? NULL : ada_check_typedef (value_type (args[1]));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (type0 == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case BINOP_ADD:
|
|
|
|
|
case BINOP_SUB:
|
|
|
|
|
case BINOP_MUL:
|
|
|
|
|
case BINOP_DIV:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (!(numeric_type_p (type0) && numeric_type_p (type1)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_REM:
|
|
|
|
|
case BINOP_MOD:
|
|
|
|
|
case BINOP_BITWISE_AND:
|
|
|
|
|
case BINOP_BITWISE_IOR:
|
|
|
|
|
case BINOP_BITWISE_XOR:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (!(integer_type_p (type0) && integer_type_p (type1)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_EQUAL:
|
|
|
|
|
case BINOP_NOTEQUAL:
|
|
|
|
|
case BINOP_LESS:
|
|
|
|
|
case BINOP_GTR:
|
|
|
|
|
case BINOP_LEQ:
|
|
|
|
|
case BINOP_GEQ:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (!(scalar_type_p (type0) && scalar_type_p (type1)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_CONCAT:
|
2007-08-15 20:36:37 +02:00
|
|
|
|
return !ada_is_array_type (type0) || !ada_is_array_type (type1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_EXP:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (!(numeric_type_p (type0) && integer_type_p (type1)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case UNOP_NEG:
|
|
|
|
|
case UNOP_PLUS:
|
|
|
|
|
case UNOP_LOGICAL_NOT:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
return (!numeric_type_p (type0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Renaming */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
/* NOTES:
|
|
|
|
|
|
|
|
|
|
1. In the following, we assume that a renaming type's name may
|
|
|
|
|
have an ___XD suffix. It would be nice if this went away at some
|
|
|
|
|
point.
|
|
|
|
|
2. We handle both the (old) purely type-based representation of
|
|
|
|
|
renamings and the (new) variable-based encoding. At some point,
|
|
|
|
|
it is devoutly to be hoped that the former goes away
|
|
|
|
|
(FIXME: hilfinger-2007-07-09).
|
|
|
|
|
3. Subprogram renamings are not implemented, although the XRS
|
|
|
|
|
suffix is recognized (FIXME: hilfinger-2007-07-09). */
|
|
|
|
|
|
|
|
|
|
/* If SYM encodes a renaming,
|
|
|
|
|
|
|
|
|
|
<renaming> renames <renamed entity>,
|
|
|
|
|
|
|
|
|
|
sets *LEN to the length of the renamed entity's name,
|
|
|
|
|
*RENAMED_ENTITY to that name (not null-terminated), and *RENAMING_EXPR to
|
|
|
|
|
the string describing the subcomponent selected from the renamed
|
|
|
|
|
entity. Returns ADA_NOT_RENAMING if SYM does not encode a renaming
|
|
|
|
|
(in which case, the values of *RENAMED_ENTITY, *LEN, and *RENAMING_EXPR
|
|
|
|
|
are undefined). Otherwise, returns a value indicating the category
|
|
|
|
|
of entity renamed: an object (ADA_OBJECT_RENAMING), exception
|
|
|
|
|
(ADA_EXCEPTION_RENAMING), package (ADA_PACKAGE_RENAMING), or
|
|
|
|
|
subprogram (ADA_SUBPROGRAM_RENAMING). Does no allocation; the
|
|
|
|
|
strings returned in *RENAMED_ENTITY and *RENAMING_EXPR should not be
|
|
|
|
|
deallocated. The values of RENAMED_ENTITY, LEN, or RENAMING_EXPR
|
|
|
|
|
may be NULL, in which case they are not assigned.
|
|
|
|
|
|
|
|
|
|
[Currently, however, GCC does not generate subprogram renamings.] */
|
|
|
|
|
|
|
|
|
|
enum ada_renaming_category
|
|
|
|
|
ada_parse_renaming (struct symbol *sym,
|
|
|
|
|
const char **renamed_entity, int *len,
|
|
|
|
|
const char **renaming_expr)
|
|
|
|
|
{
|
|
|
|
|
enum ada_renaming_category kind;
|
|
|
|
|
const char *info;
|
|
|
|
|
const char *suffix;
|
|
|
|
|
|
|
|
|
|
if (sym == NULL)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2007-12-21 12:50:11 +01:00
|
|
|
|
default:
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
return parse_old_style_renaming (SYMBOL_TYPE (sym),
|
|
|
|
|
renamed_entity, len, renaming_expr);
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_COMPUTED:
|
|
|
|
|
case LOC_OPTIMIZED_OUT:
|
|
|
|
|
info = strstr (SYMBOL_LINKAGE_NAME (sym), "___XR");
|
|
|
|
|
if (info == NULL)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
switch (info[5])
|
|
|
|
|
{
|
|
|
|
|
case '_':
|
|
|
|
|
kind = ADA_OBJECT_RENAMING;
|
|
|
|
|
info += 6;
|
|
|
|
|
break;
|
|
|
|
|
case 'E':
|
|
|
|
|
kind = ADA_EXCEPTION_RENAMING;
|
|
|
|
|
info += 7;
|
|
|
|
|
break;
|
|
|
|
|
case 'P':
|
|
|
|
|
kind = ADA_PACKAGE_RENAMING;
|
|
|
|
|
info += 7;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
kind = ADA_SUBPROGRAM_RENAMING;
|
|
|
|
|
info += 7;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
if (renamed_entity != NULL)
|
|
|
|
|
*renamed_entity = info;
|
|
|
|
|
suffix = strstr (info, "___XE");
|
|
|
|
|
if (suffix == NULL || suffix == info)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
if (len != NULL)
|
|
|
|
|
*len = strlen (info) - strlen (suffix);
|
|
|
|
|
suffix += 5;
|
|
|
|
|
if (renaming_expr != NULL)
|
|
|
|
|
*renaming_expr = suffix;
|
|
|
|
|
return kind;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming TYPE encodes a renaming according to the old encoding in
|
|
|
|
|
exp_dbug.ads, returns details of that renaming in *RENAMED_ENTITY,
|
|
|
|
|
*LEN, and *RENAMING_EXPR, as for ada_parse_renaming, above. Returns
|
|
|
|
|
ADA_NOT_RENAMING otherwise. */
|
|
|
|
|
static enum ada_renaming_category
|
|
|
|
|
parse_old_style_renaming (struct type *type,
|
|
|
|
|
const char **renamed_entity, int *len,
|
|
|
|
|
const char **renaming_expr)
|
|
|
|
|
{
|
|
|
|
|
enum ada_renaming_category kind;
|
|
|
|
|
const char *name;
|
|
|
|
|
const char *info;
|
|
|
|
|
const char *suffix;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_ENUM
|
|
|
|
|
|| TYPE_NFIELDS (type) != 1)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
name = type_name_no_tag (type);
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
|
|
|
|
|
name = strstr (name, "___XR");
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
switch (name[5])
|
|
|
|
|
{
|
|
|
|
|
case '\0':
|
|
|
|
|
case '_':
|
|
|
|
|
kind = ADA_OBJECT_RENAMING;
|
|
|
|
|
break;
|
|
|
|
|
case 'E':
|
|
|
|
|
kind = ADA_EXCEPTION_RENAMING;
|
|
|
|
|
break;
|
|
|
|
|
case 'P':
|
|
|
|
|
kind = ADA_PACKAGE_RENAMING;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
kind = ADA_SUBPROGRAM_RENAMING;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
info = TYPE_FIELD_NAME (type, 0);
|
|
|
|
|
if (info == NULL)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
if (renamed_entity != NULL)
|
|
|
|
|
*renamed_entity = info;
|
|
|
|
|
suffix = strstr (info, "___XE");
|
|
|
|
|
if (renaming_expr != NULL)
|
|
|
|
|
*renaming_expr = suffix + 5;
|
|
|
|
|
if (suffix == NULL || suffix == info)
|
|
|
|
|
return ADA_NOT_RENAMING;
|
|
|
|
|
if (len != NULL)
|
|
|
|
|
*len = suffix - info;
|
|
|
|
|
return kind;
|
|
|
|
|
}
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Evaluation: Function Calls */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Return an lvalue containing the value VAL. This is the identity on
|
2010-10-05 00:32:31 +02:00
|
|
|
|
lvalues, and otherwise has the side-effect of allocating memory
|
|
|
|
|
in the inferior where a copy of the value contents is copied. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
2010-10-05 00:32:31 +02:00
|
|
|
|
ensure_lval (struct value *val)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2010-10-05 00:32:31 +02:00
|
|
|
|
if (VALUE_LVAL (val) == not_lval
|
|
|
|
|
|| VALUE_LVAL (val) == lval_internalvar)
|
2004-07-09 21:29:56 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
int len = TYPE_LENGTH (ada_check_typedef (value_type (val)));
|
2010-10-05 00:32:31 +02:00
|
|
|
|
const CORE_ADDR addr =
|
|
|
|
|
value_as_long (value_allocate_space_in_inferior (len));
|
2004-07-09 21:29:56 +02:00
|
|
|
|
|
2010-10-05 00:32:31 +02:00
|
|
|
|
set_value_address (val, addr);
|
2008-01-08 18:40:09 +01:00
|
|
|
|
VALUE_LVAL (val) = lval_memory;
|
2010-10-05 00:32:31 +02:00
|
|
|
|
write_memory (addr, value_contents (val), len);
|
2004-07-09 21:29:56 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the value ACTUAL, converted to be an appropriate value for a
|
|
|
|
|
formal of type FORMAL_TYPE. Use *SP as a stack pointer for
|
|
|
|
|
allocating any necessary descriptors (fat pointers), or copies of
|
2004-06-02 11:55:36 +02:00
|
|
|
|
values not residing in memory, updating it as needed. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-08 20:28:09 +01:00
|
|
|
|
struct value *
|
2010-10-05 00:32:31 +02:00
|
|
|
|
ada_convert_actual (struct value *actual, struct type *formal_type0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *actual_type = ada_check_typedef (value_type (actual));
|
2004-10-08 11:40:12 +02:00
|
|
|
|
struct type *formal_type = ada_check_typedef (formal_type0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *formal_target =
|
|
|
|
|
TYPE_CODE (formal_type) == TYPE_CODE_PTR
|
2004-10-08 11:40:12 +02:00
|
|
|
|
? ada_check_typedef (TYPE_TARGET_TYPE (formal_type)) : formal_type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *actual_target =
|
|
|
|
|
TYPE_CODE (actual_type) == TYPE_CODE_PTR
|
2004-10-08 11:40:12 +02:00
|
|
|
|
? ada_check_typedef (TYPE_TARGET_TYPE (actual_type)) : actual_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ada_is_array_descriptor_type (formal_target)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& TYPE_CODE (actual_target) == TYPE_CODE_ARRAY)
|
2010-10-05 00:32:31 +02:00
|
|
|
|
return make_array_descriptor (formal_type, actual);
|
2008-01-08 18:40:09 +01:00
|
|
|
|
else if (TYPE_CODE (formal_type) == TYPE_CODE_PTR
|
|
|
|
|
|| TYPE_CODE (formal_type) == TYPE_CODE_REF)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-01-08 18:40:09 +01:00
|
|
|
|
struct value *result;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (TYPE_CODE (formal_target) == TYPE_CODE_ARRAY
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& ada_is_array_descriptor_type (actual_target))
|
2008-01-08 18:40:09 +01:00
|
|
|
|
result = desc_data (actual);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (TYPE_CODE (actual_type) != TYPE_CODE_PTR)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (VALUE_LVAL (actual) != lval_memory)
|
|
|
|
|
{
|
|
|
|
|
struct value *val;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
actual_type = ada_check_typedef (value_type (actual));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
val = allocate_value (actual_type);
|
2005-02-02 01:20:07 +01:00
|
|
|
|
memcpy ((char *) value_contents_raw (val),
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
(char *) value_contents (actual),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (actual_type));
|
2010-10-05 00:32:31 +02:00
|
|
|
|
actual = ensure_lval (val);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2008-01-08 18:40:09 +01:00
|
|
|
|
result = value_addr (actual);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2008-01-08 18:40:09 +01:00
|
|
|
|
else
|
|
|
|
|
return actual;
|
|
|
|
|
return value_cast_pointers (formal_type, result);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (actual_type) == TYPE_CODE_PTR)
|
|
|
|
|
return ada_value_ind (actual);
|
|
|
|
|
|
|
|
|
|
return actual;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-21 00:40:36 +02:00
|
|
|
|
/* Convert VALUE (which must be an address) to a CORE_ADDR that is a pointer of
|
|
|
|
|
type TYPE. This is usually an inefficient no-op except on some targets
|
|
|
|
|
(such as AVR) where the representation of a pointer and an address
|
|
|
|
|
differs. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
value_pointer (struct value *value, struct type *type)
|
|
|
|
|
{
|
|
|
|
|
struct gdbarch *gdbarch = get_type_arch (type);
|
|
|
|
|
unsigned len = TYPE_LENGTH (type);
|
|
|
|
|
gdb_byte *buf = alloca (len);
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
|
|
|
|
addr = value_address (value);
|
|
|
|
|
gdbarch_address_to_pointer (gdbarch, type, buf, addr);
|
|
|
|
|
addr = extract_unsigned_integer (buf, len, gdbarch_byte_order (gdbarch));
|
|
|
|
|
return addr;
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Push a descriptor of type TYPE for array value ARR on the stack at
|
|
|
|
|
*SP, updating *SP to reflect the new descriptor. Return either
|
2002-06-04 17:28:49 +02:00
|
|
|
|
an lvalue representing the new descriptor, or (if TYPE is a pointer-
|
2004-06-02 11:55:36 +02:00
|
|
|
|
to-descriptor type rather than a descriptor type), a struct value *
|
|
|
|
|
representing a pointer to this descriptor. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
2010-10-05 00:32:31 +02:00
|
|
|
|
make_array_descriptor (struct type *type, struct value *arr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *bounds_type = desc_bounds_type (type);
|
|
|
|
|
struct type *desc_type = desc_base_type (type);
|
|
|
|
|
struct value *descriptor = allocate_value (desc_type);
|
|
|
|
|
struct value *bounds = allocate_value (bounds_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int i;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
for (i = ada_array_arity (ada_check_typedef (value_type (arr))); i > 0; i -= 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_general_field (value_type (bounds),
|
|
|
|
|
value_contents_writeable (bounds),
|
2009-06-29 19:22:10 +02:00
|
|
|
|
ada_array_bound (arr, i, 0),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
desc_bound_bitpos (bounds_type, i, 0),
|
|
|
|
|
desc_bound_bitsize (bounds_type, i, 0));
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_general_field (value_type (bounds),
|
|
|
|
|
value_contents_writeable (bounds),
|
2009-06-29 19:22:10 +02:00
|
|
|
|
ada_array_bound (arr, i, 1),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
desc_bound_bitpos (bounds_type, i, 1),
|
|
|
|
|
desc_bound_bitsize (bounds_type, i, 1));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2010-10-05 00:32:31 +02:00
|
|
|
|
bounds = ensure_lval (bounds);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_general_field (value_type (descriptor),
|
|
|
|
|
value_contents_writeable (descriptor),
|
2010-10-05 00:32:31 +02:00
|
|
|
|
value_pointer (ensure_lval (arr),
|
2010-04-21 00:40:36 +02:00
|
|
|
|
TYPE_FIELD_TYPE (desc_type, 0)),
|
2004-06-27 21:06:23 +02:00
|
|
|
|
fat_pntr_data_bitpos (desc_type),
|
|
|
|
|
fat_pntr_data_bitsize (desc_type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 14:57:14 +02:00
|
|
|
|
modify_general_field (value_type (descriptor),
|
|
|
|
|
value_contents_writeable (descriptor),
|
2010-04-21 00:40:36 +02:00
|
|
|
|
value_pointer (bounds,
|
|
|
|
|
TYPE_FIELD_TYPE (desc_type, 1)),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
fat_pntr_bounds_bitpos (desc_type),
|
|
|
|
|
fat_pntr_bounds_bitsize (desc_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-10-05 00:32:31 +02:00
|
|
|
|
descriptor = ensure_lval (descriptor);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
|
return value_addr (descriptor);
|
|
|
|
|
else
|
|
|
|
|
return descriptor;
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* Dummy definitions for an experimental caching module that is not
|
|
|
|
|
* used in the public sources. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
lookup_cached_symbol (const char *name, domain_enum namespace,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct symbol **sym, struct block **block)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cache_symbol (const char *name, domain_enum namespace, struct symbol *sym,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct block *block)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
/* Symbol Lookup */
|
|
|
|
|
|
|
|
|
|
/* Return the result of a standard (literal, C-like) lookup of NAME in
|
|
|
|
|
given DOMAIN, visible from lexical block BLOCK. */
|
|
|
|
|
|
|
|
|
|
static struct symbol *
|
|
|
|
|
standard_lookup (const char *name, const struct block *block,
|
|
|
|
|
domain_enum domain)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
if (lookup_cached_symbol (name, domain, &sym, NULL))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return sym;
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
sym = lookup_symbol_in_language (name, block, domain, language_c, 0);
|
|
|
|
|
cache_symbol (name, domain, sym, block_found);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return sym;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Non-zero iff there is at least one non-function/non-enumeral symbol
|
|
|
|
|
in the symbol fields of SYMS[0..N-1]. We treat enumerals as functions,
|
|
|
|
|
since they contend in overloading in the same way. */
|
|
|
|
|
static int
|
|
|
|
|
is_nonfunction (struct ada_symbol_info syms[], int n)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n; i += 1)
|
|
|
|
|
if (TYPE_CODE (SYMBOL_TYPE (syms[i].sym)) != TYPE_CODE_FUNC
|
|
|
|
|
&& (TYPE_CODE (SYMBOL_TYPE (syms[i].sym)) != TYPE_CODE_ENUM
|
|
|
|
|
|| SYMBOL_CLASS (syms[i].sym) != LOC_CONST))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If true (non-zero), then TYPE0 and TYPE1 represent equivalent
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct types. Otherwise, they may not. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
equiv_types (struct type *type0, struct type *type1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (type0 == type1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (type0 == NULL || type1 == NULL
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|| TYPE_CODE (type0) != TYPE_CODE (type1))
|
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if ((TYPE_CODE (type0) == TYPE_CODE_STRUCT
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|| TYPE_CODE (type0) == TYPE_CODE_ENUM)
|
|
|
|
|
&& ada_type_name (type0) != NULL && ada_type_name (type1) != NULL
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& strcmp (ada_type_name (type0), ada_type_name (type1)) == 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* True iff SYM0 represents the same entity as SYM1, or one that is
|
2004-06-02 11:55:36 +02:00
|
|
|
|
no more defined than that of SYM1. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
lesseq_defined_than (struct symbol *sym0, struct symbol *sym1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (sym0 == sym1)
|
|
|
|
|
return 1;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
if (SYMBOL_DOMAIN (sym0) != SYMBOL_DOMAIN (sym1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|| SYMBOL_CLASS (sym0) != SYMBOL_CLASS (sym1))
|
|
|
|
|
return 0;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (SYMBOL_CLASS (sym0))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
case LOC_UNDEF:
|
|
|
|
|
return 1;
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *type0 = SYMBOL_TYPE (sym0);
|
|
|
|
|
struct type *type1 = SYMBOL_TYPE (sym1);
|
|
|
|
|
char *name0 = SYMBOL_LINKAGE_NAME (sym0);
|
|
|
|
|
char *name1 = SYMBOL_LINKAGE_NAME (sym1);
|
|
|
|
|
int len0 = strlen (name0);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return
|
|
|
|
|
TYPE_CODE (type0) == TYPE_CODE (type1)
|
|
|
|
|
&& (equiv_types (type0, type1)
|
|
|
|
|
|| (len0 < strlen (name1) && strncmp (name0, name1, len0) == 0
|
|
|
|
|
&& strncmp (name1 + len0, "___XV", 5) == 0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
return SYMBOL_VALUE (sym0) == SYMBOL_VALUE (sym1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& equiv_types (SYMBOL_TYPE (sym0), SYMBOL_TYPE (sym1));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
default:
|
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Append (SYM,BLOCK,SYMTAB) to the end of the array of struct ada_symbol_info
|
|
|
|
|
records in OBSTACKP. Do nothing if SYM is a duplicate. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2004-06-27 21:06:23 +02:00
|
|
|
|
add_defn_to_vec (struct obstack *obstackp,
|
|
|
|
|
struct symbol *sym,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct block *block)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct ada_symbol_info *prevDefns = defns_collected (obstackp, 0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Do not try to complete stub types, as the debugger is probably
|
|
|
|
|
already scanning all symbols matching a certain name at the
|
|
|
|
|
time when this function is called. Trying to replace the stub
|
|
|
|
|
type by its associated full type will cause us to restart a scan
|
|
|
|
|
which may lead to an infinite recursion. Instead, the client
|
|
|
|
|
collecting the matching symbols will end up collecting several
|
|
|
|
|
matches, with at least one of them complete. It can then filter
|
|
|
|
|
out the stub ones if needed. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (i = num_defns_collected (obstackp) - 1; i >= 0; i -= 1)
|
|
|
|
|
{
|
|
|
|
|
if (lesseq_defined_than (sym, prevDefns[i].sym))
|
|
|
|
|
return;
|
|
|
|
|
else if (lesseq_defined_than (prevDefns[i].sym, sym))
|
|
|
|
|
{
|
|
|
|
|
prevDefns[i].sym = sym;
|
|
|
|
|
prevDefns[i].block = block;
|
|
|
|
|
return;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct ada_symbol_info info;
|
|
|
|
|
|
|
|
|
|
info.sym = sym;
|
|
|
|
|
info.block = block;
|
|
|
|
|
obstack_grow (obstackp, &info, sizeof (struct ada_symbol_info));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Number of ada_symbol_info structures currently collected in
|
|
|
|
|
current vector in *OBSTACKP. */
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static int
|
|
|
|
|
num_defns_collected (struct obstack *obstackp)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
return obstack_object_size (obstackp) / sizeof (struct ada_symbol_info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Vector of ada_symbol_info structures currently collected in current
|
|
|
|
|
vector in *OBSTACKP. If FINISH, close off the vector and return
|
|
|
|
|
its final address. */
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static struct ada_symbol_info *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
defns_collected (struct obstack *obstackp, int finish)
|
|
|
|
|
{
|
|
|
|
|
if (finish)
|
|
|
|
|
return obstack_finish (obstackp);
|
|
|
|
|
else
|
|
|
|
|
return (struct ada_symbol_info *) obstack_base (obstackp);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Return a minimal symbol matching NAME according to Ada decoding
|
|
|
|
|
rules. Returns NULL if there is no such minimal symbol. Names
|
|
|
|
|
prefixed with "standard__" are handled specially: "standard__" is
|
|
|
|
|
first stripped off, and only static and global symbols are searched. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
struct minimal_symbol *
|
|
|
|
|
ada_lookup_simple_minsym (const char *name)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
2004-06-16 10:18:06 +02:00
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
int wild_match;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
if (strncmp (name, "standard__", sizeof ("standard__") - 1) == 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-16 10:18:06 +02:00
|
|
|
|
name += sizeof ("standard__") - 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
wild_match = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
2004-06-16 10:18:06 +02:00
|
|
|
|
wild_match = (strstr (name, "__") == NULL);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
ALL_MSYMBOLS (objfile, msymbol)
|
|
|
|
|
{
|
|
|
|
|
if (ada_match_name (SYMBOL_LINKAGE_NAME (msymbol), name, wild_match)
|
|
|
|
|
&& MSYMBOL_TYPE (msymbol) != mst_solib_trampoline)
|
|
|
|
|
return msymbol;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* For all subprograms that statically enclose the subprogram of the
|
|
|
|
|
selected frame, add symbols matching identifier NAME in DOMAIN
|
|
|
|
|
and their blocks to the list of data in OBSTACKP, as for
|
|
|
|
|
ada_add_block_symbols (q.v.). If WILD, treat as NAME with a
|
|
|
|
|
wildcard prefix. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static void
|
|
|
|
|
add_symbols_from_enclosing_procs (struct obstack *obstackp,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
const char *name, domain_enum namespace,
|
2004-06-16 10:18:06 +02:00
|
|
|
|
int wild_match)
|
|
|
|
|
{
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* True if TYPE is definitely an artificial type supplied to a symbol
|
|
|
|
|
for which no debugging information was given in the symbol file. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static int
|
|
|
|
|
is_nondebugging_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
char *name = ada_type_name (type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return (name != NULL && strcmp (name, "<variable, no debug info>") == 0);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Remove any non-debugging symbols in SYMS[0 .. NSYMS-1] that definitely
|
|
|
|
|
duplicate other symbols in the list (The only case I know of where
|
|
|
|
|
this happens is when object files containing stabs-in-ecoff are
|
|
|
|
|
linked with files containing ordinary ecoff debugging symbols (or no
|
|
|
|
|
debugging symbols)). Modifies SYMS to squeeze out deleted entries.
|
|
|
|
|
Returns the number of items in the modified list. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static int
|
|
|
|
|
remove_extra_symbols (struct ada_symbol_info *syms, int nsyms)
|
|
|
|
|
{
|
|
|
|
|
int i, j;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
i = 0;
|
|
|
|
|
while (i < nsyms)
|
|
|
|
|
{
|
2008-09-14 00:27:00 +02:00
|
|
|
|
int remove = 0;
|
|
|
|
|
|
|
|
|
|
/* If two symbols have the same name and one of them is a stub type,
|
|
|
|
|
the get rid of the stub. */
|
|
|
|
|
|
|
|
|
|
if (TYPE_STUB (SYMBOL_TYPE (syms[i].sym))
|
|
|
|
|
&& SYMBOL_LINKAGE_NAME (syms[i].sym) != NULL)
|
|
|
|
|
{
|
|
|
|
|
for (j = 0; j < nsyms; j++)
|
|
|
|
|
{
|
|
|
|
|
if (j != i
|
|
|
|
|
&& !TYPE_STUB (SYMBOL_TYPE (syms[j].sym))
|
|
|
|
|
&& SYMBOL_LINKAGE_NAME (syms[j].sym) != NULL
|
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym),
|
|
|
|
|
SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0)
|
|
|
|
|
remove = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Two symbols with the same name, same class and same address
|
|
|
|
|
should be identical. */
|
|
|
|
|
|
|
|
|
|
else if (SYMBOL_LINKAGE_NAME (syms[i].sym) != NULL
|
2004-06-16 10:18:06 +02:00
|
|
|
|
&& SYMBOL_CLASS (syms[i].sym) == LOC_STATIC
|
|
|
|
|
&& is_nondebugging_type (SYMBOL_TYPE (syms[i].sym)))
|
|
|
|
|
{
|
|
|
|
|
for (j = 0; j < nsyms; j += 1)
|
|
|
|
|
{
|
|
|
|
|
if (i != j
|
|
|
|
|
&& SYMBOL_LINKAGE_NAME (syms[j].sym) != NULL
|
|
|
|
|
&& strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym),
|
2004-06-27 21:06:23 +02:00
|
|
|
|
SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0
|
2004-06-16 10:18:06 +02:00
|
|
|
|
&& SYMBOL_CLASS (syms[i].sym) == SYMBOL_CLASS (syms[j].sym)
|
|
|
|
|
&& SYMBOL_VALUE_ADDRESS (syms[i].sym)
|
|
|
|
|
== SYMBOL_VALUE_ADDRESS (syms[j].sym))
|
2008-09-14 00:27:00 +02:00
|
|
|
|
remove = 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2008-09-14 00:27:00 +02:00
|
|
|
|
|
|
|
|
|
if (remove)
|
|
|
|
|
{
|
|
|
|
|
for (j = i + 1; j < nsyms; j += 1)
|
|
|
|
|
syms[j - 1] = syms[j];
|
|
|
|
|
nsyms -= 1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
i += 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return nsyms;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Given a type that corresponds to a renaming entity, use the type name
|
|
|
|
|
to extract the scope (package name or function name, fully qualified,
|
|
|
|
|
and following the GNAT encoding convention) where this renaming has been
|
|
|
|
|
defined. The string returned needs to be deallocated after use. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static char *
|
|
|
|
|
xget_renaming_scope (struct type *renaming_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* The renaming types adhere to the following convention:
|
|
|
|
|
<scope>__<rename>___<XR extension>.
|
|
|
|
|
So, to extract the scope, we search for the "___XR" extension,
|
|
|
|
|
and then backtrack until we find the first "__". */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
const char *name = type_name_no_tag (renaming_type);
|
|
|
|
|
char *suffix = strstr (name, "___XR");
|
|
|
|
|
char *last;
|
|
|
|
|
int scope_len;
|
|
|
|
|
char *scope;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Now, backtrack a bit until we find the first "__". Start looking
|
|
|
|
|
at suffix - 3, as the <rename> part is at least one character long. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
for (last = suffix - 3; last > name; last--)
|
|
|
|
|
if (last[0] == '_' && last[1] == '_')
|
|
|
|
|
break;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Make a copy of scope and return it. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
scope_len = last - name;
|
|
|
|
|
scope = (char *) xmalloc ((scope_len + 1) * sizeof (char));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
strncpy (scope, name, scope_len);
|
|
|
|
|
scope[scope_len] = '\0';
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return scope;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Return nonzero if NAME corresponds to a package name. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static int
|
|
|
|
|
is_package_name (const char *name)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Here, We take advantage of the fact that no symbols are generated
|
|
|
|
|
for packages, while symbols are generated for each function.
|
|
|
|
|
So the condition for NAME represent a package becomes equivalent
|
|
|
|
|
to NAME not existing in our list of symbols. There is only one
|
|
|
|
|
small complication with library-level functions (see below). */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
char *fun_name;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* If it is a function that has not been defined at library level,
|
|
|
|
|
then we should be able to look it up in the symbols. */
|
|
|
|
|
if (standard_lookup (name, NULL, VAR_DOMAIN) != NULL)
|
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Library-level function names start with "_ada_". See if function
|
|
|
|
|
"_ada_" followed by NAME can be found. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Do a quick check that NAME does not contain "__", since library-level
|
2006-01-08 08:19:40 +01:00
|
|
|
|
functions names cannot contain "__" in them. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
if (strstr (name, "__") != NULL)
|
|
|
|
|
return 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-29 01:59:29 +02:00
|
|
|
|
fun_name = xstrprintf ("_ada_%s", name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
return (standard_lookup (fun_name, NULL, VAR_DOMAIN) == NULL);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Return nonzero if SYM corresponds to a renaming entity that is
|
2007-12-21 12:50:11 +01:00
|
|
|
|
not visible from FUNCTION_NAME. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
static int
|
2007-12-21 12:50:11 +01:00
|
|
|
|
old_renaming_is_invisible (const struct symbol *sym, char *function_name)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2007-12-21 12:50:11 +01:00
|
|
|
|
char *scope;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
scope = xget_renaming_scope (SYMBOL_TYPE (sym));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
make_cleanup (xfree, scope);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* If the rename has been defined in a package, then it is visible. */
|
|
|
|
|
if (is_package_name (scope))
|
2007-12-21 12:50:11 +01:00
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* Check that the rename is in the current function scope by checking
|
|
|
|
|
that its name starts with SCOPE. */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
/* If the function name starts with "_ada_", it means that it is
|
|
|
|
|
a library-level function. Strip this prefix before doing the
|
|
|
|
|
comparison, as the encoding for the renaming does not contain
|
|
|
|
|
this prefix. */
|
|
|
|
|
if (strncmp (function_name, "_ada_", 5) == 0)
|
|
|
|
|
function_name += 5;
|
2004-06-08 10:42:04 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
return (strncmp (function_name, scope, strlen (scope)) != 0);
|
2004-06-08 10:42:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
/* Remove entries from SYMS that corresponds to a renaming entity that
|
|
|
|
|
is not visible from the function associated with CURRENT_BLOCK or
|
|
|
|
|
that is superfluous due to the presence of more specific renaming
|
|
|
|
|
information. Places surviving symbols in the initial entries of
|
|
|
|
|
SYMS and returns the number of surviving symbols.
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
|
|
|
|
Rationale:
|
2007-12-21 12:50:11 +01:00
|
|
|
|
First, in cases where an object renaming is implemented as a
|
|
|
|
|
reference variable, GNAT may produce both the actual reference
|
|
|
|
|
variable and the renaming encoding. In this case, we discard the
|
|
|
|
|
latter.
|
|
|
|
|
|
|
|
|
|
Second, GNAT emits a type following a specified encoding for each renaming
|
2004-06-16 10:18:06 +02:00
|
|
|
|
entity. Unfortunately, STABS currently does not support the definition
|
|
|
|
|
of types that are local to a given lexical block, so all renamings types
|
|
|
|
|
are emitted at library level. As a consequence, if an application
|
|
|
|
|
contains two renaming entities using the same name, and a user tries to
|
|
|
|
|
print the value of one of these entities, the result of the ada symbol
|
|
|
|
|
lookup will also contain the wrong renaming type.
|
2004-06-08 10:42:04 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
This function partially covers for this limitation by attempting to
|
|
|
|
|
remove from the SYMS list renaming symbols that should be visible
|
|
|
|
|
from CURRENT_BLOCK. However, there does not seem be a 100% reliable
|
|
|
|
|
method with the current information available. The implementation
|
|
|
|
|
below has a couple of limitations (FIXME: brobecker-2003-05-12):
|
|
|
|
|
|
|
|
|
|
- When the user tries to print a rename in a function while there
|
|
|
|
|
is another rename entity defined in a package: Normally, the
|
|
|
|
|
rename in the function has precedence over the rename in the
|
|
|
|
|
package, so the latter should be removed from the list. This is
|
|
|
|
|
currently not the case.
|
|
|
|
|
|
|
|
|
|
- This function will incorrectly remove valid renames if
|
|
|
|
|
the CURRENT_BLOCK corresponds to a function which symbol name
|
|
|
|
|
has been changed by an "Export" pragma. As a consequence,
|
|
|
|
|
the user will be unable to print such rename entities. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2007-12-21 12:50:11 +01:00
|
|
|
|
remove_irrelevant_renamings (struct ada_symbol_info *syms,
|
|
|
|
|
int nsyms, const struct block *current_block)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct symbol *current_function;
|
|
|
|
|
char *current_function_name;
|
|
|
|
|
int i;
|
2007-12-21 12:50:11 +01:00
|
|
|
|
int is_new_style_renaming;
|
|
|
|
|
|
|
|
|
|
/* If there is both a renaming foo___XR... encoded as a variable and
|
|
|
|
|
a simple variable foo in the same block, discard the latter.
|
|
|
|
|
First, zero out such symbols, then compress. */
|
|
|
|
|
is_new_style_renaming = 0;
|
|
|
|
|
for (i = 0; i < nsyms; i += 1)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *sym = syms[i].sym;
|
|
|
|
|
struct block *block = syms[i].block;
|
|
|
|
|
const char *name;
|
|
|
|
|
const char *suffix;
|
|
|
|
|
|
|
|
|
|
if (sym == NULL || SYMBOL_CLASS (sym) == LOC_TYPEDEF)
|
|
|
|
|
continue;
|
|
|
|
|
name = SYMBOL_LINKAGE_NAME (sym);
|
|
|
|
|
suffix = strstr (name, "___XR");
|
|
|
|
|
|
|
|
|
|
if (suffix != NULL)
|
|
|
|
|
{
|
|
|
|
|
int name_len = suffix - name;
|
|
|
|
|
int j;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
is_new_style_renaming = 1;
|
|
|
|
|
for (j = 0; j < nsyms; j += 1)
|
|
|
|
|
if (i != j && syms[j].sym != NULL
|
|
|
|
|
&& strncmp (name, SYMBOL_LINKAGE_NAME (syms[j].sym),
|
|
|
|
|
name_len) == 0
|
|
|
|
|
&& block == syms[j].block)
|
|
|
|
|
syms[j].sym = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (is_new_style_renaming)
|
|
|
|
|
{
|
|
|
|
|
int j, k;
|
|
|
|
|
|
|
|
|
|
for (j = k = 0; j < nsyms; j += 1)
|
|
|
|
|
if (syms[j].sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
syms[k] = syms[j];
|
|
|
|
|
k += 1;
|
|
|
|
|
}
|
|
|
|
|
return k;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
/* Extract the function name associated to CURRENT_BLOCK.
|
|
|
|
|
Abort if unable to do so. */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (current_block == NULL)
|
|
|
|
|
return nsyms;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2008-07-15 21:11:34 +02:00
|
|
|
|
current_function = block_linkage_function (current_block);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (current_function == NULL)
|
|
|
|
|
return nsyms;
|
|
|
|
|
|
|
|
|
|
current_function_name = SYMBOL_LINKAGE_NAME (current_function);
|
|
|
|
|
if (current_function_name == NULL)
|
|
|
|
|
return nsyms;
|
|
|
|
|
|
|
|
|
|
/* Check each of the symbols, and remove it from the list if it is
|
|
|
|
|
a type corresponding to a renaming that is out of the scope of
|
|
|
|
|
the current block. */
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
while (i < nsyms)
|
|
|
|
|
{
|
2007-12-21 12:50:11 +01:00
|
|
|
|
if (ada_parse_renaming (syms[i].sym, NULL, NULL, NULL)
|
|
|
|
|
== ADA_OBJECT_RENAMING
|
|
|
|
|
&& old_renaming_is_invisible (syms[i].sym, current_function_name))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int j;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
for (j = i + 1; j < nsyms; j += 1)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
syms[j - 1] = syms[j];
|
2004-06-02 11:55:36 +02:00
|
|
|
|
nsyms -= 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
i += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nsyms;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
/* Add to OBSTACKP all symbols from BLOCK (and its super-blocks)
|
|
|
|
|
whose name and domain match NAME and DOMAIN respectively.
|
|
|
|
|
If no match was found, then extend the search to "enclosing"
|
|
|
|
|
routines (in other words, if we're inside a nested function,
|
|
|
|
|
search the symbols defined inside the enclosing functions).
|
|
|
|
|
|
|
|
|
|
Note: This function assumes that OBSTACKP has 0 (zero) element in it. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_add_local_symbols (struct obstack *obstackp, const char *name,
|
|
|
|
|
struct block *block, domain_enum domain,
|
|
|
|
|
int wild_match)
|
|
|
|
|
{
|
|
|
|
|
int block_depth = 0;
|
|
|
|
|
|
|
|
|
|
while (block != NULL)
|
|
|
|
|
{
|
|
|
|
|
block_depth += 1;
|
|
|
|
|
ada_add_block_symbols (obstackp, block, name, domain, NULL, wild_match);
|
|
|
|
|
|
|
|
|
|
/* If we found a non-function match, assume that's the one. */
|
|
|
|
|
if (is_nonfunction (defns_collected (obstackp, 0),
|
|
|
|
|
num_defns_collected (obstackp)))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If no luck so far, try to find NAME as a local symbol in some lexically
|
|
|
|
|
enclosing subprogram. */
|
|
|
|
|
if (num_defns_collected (obstackp) == 0 && block_depth > 2)
|
|
|
|
|
add_symbols_from_enclosing_procs (obstackp, name, domain, wild_match);
|
|
|
|
|
}
|
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
/* An object of this type is used as the user_data argument when
|
|
|
|
|
calling the map_ada_symtabs method. */
|
|
|
|
|
|
|
|
|
|
struct ada_psym_data
|
|
|
|
|
{
|
|
|
|
|
struct obstack *obstackp;
|
|
|
|
|
const char *name;
|
|
|
|
|
domain_enum domain;
|
|
|
|
|
int global;
|
|
|
|
|
int wild_match;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Callback function for map_ada_symtabs. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_add_psyms (struct objfile *objfile, struct symtab *s, void *user_data)
|
|
|
|
|
{
|
|
|
|
|
struct ada_psym_data *data = user_data;
|
|
|
|
|
const int block_kind = data->global ? GLOBAL_BLOCK : STATIC_BLOCK;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
ada_add_block_symbols (data->obstackp,
|
|
|
|
|
BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), block_kind),
|
|
|
|
|
data->name, data->domain, objfile, data->wild_match);
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
/* Add to OBSTACKP all non-local symbols whose name and domain match
|
|
|
|
|
NAME and DOMAIN respectively. The search is performed on GLOBAL_BLOCK
|
|
|
|
|
symbols if GLOBAL is non-zero, or on STATIC_BLOCK symbols otherwise. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_add_non_local_symbols (struct obstack *obstackp, const char *name,
|
|
|
|
|
domain_enum domain, int global,
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
int is_wild_match)
|
2008-09-14 00:27:00 +02:00
|
|
|
|
{
|
|
|
|
|
struct objfile *objfile;
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
struct ada_psym_data data;
|
2008-09-14 00:27:00 +02:00
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
data.obstackp = obstackp;
|
|
|
|
|
data.name = name;
|
|
|
|
|
data.domain = domain;
|
|
|
|
|
data.global = global;
|
|
|
|
|
data.wild_match = is_wild_match;
|
2008-09-14 00:27:00 +02:00
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
ALL_OBJFILES (objfile)
|
|
|
|
|
{
|
|
|
|
|
if (objfile->sf)
|
|
|
|
|
objfile->sf->qf->map_ada_symtabs (objfile, wild_match, is_name_suffix,
|
|
|
|
|
ada_add_psyms, name,
|
|
|
|
|
global, domain,
|
|
|
|
|
is_wild_match, &data);
|
2008-09-14 00:27:00 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Find symbols in DOMAIN matching NAME0, in BLOCK0 and enclosing
|
|
|
|
|
scope and in global scopes, returning the number of matches. Sets
|
2008-05-19 20:37:07 +02:00
|
|
|
|
*RESULTS to point to a vector of (SYM,BLOCK) tuples,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
indicating the symbols found and the blocks and symbol tables (if
|
|
|
|
|
any) in which they were found. This vector are transient---good only to
|
|
|
|
|
the next call of ada_lookup_symbol_list. Any non-function/non-enumeral
|
|
|
|
|
symbol match within the nest of blocks whose innermost member is BLOCK0,
|
|
|
|
|
is the one match returned (no other matches in that or
|
|
|
|
|
enclosing blocks is returned). If there are any matches in or
|
|
|
|
|
surrounding BLOCK0, then these alone are returned. Otherwise, the
|
|
|
|
|
search extends to global and file-scope (static) symbol tables.
|
|
|
|
|
Names prefixed with "standard__" are handled specially: "standard__"
|
|
|
|
|
is first stripped off, and only static and global symbols are searched. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_lookup_symbol_list (const char *name0, const struct block *block0,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
domain_enum namespace,
|
|
|
|
|
struct ada_symbol_info **results)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
struct block *block;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
const char *name;
|
|
|
|
|
int wild_match;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int cacheIfUnique;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int ndefns;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
obstack_free (&symbol_list_obstack, NULL);
|
|
|
|
|
obstack_init (&symbol_list_obstack);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
cacheIfUnique = 0;
|
|
|
|
|
|
|
|
|
|
/* Search specified block and its superiors. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
wild_match = (strstr (name0, "__") == NULL);
|
|
|
|
|
name = name0;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
block = (struct block *) block0; /* FIXME: No cast ought to be
|
|
|
|
|
needed, but adding const will
|
|
|
|
|
have a cascade effect. */
|
2008-09-14 00:27:00 +02:00
|
|
|
|
|
|
|
|
|
/* Special case: If the user specifies a symbol name inside package
|
|
|
|
|
Standard, do a non-wild matching of the symbol name without
|
|
|
|
|
the "standard__" prefix. This was primarily introduced in order
|
|
|
|
|
to allow the user to specifically access the standard exceptions
|
|
|
|
|
using, for instance, Standard.Constraint_Error when Constraint_Error
|
|
|
|
|
is ambiguous (due to the user defining its own Constraint_Error
|
|
|
|
|
entity inside its program). */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (strncmp (name0, "standard__", sizeof ("standard__") - 1) == 0)
|
|
|
|
|
{
|
|
|
|
|
wild_match = 0;
|
|
|
|
|
block = NULL;
|
|
|
|
|
name = name0 + sizeof ("standard__") - 1;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
/* Check the non-global symbols. If we have ANY match, then we're done. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
ada_add_local_symbols (&symbol_list_obstack, name, block, namespace,
|
|
|
|
|
wild_match);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (num_defns_collected (&symbol_list_obstack) > 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
goto done;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
/* No non-global symbols found. Check our cache to see if we have
|
|
|
|
|
already performed this search before. If we have, then return
|
|
|
|
|
the same result. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
cacheIfUnique = 1;
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
if (lookup_cached_symbol (name0, namespace, &sym, &block))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (sym != NULL)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
add_defn_to_vec (&symbol_list_obstack, sym, block);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-09-14 00:27:00 +02:00
|
|
|
|
/* Search symbols from all global blocks. */
|
|
|
|
|
|
|
|
|
|
ada_add_non_local_symbols (&symbol_list_obstack, name, namespace, 1,
|
|
|
|
|
wild_match);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Now add symbols from all per-file blocks if we've gotten no hits
|
2008-09-14 00:27:00 +02:00
|
|
|
|
(not strictly correct, but perhaps better than an error). */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (num_defns_collected (&symbol_list_obstack) == 0)
|
2008-09-14 00:27:00 +02:00
|
|
|
|
ada_add_non_local_symbols (&symbol_list_obstack, name, namespace, 0,
|
|
|
|
|
wild_match);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
done:
|
|
|
|
|
ndefns = num_defns_collected (&symbol_list_obstack);
|
|
|
|
|
*results = defns_collected (&symbol_list_obstack, 1);
|
|
|
|
|
|
|
|
|
|
ndefns = remove_extra_symbols (*results, ndefns);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (ndefns == 0)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
cache_symbol (name0, namespace, NULL, NULL);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ndefns == 1 && cacheIfUnique)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
ndefns = remove_irrelevant_renamings (*results, ndefns, block0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return ndefns;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct symbol *
|
2007-12-21 12:50:11 +01:00
|
|
|
|
ada_lookup_encoded_symbol (const char *name, const struct block *block0,
|
2008-05-19 17:49:14 +02:00
|
|
|
|
domain_enum namespace, struct block **block_found)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct ada_symbol_info *candidates;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int n_candidates;
|
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
n_candidates = ada_lookup_symbol_list (name, block0, namespace, &candidates);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (n_candidates == 0)
|
|
|
|
|
return NULL;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
if (block_found != NULL)
|
|
|
|
|
*block_found = candidates[0].block;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2008-05-19 17:49:14 +02:00
|
|
|
|
return fixup_symbol_section (candidates[0].sym, NULL);
|
2007-12-21 12:50:11 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a symbol in DOMAIN matching NAME, in BLOCK0 and enclosing
|
|
|
|
|
scope and in global scopes, or NULL if none. NAME is folded and
|
|
|
|
|
encoded first. Otherwise, the result is as for ada_lookup_symbol_list,
|
|
|
|
|
choosing the first symbol if there are multiple choices.
|
|
|
|
|
*IS_A_FIELD_OF_THIS is set to 0 and *SYMTAB is set to the symbol
|
|
|
|
|
table in which the symbol was found (in both cases, these
|
|
|
|
|
assignments occur only if the pointers are non-null). */
|
|
|
|
|
struct symbol *
|
|
|
|
|
ada_lookup_symbol (const char *name, const struct block *block0,
|
2008-05-19 17:49:14 +02:00
|
|
|
|
domain_enum namespace, int *is_a_field_of_this)
|
2007-12-21 12:50:11 +01:00
|
|
|
|
{
|
|
|
|
|
if (is_a_field_of_this != NULL)
|
|
|
|
|
*is_a_field_of_this = 0;
|
|
|
|
|
|
|
|
|
|
return
|
|
|
|
|
ada_lookup_encoded_symbol (ada_encode (ada_fold_name (name)),
|
2008-05-19 17:49:14 +02:00
|
|
|
|
block0, namespace, NULL);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct symbol *
|
|
|
|
|
ada_lookup_symbol_nonlocal (const char *name,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
const struct block *block,
|
2008-05-19 17:49:14 +02:00
|
|
|
|
const domain_enum domain)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
dwarf2_physname patchset:
Based on work from Daniel Jacobowitz <dan@codesourcery.com>
* c-typeprint.c (cp_type_print_method_args): For non-static methods,
print out const or volatile qualifiers, too.
(c_type_print_args): Add parameters show_artificial and language.
Skip artificial parameters when requested.
Use the appropriate language printer.
(c_type_print_varspec): Tell c_type_print_args to skip artificial
parameters and pass language_c.
* dwarf2read.c (die_list): New file global.
(struct partial_die_info): Update comments for name field.
(pdi_needs_namespace): Renamed to ...
(die_needs_namespace): ... this. Rewrite.
(dwarf2_linkage_name): Remove.
(add_partial_symbol): Do not predicate the call to
partial_die_full_name based on pdi_needs_namespace.
Remove call to cp_check_possible_namespace_symbols and associated
outdated comments.
(guess_structure_name): Do not inspect child subprogram DIEs.
(dwarf2_fullname): Update comments.
Use die_needs_namespace to assist in computing the name.
(read_func_scope): Use dwarf2_name to get the DIE's name.
Use dwarf2_physname to get the "linkage name" of the DIE.
(dwarf2_add_member_field): Use dwarf2_physname instead of
dwarf2_linkage_name.
(read_structure_type): For structs and classes, set TYPE_NAME, too.
(determine_class): Remove.
(read_partial_die): Ignore DW_AT_MIPS_linkage_name for all languages
except Ada.
(new_symbol): Unconditionally call dwarf2_name.
Compute the "linkage name" using dwarf2_physname.
Use dwarf2_name instead of dwarf2_full_name for enumerator DIEs.
When determining to scan for anonymous C++ namespaces, ignore
the linkage name.
(dwarf2_physname): New function.
(dwarf2_full_name): Move content to new function and call
that.
(dwarf2_compute_name): "New" function.
(_initialize_dwarf2_read): Initialize die_list.
* gnu-v3-eabi.c (gnu_v3_find_method_in): Remove unused variable
physname.
(gnu_v3_print_method_ptr): Use the physname for virtual methods
without a demangled name.
Print out type information for non-virtual methods.
* linespec.c (decode_line_1): Force ANY string using "::" (or
"." for java) to use decode_compound, and clean up any stray quoting.
If we found a file symtab, re-evaluate whether the remainder is_quoted.
(decode_compound): Stop consuming at an open parenthesis.
Keep template parameters.
Keep any overload information.
Keep keywords like "const".
Remove paren_pointer.
Move is_quoted check from set_flags to here.
Remove #if 0 code from 2000. Ten years is long enough.
(find_method): Before comparing symbol names, canonicalize the string
from the user.
If a specific overload is requested, find it. Otherwise throw an error.
(find_method_overload_end): New function.
(set_flags): Remove.
(decode_compound): Assume that parentheses are matched.
It's a lot easier.
* symtab.c (symbol_find_demangled_name): Add DMGL_VERBOSE flag
to cplus_demangle.
* linespec.c (decode_line_1): Keep important keywords like
"const" and "volatile".
* symtab.h (SYMBOL_CPLUS_DEMANGLED_NAME): Remove.
* typeprint.h (c_type_print_args): Add declaration.
* ui-file.c (do_ui_file_obsavestring): New function.
(ui_file_obsavestring): New function.
* ui-file.h (ui_file_obsavestring): Add declaration.
* valops.c (find_overload_match): Resolve the object to
a non-pointer type.
If the object is a data member, search the object for the member
and return with staticp set.
Use SYMBOL_NATURAL_NAME instead of SYMBOL_CPLUS_DEMANGLED_NAME.
Do not attempt to extract a function name from non-function types.
If the extracted function name and the original name are the same,
we don't have a C++ method.
From Jan Kratochvil <jan.kratochvil@redhat.com>:
* dwarf2read.c (new_symbol <DW_TAG_enumerator>): Call dwarf2_full_name.
* ada-lang.c (ada_lookup_symbol): Remove linkage_name parameters
and arguments from symbol lookups.
* ax-gdb.c (gen_expr): Likewise.
* cp-namespace.c (cp_lookup_symbol_nonlocal, lookup_namespace_scope,
cp_lookup_symbol_namespace, lookup_symbol_file, lookup_nested_type,
lookup_possible_namespace_symbol): Likewise.
* cp-support.c (read_in_psymtabs): Likewise.
* cp-support.h (cp_lookup_symbol_nonlocal): Likewise.
* language.h (la_lookup_symbol_nonlocal): Likewise.
* scm-valprint.c (scm_inferior_print): Likewise.
* solib-darwin.c (darwin_relocate_section_addresses): Likewise.
* solib-svr.c (elf_lookup_lib): Likewise.
* solib.c (show_auto_solib_add): Likewise.
* solist.h (lookup_lib_global, solib_global_lookup): Likewise.
* symmisc.c (maintenance_check_symtabs): Likewise.
* symtab.c (lookup_symbol_in_language, lookup_symbol_aux,
lookup_symbol_aux_local, lookup_symbol_aux_block,
lookup_symbol_from_objfile, lookup_symbol_aux_symtabs,
lookup_symbol_aux_psymtabs,basic_lookup_symbol_nonlocal,
lookup_symbol_static, lookup_symbol_global, symbol_matches_domain,
basic_lookup_transparent_type, find_main_psymtab,
lookup_block_symbol): Likewise.
* symtab.h (basic_lookp_symbol_nonlocal, lookup_symbol_static,
lookup_symbol_global, lookup_symbol_aux_block,
lookup_symbol_partial_symbol, lookup_block_symbol,
lookup_global_symbol, value_maybe_namespace_elt): Likewise.
2010-03-09 19:09:08 +01:00
|
|
|
|
return ada_lookup_symbol (name, block_static_block (block), domain, NULL);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff STR is a possible encoded suffix of a normal Ada name
|
|
|
|
|
that is to be ignored for matching purposes. Suffixes of parallel
|
|
|
|
|
names (e.g., XVE) are not included here. Currently, the possible suffixes
|
2008-09-10 22:10:48 +02:00
|
|
|
|
are given by any of the regular expressions:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2008-01-04 22:36:25 +01:00
|
|
|
|
[.$][0-9]+ [nested subprogram suffix, on platforms such as GNU/Linux]
|
|
|
|
|
___[0-9]+ [nested subprogram suffix, on platforms such as HP/UX]
|
|
|
|
|
_E[0-9]+[bs]$ [protected object entry suffixes]
|
2004-10-08 11:40:12 +02:00
|
|
|
|
(X[nb]*)?((\$|__)[0-9](_?[0-9]+)|___(JM|LJM|X([FDBUP].*|R[^T]?)))?$
|
2008-01-04 22:36:25 +01:00
|
|
|
|
|
|
|
|
|
Also, any leading "__[0-9]+" sequence is skipped before the suffix
|
|
|
|
|
match is performed. This sequence is used to differentiate homonyms,
|
|
|
|
|
is an optional part of a valid name suffix. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
is_name_suffix (const char *str)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int k;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
const char *matching;
|
|
|
|
|
const int len = strlen (str);
|
|
|
|
|
|
2008-01-04 22:36:25 +01:00
|
|
|
|
/* Skip optional leading __[0-9]+. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len > 3 && str[0] == '_' && str[1] == '_' && isdigit (str[2]))
|
|
|
|
|
{
|
2008-01-04 22:36:25 +01:00
|
|
|
|
str += 3;
|
|
|
|
|
while (isdigit (str[0]))
|
|
|
|
|
str += 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2008-01-04 22:36:25 +01:00
|
|
|
|
|
|
|
|
|
/* [.$][0-9]+ */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2008-01-04 22:36:25 +01:00
|
|
|
|
if (str[0] == '.' || str[0] == '$')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-01-04 22:36:25 +01:00
|
|
|
|
matching = str + 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
while (isdigit (matching[0]))
|
|
|
|
|
matching += 1;
|
|
|
|
|
if (matching[0] == '\0')
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ___[0-9]+ */
|
2008-01-04 22:36:25 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len > 3 && str[0] == '_' && str[1] == '_' && str[2] == '_')
|
|
|
|
|
{
|
|
|
|
|
matching = str + 3;
|
|
|
|
|
while (isdigit (matching[0]))
|
|
|
|
|
matching += 1;
|
|
|
|
|
if (matching[0] == '\0')
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
#if 0
|
|
|
|
|
/* FIXME: brobecker/2005-09-23: Protected Object subprograms end
|
|
|
|
|
with a N at the end. Unfortunately, the compiler uses the same
|
|
|
|
|
convention for other internal types it creates. So treating
|
|
|
|
|
all entity names that end with an "N" as a name suffix causes
|
|
|
|
|
some regressions. For instance, consider the case of an enumerated
|
|
|
|
|
type. To support the 'Image attribute, it creates an array whose
|
|
|
|
|
name ends with N.
|
|
|
|
|
Having a single character like this as a suffix carrying some
|
|
|
|
|
information is a bit risky. Perhaps we should change the encoding
|
|
|
|
|
to be something like "_N" instead. In the meantime, do not do
|
|
|
|
|
the following check. */
|
|
|
|
|
/* Protected Object Subprograms */
|
|
|
|
|
if (len == 1 && str [0] == 'N')
|
|
|
|
|
return 1;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* _E[0-9]+[bs]$ */
|
|
|
|
|
if (len > 3 && str[0] == '_' && str [1] == 'E' && isdigit (str[2]))
|
|
|
|
|
{
|
|
|
|
|
matching = str + 3;
|
|
|
|
|
while (isdigit (matching[0]))
|
|
|
|
|
matching += 1;
|
|
|
|
|
if ((matching[0] == 'b' || matching[0] == 's')
|
|
|
|
|
&& matching [1] == '\0')
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* ??? We should not modify STR directly, as we are doing below. This
|
|
|
|
|
is fine in this case, but may become problematic later if we find
|
|
|
|
|
that this alternative did not work, and want to try matching
|
|
|
|
|
another one from the begining of STR. Since we modified it, we
|
|
|
|
|
won't be able to find the begining of the string anymore! */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (str[0] == 'X')
|
|
|
|
|
{
|
|
|
|
|
str += 1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
while (str[0] != '_' && str[0] != '\0')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (str[0] != 'n' && str[0] != 'b')
|
|
|
|
|
return 0;
|
|
|
|
|
str += 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2008-01-04 22:36:25 +01:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (str[0] == '\000')
|
|
|
|
|
return 1;
|
2008-01-04 22:36:25 +01:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (str[0] == '_')
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (str[1] != '_' || str[2] == '\000')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (str[2] == '_')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
if (strcmp (str + 3, "JM") == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
/* FIXME: brobecker/2004-09-30: GNAT will soon stop using
|
|
|
|
|
the LJM suffix in favor of the JM one. But we will
|
|
|
|
|
still accept LJM as a valid suffix for a reasonable
|
|
|
|
|
amount of time, just to allow ourselves to debug programs
|
|
|
|
|
compiled using an older version of GNAT. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (strcmp (str + 3, "LJM") == 0)
|
|
|
|
|
return 1;
|
|
|
|
|
if (str[3] != 'X')
|
|
|
|
|
return 0;
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (str[4] == 'F' || str[4] == 'D' || str[4] == 'B'
|
|
|
|
|
|| str[4] == 'U' || str[4] == 'P')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return 1;
|
|
|
|
|
if (str[4] == 'R' && str[5] != 'T')
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (!isdigit (str[2]))
|
|
|
|
|
return 0;
|
|
|
|
|
for (k = 3; str[k] != '\0'; k += 1)
|
|
|
|
|
if (!isdigit (str[k]) && str[k] != '_')
|
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (str[0] == '$' && isdigit (str[1]))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (k = 2; str[k] != '\0'; k += 1)
|
|
|
|
|
if (!isdigit (str[k]) && str[k] != '_')
|
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
/* Return non-zero if the string starting at NAME and ending before
|
|
|
|
|
NAME_END contains no capital letters. */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_valid_name_for_wild_match (const char *name0)
|
|
|
|
|
{
|
|
|
|
|
const char *decoded_name = ada_decode (name0);
|
|
|
|
|
int i;
|
|
|
|
|
|
2008-09-10 22:10:48 +02:00
|
|
|
|
/* If the decoded name starts with an angle bracket, it means that
|
|
|
|
|
NAME0 does not follow the GNAT encoding format. It should then
|
|
|
|
|
not be allowed as a possible wild match. */
|
|
|
|
|
if (decoded_name[0] == '<')
|
|
|
|
|
return 0;
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
for (i=0; decoded_name[i] != '\0'; i++)
|
|
|
|
|
if (isalpha (decoded_name[i]) && !islower (decoded_name[i]))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-04 08:34:40 +02:00
|
|
|
|
/* Advance *NAMEP to next occurrence of TARGET0 in the string NAME0
|
|
|
|
|
that could start a simple name. Assumes that *NAMEP points into
|
|
|
|
|
the string beginning at NAME0. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static int
|
2010-10-04 08:34:40 +02:00
|
|
|
|
advance_wild_match (const char **namep, const char *name0, int target0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2010-10-04 08:34:40 +02:00
|
|
|
|
const char *name = *namep;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-09-10 22:10:48 +02:00
|
|
|
|
while (1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2010-10-06 17:24:38 +02:00
|
|
|
|
int t0, t1;
|
2010-10-04 08:34:40 +02:00
|
|
|
|
|
|
|
|
|
t0 = *name;
|
|
|
|
|
if (t0 == '_')
|
|
|
|
|
{
|
|
|
|
|
t1 = name[1];
|
|
|
|
|
if ((t1 >= 'a' && t1 <= 'z') || (t1 >= '0' && t1 <= '9'))
|
|
|
|
|
{
|
|
|
|
|
name += 1;
|
|
|
|
|
if (name == name0 + 5 && strncmp (name0, "_ada", 4) == 0)
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
name += 1;
|
|
|
|
|
}
|
2010-10-06 17:24:38 +02:00
|
|
|
|
else if (t1 == '_' && ((name[2] >= 'a' && name[2] <= 'z')
|
|
|
|
|
|| name[2] == target0))
|
2010-10-04 08:34:40 +02:00
|
|
|
|
{
|
|
|
|
|
name += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else if ((t0 >= 'a' && t0 <= 'z') || (t0 >= '0' && t0 <= '9'))
|
|
|
|
|
name += 1;
|
|
|
|
|
else
|
2008-09-10 22:10:48 +02:00
|
|
|
|
return 0;
|
2010-10-04 08:34:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*namep = name;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return 0 iff NAME encodes a name of the form prefix.PATN. Ignores any
|
|
|
|
|
informational suffixes of NAME (i.e., for which is_name_suffix is
|
|
|
|
|
true). Assumes that PATN is a lower-cased Ada simple name. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
wild_match (const char *name, const char *patn)
|
|
|
|
|
{
|
|
|
|
|
const char *p, *n;
|
|
|
|
|
const char *name0 = name;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
const char *match = name;
|
|
|
|
|
|
|
|
|
|
if (*name == *patn)
|
|
|
|
|
{
|
|
|
|
|
for (name += 1, p = patn + 1; *p != '\0'; name += 1, p += 1)
|
|
|
|
|
if (*p != *name)
|
|
|
|
|
break;
|
|
|
|
|
if (*p == '\0' && is_name_suffix (name))
|
|
|
|
|
return match != name0 && !is_valid_name_for_wild_match (name0);
|
|
|
|
|
|
|
|
|
|
if (name[-1] == '_')
|
|
|
|
|
name -= 1;
|
|
|
|
|
}
|
|
|
|
|
if (!advance_wild_match (&name, name0, *patn))
|
|
|
|
|
return 1;
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add symbols from BLOCK matching identifier NAME in DOMAIN to
|
|
|
|
|
vector *defn_symbols, updating the list of symbols in OBSTACKP
|
|
|
|
|
(if necessary). If WILD, treat as NAME with a wildcard prefix.
|
|
|
|
|
OBJFILE is the section containing BLOCK.
|
|
|
|
|
SYMTAB is recorded with each symbol added. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_add_block_symbols (struct obstack *obstackp,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct block *block, const char *name,
|
2004-06-16 10:18:06 +02:00
|
|
|
|
domain_enum domain, struct objfile *objfile,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
int wild)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
|
|
|
|
struct dict_iterator iter;
|
|
|
|
|
int name_len = strlen (name);
|
|
|
|
|
/* A matching argument symbol, if any. */
|
|
|
|
|
struct symbol *arg_sym;
|
|
|
|
|
/* Set true when we find a matching non-argument symbol. */
|
|
|
|
|
int found_sym;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
arg_sym = NULL;
|
|
|
|
|
found_sym = 0;
|
|
|
|
|
if (wild)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-16 10:18:06 +02:00
|
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2008-05-05 16:37:32 +02:00
|
|
|
|
if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
|
|
|
|
|
SYMBOL_DOMAIN (sym), domain)
|
2010-10-04 08:34:40 +02:00
|
|
|
|
&& wild_match (SYMBOL_LINKAGE_NAME (sym), name) == 0)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2008-05-27 21:29:52 +02:00
|
|
|
|
if (SYMBOL_CLASS (sym) == LOC_UNRESOLVED)
|
|
|
|
|
continue;
|
|
|
|
|
else if (SYMBOL_IS_ARGUMENT (sym))
|
|
|
|
|
arg_sym = sym;
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
found_sym = 1;
|
|
|
|
|
add_defn_to_vec (obstackp,
|
|
|
|
|
fixup_symbol_section (sym, objfile),
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
block);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2008-05-05 16:37:32 +02:00
|
|
|
|
if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
|
|
|
|
|
SYMBOL_DOMAIN (sym), domain))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
int cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym), name_len);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (cmp == 0
|
|
|
|
|
&& is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len))
|
|
|
|
|
{
|
2008-05-27 21:29:52 +02:00
|
|
|
|
if (SYMBOL_CLASS (sym) != LOC_UNRESOLVED)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_IS_ARGUMENT (sym))
|
|
|
|
|
arg_sym = sym;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
found_sym = 1;
|
|
|
|
|
add_defn_to_vec (obstackp,
|
|
|
|
|
fixup_symbol_section (sym, objfile),
|
|
|
|
|
block);
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!found_sym && arg_sym != NULL)
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
add_defn_to_vec (obstackp,
|
|
|
|
|
fixup_symbol_section (arg_sym, objfile),
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
block);
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!wild)
|
|
|
|
|
{
|
|
|
|
|
arg_sym = NULL;
|
|
|
|
|
found_sym = 0;
|
|
|
|
|
|
|
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2008-05-05 16:37:32 +02:00
|
|
|
|
if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
|
|
|
|
|
SYMBOL_DOMAIN (sym), domain))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
|
|
cmp = (int) '_' - (int) SYMBOL_LINKAGE_NAME (sym)[0];
|
|
|
|
|
if (cmp == 0)
|
|
|
|
|
{
|
|
|
|
|
cmp = strncmp ("_ada_", SYMBOL_LINKAGE_NAME (sym), 5);
|
|
|
|
|
if (cmp == 0)
|
|
|
|
|
cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym) + 5,
|
|
|
|
|
name_len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cmp == 0
|
|
|
|
|
&& is_name_suffix (SYMBOL_LINKAGE_NAME (sym) + name_len + 5))
|
|
|
|
|
{
|
2008-05-27 21:29:52 +02:00
|
|
|
|
if (SYMBOL_CLASS (sym) != LOC_UNRESOLVED)
|
|
|
|
|
{
|
|
|
|
|
if (SYMBOL_IS_ARGUMENT (sym))
|
|
|
|
|
arg_sym = sym;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
found_sym = 1;
|
|
|
|
|
add_defn_to_vec (obstackp,
|
|
|
|
|
fixup_symbol_section (sym, objfile),
|
|
|
|
|
block);
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
|
|
|
|
/* NOTE: This really shouldn't be needed for _ada_ symbols.
|
|
|
|
|
They aren't parameters, right? */
|
|
|
|
|
if (!found_sym && arg_sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
add_defn_to_vec (obstackp,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
fixup_symbol_section (arg_sym, objfile),
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
block);
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-05 23:17:41 +01:00
|
|
|
|
|
|
|
|
|
/* Symbol Completion */
|
|
|
|
|
|
|
|
|
|
/* If SYM_NAME is a completion candidate for TEXT, return this symbol
|
|
|
|
|
name in a form that's appropriate for the completion. The result
|
|
|
|
|
does not need to be deallocated, but is only good until the next call.
|
|
|
|
|
|
|
|
|
|
TEXT_LEN is equal to the length of TEXT.
|
|
|
|
|
Perform a wild match if WILD_MATCH is set.
|
|
|
|
|
ENCODED should be set if TEXT represents the start of a symbol name
|
|
|
|
|
in its encoded form. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
symbol_completion_match (const char *sym_name,
|
|
|
|
|
const char *text, int text_len,
|
|
|
|
|
int wild_match, int encoded)
|
|
|
|
|
{
|
|
|
|
|
const int verbatim_match = (text[0] == '<');
|
|
|
|
|
int match = 0;
|
|
|
|
|
|
|
|
|
|
if (verbatim_match)
|
|
|
|
|
{
|
|
|
|
|
/* Strip the leading angle bracket. */
|
|
|
|
|
text = text + 1;
|
|
|
|
|
text_len--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First, test against the fully qualified name of the symbol. */
|
|
|
|
|
|
|
|
|
|
if (strncmp (sym_name, text, text_len) == 0)
|
|
|
|
|
match = 1;
|
|
|
|
|
|
|
|
|
|
if (match && !encoded)
|
|
|
|
|
{
|
|
|
|
|
/* One needed check before declaring a positive match is to verify
|
|
|
|
|
that iff we are doing a verbatim match, the decoded version
|
|
|
|
|
of the symbol name starts with '<'. Otherwise, this symbol name
|
|
|
|
|
is not a suitable completion. */
|
|
|
|
|
const char *sym_name_copy = sym_name;
|
|
|
|
|
int has_angle_bracket;
|
|
|
|
|
|
|
|
|
|
sym_name = ada_decode (sym_name);
|
|
|
|
|
has_angle_bracket = (sym_name[0] == '<');
|
|
|
|
|
match = (has_angle_bracket == verbatim_match);
|
|
|
|
|
sym_name = sym_name_copy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (match && !verbatim_match)
|
|
|
|
|
{
|
|
|
|
|
/* When doing non-verbatim match, another check that needs to
|
|
|
|
|
be done is to verify that the potentially matching symbol name
|
|
|
|
|
does not include capital letters, because the ada-mode would
|
|
|
|
|
not be able to understand these symbol names without the
|
|
|
|
|
angle bracket notation. */
|
|
|
|
|
const char *tmp;
|
|
|
|
|
|
|
|
|
|
for (tmp = sym_name; *tmp != '\0' && !isupper (*tmp); tmp++);
|
|
|
|
|
if (*tmp != '\0')
|
|
|
|
|
match = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Second: Try wild matching... */
|
|
|
|
|
|
|
|
|
|
if (!match && wild_match)
|
|
|
|
|
{
|
|
|
|
|
/* Since we are doing wild matching, this means that TEXT
|
|
|
|
|
may represent an unqualified symbol name. We therefore must
|
|
|
|
|
also compare TEXT against the unqualified name of the symbol. */
|
|
|
|
|
sym_name = ada_unqualified_name (ada_decode (sym_name));
|
|
|
|
|
|
|
|
|
|
if (strncmp (sym_name, text, text_len) == 0)
|
|
|
|
|
match = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finally: If we found a mach, prepare the result to return. */
|
|
|
|
|
|
|
|
|
|
if (!match)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (verbatim_match)
|
|
|
|
|
sym_name = add_angle_brackets (sym_name);
|
|
|
|
|
|
|
|
|
|
if (!encoded)
|
|
|
|
|
sym_name = ada_decode (sym_name);
|
|
|
|
|
|
|
|
|
|
return sym_name;
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-07 20:06:51 +01:00
|
|
|
|
DEF_VEC_P (char_ptr);
|
|
|
|
|
|
2008-02-05 23:17:41 +01:00
|
|
|
|
/* A companion function to ada_make_symbol_completion_list().
|
|
|
|
|
Check if SYM_NAME represents a symbol which name would be suitable
|
|
|
|
|
to complete TEXT (TEXT_LEN is the length of TEXT), in which case
|
|
|
|
|
it is appended at the end of the given string vector SV.
|
|
|
|
|
|
|
|
|
|
ORIG_TEXT is the string original string from the user command
|
|
|
|
|
that needs to be completed. WORD is the entire command on which
|
|
|
|
|
completion should be performed. These two parameters are used to
|
|
|
|
|
determine which part of the symbol name should be added to the
|
|
|
|
|
completion vector.
|
|
|
|
|
if WILD_MATCH is set, then wild matching is performed.
|
|
|
|
|
ENCODED should be set if TEXT represents a symbol name in its
|
|
|
|
|
encoded formed (in which case the completion should also be
|
|
|
|
|
encoded). */
|
|
|
|
|
|
|
|
|
|
static void
|
2008-02-07 23:27:53 +01:00
|
|
|
|
symbol_completion_add (VEC(char_ptr) **sv,
|
2008-02-05 23:17:41 +01:00
|
|
|
|
const char *sym_name,
|
|
|
|
|
const char *text, int text_len,
|
|
|
|
|
const char *orig_text, const char *word,
|
|
|
|
|
int wild_match, int encoded)
|
|
|
|
|
{
|
|
|
|
|
const char *match = symbol_completion_match (sym_name, text, text_len,
|
|
|
|
|
wild_match, encoded);
|
|
|
|
|
char *completion;
|
|
|
|
|
|
|
|
|
|
if (match == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* We found a match, so add the appropriate completion to the given
|
|
|
|
|
string vector. */
|
|
|
|
|
|
|
|
|
|
if (word == orig_text)
|
|
|
|
|
{
|
|
|
|
|
completion = xmalloc (strlen (match) + 5);
|
|
|
|
|
strcpy (completion, match);
|
|
|
|
|
}
|
|
|
|
|
else if (word > orig_text)
|
|
|
|
|
{
|
|
|
|
|
/* Return some portion of sym_name. */
|
|
|
|
|
completion = xmalloc (strlen (match) + 5);
|
|
|
|
|
strcpy (completion, match + (word - orig_text));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Return some of ORIG_TEXT plus sym_name. */
|
|
|
|
|
completion = xmalloc (strlen (match) + (orig_text - word) + 5);
|
|
|
|
|
strncpy (completion, word, orig_text - word);
|
|
|
|
|
completion[orig_text - word] = '\0';
|
|
|
|
|
strcat (completion, match);
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-07 23:27:53 +01:00
|
|
|
|
VEC_safe_push (char_ptr, *sv, completion);
|
2008-02-05 23:17:41 +01:00
|
|
|
|
}
|
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
/* An object of this type is passed as the user_data argument to the
|
|
|
|
|
map_partial_symbol_names method. */
|
|
|
|
|
struct add_partial_datum
|
|
|
|
|
{
|
|
|
|
|
VEC(char_ptr) **completions;
|
|
|
|
|
char *text;
|
|
|
|
|
int text_len;
|
|
|
|
|
char *text0;
|
|
|
|
|
char *word;
|
|
|
|
|
int wild_match;
|
|
|
|
|
int encoded;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A callback for map_partial_symbol_names. */
|
|
|
|
|
static void
|
|
|
|
|
ada_add_partial_symbol_completions (const char *name, void *user_data)
|
|
|
|
|
{
|
|
|
|
|
struct add_partial_datum *data = user_data;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
symbol_completion_add (data->completions, name,
|
|
|
|
|
data->text, data->text_len, data->text0, data->word,
|
|
|
|
|
data->wild_match, data->encoded);
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-05 23:17:41 +01:00
|
|
|
|
/* Return a list of possible symbol names completing TEXT0. The list
|
|
|
|
|
is NULL terminated. WORD is the entire command on which completion
|
|
|
|
|
is made. */
|
|
|
|
|
|
|
|
|
|
static char **
|
|
|
|
|
ada_make_symbol_completion_list (char *text0, char *word)
|
|
|
|
|
{
|
|
|
|
|
char *text;
|
|
|
|
|
int text_len;
|
|
|
|
|
int wild_match;
|
|
|
|
|
int encoded;
|
2008-02-07 20:06:51 +01:00
|
|
|
|
VEC(char_ptr) *completions = VEC_alloc (char_ptr, 128);
|
2008-02-05 23:17:41 +01:00
|
|
|
|
struct symbol *sym;
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct objfile *objfile;
|
|
|
|
|
struct block *b, *surrounding_static_block = 0;
|
|
|
|
|
int i;
|
|
|
|
|
struct dict_iterator iter;
|
|
|
|
|
|
|
|
|
|
if (text0[0] == '<')
|
|
|
|
|
{
|
|
|
|
|
text = xstrdup (text0);
|
|
|
|
|
make_cleanup (xfree, text);
|
|
|
|
|
text_len = strlen (text);
|
|
|
|
|
wild_match = 0;
|
|
|
|
|
encoded = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
text = xstrdup (ada_encode (text0));
|
|
|
|
|
make_cleanup (xfree, text);
|
|
|
|
|
text_len = strlen (text);
|
|
|
|
|
for (i = 0; i < text_len; i++)
|
|
|
|
|
text[i] = tolower (text[i]);
|
|
|
|
|
|
|
|
|
|
encoded = (strstr (text0, "__") != NULL);
|
|
|
|
|
/* If the name contains a ".", then the user is entering a fully
|
|
|
|
|
qualified entity name, and the match must not be done in wild
|
|
|
|
|
mode. Similarly, if the user wants to complete what looks like
|
|
|
|
|
an encoded name, the match must not be done in wild mode. */
|
|
|
|
|
wild_match = (strchr (text0, '.') == NULL && !encoded);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First, look at the partial symtab symbols. */
|
|
|
|
|
{
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
struct add_partial_datum data;
|
|
|
|
|
|
|
|
|
|
data.completions = &completions;
|
|
|
|
|
data.text = text;
|
|
|
|
|
data.text_len = text_len;
|
|
|
|
|
data.text0 = text0;
|
|
|
|
|
data.word = word;
|
|
|
|
|
data.wild_match = wild_match;
|
|
|
|
|
data.encoded = encoded;
|
|
|
|
|
map_partial_symbol_names (ada_add_partial_symbol_completions, &data);
|
2008-02-05 23:17:41 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* At this point scan through the misc symbol vectors and add each
|
|
|
|
|
symbol you find to the list. Eventually we want to ignore
|
|
|
|
|
anything that isn't a text symbol (everything else will be
|
|
|
|
|
handled by the psymtab code above). */
|
|
|
|
|
|
|
|
|
|
ALL_MSYMBOLS (objfile, msymbol)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
2008-02-07 23:27:53 +01:00
|
|
|
|
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (msymbol),
|
2008-02-05 23:17:41 +01:00
|
|
|
|
text, text_len, text0, word, wild_match, encoded);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search upwards from currently selected frame (so that we can
|
|
|
|
|
complete on local vars. */
|
|
|
|
|
|
|
|
|
|
for (b = get_selected_block (0); b != NULL; b = BLOCK_SUPERBLOCK (b))
|
|
|
|
|
{
|
|
|
|
|
if (!BLOCK_SUPERBLOCK (b))
|
|
|
|
|
surrounding_static_block = b; /* For elmin of dups */
|
|
|
|
|
|
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
|
|
|
|
{
|
2008-02-07 23:27:53 +01:00
|
|
|
|
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
|
2008-02-05 23:17:41 +01:00
|
|
|
|
text, text_len, text0, word,
|
|
|
|
|
wild_match, encoded);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Go through the symtabs and check the externs and statics for
|
|
|
|
|
symbols which match. */
|
|
|
|
|
|
|
|
|
|
ALL_SYMTABS (objfile, s)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
|
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
|
|
|
|
{
|
2008-02-07 23:27:53 +01:00
|
|
|
|
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
|
2008-02-05 23:17:41 +01:00
|
|
|
|
text, text_len, text0, word,
|
|
|
|
|
wild_match, encoded);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ALL_SYMTABS (objfile, s)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
|
|
|
|
|
/* Don't do this block twice. */
|
|
|
|
|
if (b == surrounding_static_block)
|
|
|
|
|
continue;
|
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
|
|
|
|
{
|
2008-02-07 23:27:53 +01:00
|
|
|
|
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
|
2008-02-05 23:17:41 +01:00
|
|
|
|
text, text_len, text0, word,
|
|
|
|
|
wild_match, encoded);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Append the closing NULL entry. */
|
2008-02-07 20:06:51 +01:00
|
|
|
|
VEC_safe_push (char_ptr, completions, NULL);
|
2008-02-05 23:17:41 +01:00
|
|
|
|
|
2008-02-07 20:06:51 +01:00
|
|
|
|
/* Make a copy of the COMPLETIONS VEC before we free it, and then
|
|
|
|
|
return the copy. It's unfortunate that we have to make a copy
|
|
|
|
|
of an array that we're about to destroy, but there is nothing much
|
|
|
|
|
we can do about it. Fortunately, it's typically not a very large
|
|
|
|
|
array. */
|
|
|
|
|
{
|
|
|
|
|
const size_t completions_size =
|
|
|
|
|
VEC_length (char_ptr, completions) * sizeof (char *);
|
|
|
|
|
char **result = malloc (completions_size);
|
|
|
|
|
|
|
|
|
|
memcpy (result, VEC_address (char_ptr, completions), completions_size);
|
|
|
|
|
|
|
|
|
|
VEC_free (char_ptr, completions);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
2008-02-05 23:17:41 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* Field Access */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2008-01-01 08:21:59 +01:00
|
|
|
|
/* Return non-zero if TYPE is a pointer to the GNAT dispatch table used
|
|
|
|
|
for tagged types. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_is_dispatch_table_ptr_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) != TYPE_CODE_PTR)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
name = TYPE_NAME (TYPE_TARGET_TYPE (type));
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return (strcmp (name, "ada__tags__dispatch_table") == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* True if field number FIELD_NUM in struct or union type TYPE is supposed
|
|
|
|
|
to be invisible to users. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
int
|
|
|
|
|
ada_is_ignored_field (struct type *type, int field_num)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2004-10-01 12:23:09 +02:00
|
|
|
|
if (field_num < 0 || field_num > TYPE_NFIELDS (type))
|
|
|
|
|
return 1;
|
2008-01-01 08:21:59 +01:00
|
|
|
|
|
|
|
|
|
/* Check the name of that field. */
|
|
|
|
|
{
|
|
|
|
|
const char *name = TYPE_FIELD_NAME (type, field_num);
|
|
|
|
|
|
|
|
|
|
/* Anonymous field names should not be printed.
|
|
|
|
|
brobecker/2007-02-20: I don't think this can actually happen
|
|
|
|
|
but we don't want to print the value of annonymous fields anyway. */
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* A field named "_parent" is internally generated by GNAT for
|
|
|
|
|
tagged types, and should not be printed either. */
|
|
|
|
|
if (name[0] == '_' && strncmp (name, "_parent", 7) != 0)
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is the dispatch table of a tagged type, then ignore. */
|
|
|
|
|
if (ada_is_tagged_type (type, 1)
|
|
|
|
|
&& ada_is_dispatch_table_ptr_type (TYPE_FIELD_TYPE (type, field_num)))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Not a special field, so it should not be ignored. */
|
|
|
|
|
return 0;
|
2004-10-01 12:23:09 +02:00
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* True iff TYPE has a tag field. If REFOK, then TYPE may also be a
|
|
|
|
|
pointer or reference type whose ultimate target has a tag field. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
int
|
|
|
|
|
ada_is_tagged_type (struct type *type, int refok)
|
|
|
|
|
{
|
|
|
|
|
return (ada_lookup_struct_elt_type (type, "_tag", refok, 1, NULL) != NULL);
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* True iff TYPE represents the type of X'Tag */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
int
|
|
|
|
|
ada_is_tag_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_PTR)
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2004-10-01 12:23:09 +02:00
|
|
|
|
const char *name = ada_type_name (TYPE_TARGET_TYPE (type));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
return (name != NULL
|
|
|
|
|
&& strcmp (name, "ada__tags__dispatch_table") == 0);
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* The type of the tag on VAL. */
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_tag_type (struct value *val)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return ada_lookup_struct_elt_type (value_type (val), "_tag", 1, 0, NULL);
|
2004-10-01 12:23:09 +02:00
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* The value of the tag on VAL. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
struct value *
|
|
|
|
|
ada_value_tag (struct value *val)
|
|
|
|
|
{
|
2006-01-12 09:36:29 +01:00
|
|
|
|
return ada_value_struct_elt (val, "_tag", 0);
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
/* The value of the tag on the object of type TYPE whose contents are
|
|
|
|
|
saved at VALADDR, if it is non-null, or is at memory address
|
|
|
|
|
ADDRESS. */
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
static struct value *
|
2005-01-28 20:56:01 +01:00
|
|
|
|
value_tag_from_contents_and_address (struct type *type,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *valaddr,
|
2004-10-01 12:23:09 +02:00
|
|
|
|
CORE_ADDR address)
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2010-05-07 01:36:39 +02:00
|
|
|
|
int tag_byte_offset;
|
2004-10-01 12:23:09 +02:00
|
|
|
|
struct type *tag_type;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
NULL, NULL, NULL))
|
2004-06-16 10:18:06 +02:00
|
|
|
|
{
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *valaddr1 = ((valaddr == NULL)
|
2005-01-28 20:56:01 +01:00
|
|
|
|
? NULL
|
|
|
|
|
: valaddr + tag_byte_offset);
|
2004-10-01 12:23:09 +02:00
|
|
|
|
CORE_ADDR address1 = (address == 0) ? 0 : address + tag_byte_offset;
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
return value_from_contents_and_address (tag_type, valaddr1, address1);
|
2004-06-16 10:18:06 +02:00
|
|
|
|
}
|
2004-10-01 12:23:09 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
type_from_tag (struct value *tag)
|
|
|
|
|
{
|
|
|
|
|
const char *type_name = ada_tag_name (tag);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
if (type_name != NULL)
|
|
|
|
|
return ada_find_any_type (ada_encode (type_name));
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2004-06-16 10:18:06 +02:00
|
|
|
|
|
2004-10-01 12:23:09 +02:00
|
|
|
|
struct tag_args
|
|
|
|
|
{
|
|
|
|
|
struct value *tag;
|
|
|
|
|
char *name;
|
|
|
|
|
};
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
|
|
|
|
static int ada_tag_name_1 (void *);
|
|
|
|
|
static int ada_tag_name_2 (struct tag_args *);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Wrapper function used by ada_tag_name. Given a struct tag_args*
|
|
|
|
|
value ARGS, sets ARGS->name to the tag name of ARGS->tag.
|
|
|
|
|
The value stored in ARGS->name is valid until the next call to
|
|
|
|
|
ada_tag_name_1. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_tag_name_1 (void *args0)
|
|
|
|
|
{
|
|
|
|
|
struct tag_args *args = (struct tag_args *) args0;
|
|
|
|
|
static char name[1024];
|
2004-06-27 21:06:23 +02:00
|
|
|
|
char *p;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *val;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
args->name = NULL;
|
2006-01-12 09:36:29 +01:00
|
|
|
|
val = ada_value_struct_elt (args->tag, "tsd", 1);
|
2006-01-02 10:39:21 +01:00
|
|
|
|
if (val == NULL)
|
|
|
|
|
return ada_tag_name_2 (args);
|
2006-01-12 09:36:29 +01:00
|
|
|
|
val = ada_value_struct_elt (val, "expanded_name", 1);
|
2006-01-02 10:39:21 +01:00
|
|
|
|
if (val == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
read_memory_string (value_as_address (val), name, sizeof (name) - 1);
|
|
|
|
|
for (p = name; *p != '\0'; p += 1)
|
|
|
|
|
if (isalpha (*p))
|
|
|
|
|
*p = tolower (*p);
|
|
|
|
|
args->name = name;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-28 03:32:08 +02:00
|
|
|
|
/* Return the "ada__tags__type_specific_data" type. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
ada_get_tsd_type (struct inferior *inf)
|
|
|
|
|
{
|
|
|
|
|
struct ada_inferior_data *data = get_ada_inferior_data (inf);
|
|
|
|
|
|
|
|
|
|
if (data->tsd_type == 0)
|
|
|
|
|
data->tsd_type = ada_find_any_type ("ada__tags__type_specific_data");
|
|
|
|
|
return data->tsd_type;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Utility function for ada_tag_name_1 that tries the second
|
|
|
|
|
representation for the dispatch table (in which there is no
|
|
|
|
|
explicit 'tsd' field in the referent of the tag pointer, and instead
|
|
|
|
|
the tsd pointer is stored just before the dispatch table. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_tag_name_2 (struct tag_args *args)
|
|
|
|
|
{
|
|
|
|
|
struct type *info_type;
|
|
|
|
|
static char name[1024];
|
|
|
|
|
char *p;
|
|
|
|
|
struct value *val, *valp;
|
|
|
|
|
|
|
|
|
|
args->name = NULL;
|
2010-05-28 03:32:08 +02:00
|
|
|
|
info_type = ada_get_tsd_type (current_inferior());
|
2006-01-02 10:39:21 +01:00
|
|
|
|
if (info_type == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
info_type = lookup_pointer_type (lookup_pointer_type (info_type));
|
|
|
|
|
valp = value_cast (info_type, args->tag);
|
|
|
|
|
if (valp == NULL)
|
|
|
|
|
return 0;
|
* value.h (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* valarith.c (value_subscript, value_subscripted_rvalue,
value_bitstring_subscript, value_ptradd): Use LONGEST instead
of value as type of the index argument.
(value_ptrsub): Remove.
* wrapper.h (gdb_value_subscript): Use LONGEST instead of
value as type of the index argument.
* wrapper.c (gdb_value_subscript): Likewise.
Update calls to gdb_value_subscript, value_subscript,
value_subscripted_rvalue, value_bitstring_subscript and
value_ptradd to use LONGEST instead of value as index
argument type. Use value_ptradd instead of value_ptrsub.
* ada-lang.c (ada_value_subscript, ada_value_ptr_subscript,
ada_tag_name_2): Update.
* ada-tasks.c (read_atcb): Update.
* eval.c (evaluate_subexp_standard): Update.
* valarith.c (value_subscript): Update.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Update.
* gnu-v3-abi.c (gnuv3_get_virtual_fn, gnuv3_baseclass_offset,
gnuv3_method_ptr_to_value): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* m2-lang.c (evaluate_subexp_modula2): Update.
* python/python-value.c (valpy_getitem, valpy_binop): Update.
* wrapper.c (gdb_value_subscript): Update.
* varobj.c (c_describe_child): Update.
2009-06-29 15:24:41 +02:00
|
|
|
|
val = value_ind (value_ptradd (valp, -1));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (val == NULL)
|
|
|
|
|
return 0;
|
2006-01-12 09:36:29 +01:00
|
|
|
|
val = ada_value_struct_elt (val, "expanded_name", 1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (val == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
read_memory_string (value_as_address (val), name, sizeof (name) - 1);
|
|
|
|
|
for (p = name; *p != '\0'; p += 1)
|
|
|
|
|
if (isalpha (*p))
|
|
|
|
|
*p = tolower (*p);
|
|
|
|
|
args->name = name;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The type name of the dynamic type denoted by the 'tag value TAG, as
|
2010-05-28 03:32:08 +02:00
|
|
|
|
a C string. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
ada_tag_name (struct value *tag)
|
|
|
|
|
{
|
|
|
|
|
struct tag_args args;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (!ada_is_tag_type (value_type (tag)))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
args.tag = tag;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
args.name = NULL;
|
|
|
|
|
catch_errors (ada_tag_name_1, &args, NULL, RETURN_MASK_ALL);
|
|
|
|
|
return args.name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The parent type of TYPE, or NULL if none. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_parent_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
|
|
|
|
if (ada_is_parent_field (type, i))
|
2008-09-10 22:14:30 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *parent_type = TYPE_FIELD_TYPE (type, i);
|
|
|
|
|
|
|
|
|
|
/* If the _parent field is a pointer, then dereference it. */
|
|
|
|
|
if (TYPE_CODE (parent_type) == TYPE_CODE_PTR)
|
|
|
|
|
parent_type = TYPE_TARGET_TYPE (parent_type);
|
|
|
|
|
/* If there is a parallel XVS type, get the actual base type. */
|
|
|
|
|
parent_type = ada_get_base_type (parent_type);
|
|
|
|
|
|
|
|
|
|
return ada_check_typedef (parent_type);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff field number FIELD_NUM of structure type TYPE contains the
|
|
|
|
|
parent-type (inherited) fields of a derived type. Assumes TYPE is
|
|
|
|
|
a structure type with at least FIELD_NUM+1 fields. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_parent_field (struct type *type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
const char *name = TYPE_FIELD_NAME (ada_check_typedef (type), field_num);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return (name != NULL
|
|
|
|
|
&& (strncmp (name, "PARENT", 6) == 0
|
|
|
|
|
|| strncmp (name, "_parent", 7) == 0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff field number FIELD_NUM of structure type TYPE is a
|
2002-06-04 17:28:49 +02:00
|
|
|
|
transparent wrapper field (which should be silently traversed when doing
|
2004-06-02 11:55:36 +02:00
|
|
|
|
field selection and flattened when printing). Assumes TYPE is a
|
2002-06-04 17:28:49 +02:00
|
|
|
|
structure type with at least FIELD_NUM+1 fields. Such fields are always
|
2004-06-02 11:55:36 +02:00
|
|
|
|
structures. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_wrapper_field (struct type *type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *name = TYPE_FIELD_NAME (type, field_num);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (name != NULL
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& (strncmp (name, "PARENT", 6) == 0
|
|
|
|
|
|| strcmp (name, "REP") == 0
|
|
|
|
|
|| strncmp (name, "_parent", 7) == 0
|
|
|
|
|
|| name[0] == 'S' || name[0] == 'R' || name[0] == 'O'));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff field number FIELD_NUM of structure or union type TYPE
|
|
|
|
|
is a variant wrapper. Assumes TYPE is a structure type with at least
|
|
|
|
|
FIELD_NUM+1 fields. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_variant_part (struct type *type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *field_type = TYPE_FIELD_TYPE (type, field_num);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (TYPE_CODE (field_type) == TYPE_CODE_UNION
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| (is_dynamic_field (type, field_num)
|
2004-07-09 21:29:56 +02:00
|
|
|
|
&& (TYPE_CODE (TYPE_TARGET_TYPE (field_type))
|
|
|
|
|
== TYPE_CODE_UNION)));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that VAR_TYPE is a variant wrapper (type of the variant part)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
whose discriminants are contained in the record type OUTER_TYPE,
|
2009-06-29 19:30:12 +02:00
|
|
|
|
returns the type of the controlling discriminant for the variant.
|
|
|
|
|
May return NULL if the type could not be found. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_variant_discrim_type (struct type *var_type, struct type *outer_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *name = ada_variant_discrim_name (var_type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2009-06-29 19:30:12 +02:00
|
|
|
|
return ada_lookup_struct_elt_type (outer_type, name, 1, 1, NULL);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Assuming that TYPE is the type of a variant wrapper, and FIELD_NUM is a
|
2002-06-04 17:28:49 +02:00
|
|
|
|
valid field number within it, returns 1 iff field FIELD_NUM of TYPE
|
2004-06-02 11:55:36 +02:00
|
|
|
|
represents a 'when others' clause; otherwise 0. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_others_clause (struct type *type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *name = TYPE_FIELD_NAME (type, field_num);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (name != NULL && name[0] == 'O');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that TYPE0 is the type of the variant part of a record,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
returns the name of the discriminant controlling the variant.
|
|
|
|
|
The value is valid until the next call to ada_variant_discrim_name. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_variant_discrim_name (struct type *type0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static char *result = NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
static size_t result_len = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *type;
|
|
|
|
|
const char *name;
|
|
|
|
|
const char *discrim_end;
|
|
|
|
|
const char *discrim_start;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type0) == TYPE_CODE_PTR)
|
|
|
|
|
type = TYPE_TARGET_TYPE (type0);
|
|
|
|
|
else
|
|
|
|
|
type = type0;
|
|
|
|
|
|
|
|
|
|
name = ada_type_name (type);
|
|
|
|
|
|
|
|
|
|
if (name == NULL || name[0] == '\000')
|
|
|
|
|
return "";
|
|
|
|
|
|
|
|
|
|
for (discrim_end = name + strlen (name) - 6; discrim_end != name;
|
|
|
|
|
discrim_end -= 1)
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (strncmp (discrim_end, "___XVN", 6) == 0)
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
if (discrim_end == name)
|
|
|
|
|
return "";
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (discrim_start = discrim_end; discrim_start != name + 3;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
discrim_start -= 1)
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (discrim_start == name + 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return "";
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if ((discrim_start > name + 3
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& strncmp (discrim_start - 3, "___", 3) == 0)
|
|
|
|
|
|| discrim_start[-1] == '.')
|
|
|
|
|
break;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GROW_VECT (result, result_len, discrim_end - discrim_start + 1);
|
|
|
|
|
strncpy (result, discrim_start, discrim_end - discrim_start);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
result[discrim_end - discrim_start] = '\0';
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Scan STR for a subtype-encoded number, beginning at position K.
|
|
|
|
|
Put the position of the character just past the number scanned in
|
|
|
|
|
*NEW_K, if NEW_K!=NULL. Put the scanned number in *R, if R!=NULL.
|
|
|
|
|
Return 1 if there was a valid number at the given position, and 0
|
|
|
|
|
otherwise. A "subtype-encoded" number consists of the absolute value
|
|
|
|
|
in decimal, followed by the letter 'm' to indicate a negative number.
|
|
|
|
|
Assumes 0m does not occur. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_scan_number (const char str[], int k, LONGEST * R, int *new_k)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
ULONGEST RU;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (!isdigit (str[k]))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Do it the hard way so as not to make any assumption about
|
2002-06-04 17:28:49 +02:00
|
|
|
|
the relationship of unsigned long (%lu scan format code) and
|
2004-06-02 11:55:36 +02:00
|
|
|
|
LONGEST. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
RU = 0;
|
|
|
|
|
while (isdigit (str[k]))
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
RU = RU * 10 + (str[k] - '0');
|
2002-06-04 17:28:49 +02:00
|
|
|
|
k += 1;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (str[k] == 'm')
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (R != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*R = (-(LONGEST) (RU - 1)) - 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
k += 1;
|
|
|
|
|
}
|
|
|
|
|
else if (R != NULL)
|
|
|
|
|
*R = (LONGEST) RU;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* NOTE on the above: Technically, C does not say what the results of
|
2002-06-04 17:28:49 +02:00
|
|
|
|
- (LONGEST) RU or (LONGEST) -RU are for RU == largest positive
|
|
|
|
|
number representable as a LONGEST (although either would probably work
|
|
|
|
|
in most implementations). When RU>0, the locution in the then branch
|
2004-06-02 11:55:36 +02:00
|
|
|
|
above is always equivalent to the negative of RU. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (new_k != NULL)
|
|
|
|
|
*new_k = k;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Assuming that TYPE is a variant part wrapper type (a VARIANTS field),
|
|
|
|
|
and FIELD_NUM is a valid field number within it, returns 1 iff VAL is
|
|
|
|
|
in the range encoded by field FIELD_NUM of TYPE; otherwise 0. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_in_variant (LONGEST val, struct type *type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *name = TYPE_FIELD_NAME (type, field_num);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int p;
|
|
|
|
|
|
|
|
|
|
p = 0;
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (name[p])
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case '\0':
|
|
|
|
|
return 0;
|
|
|
|
|
case 'S':
|
|
|
|
|
{
|
|
|
|
|
LONGEST W;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (!ada_scan_number (name, p + 1, &W, &p))
|
|
|
|
|
return 0;
|
|
|
|
|
if (val == W)
|
|
|
|
|
return 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case 'R':
|
|
|
|
|
{
|
|
|
|
|
LONGEST L, U;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (!ada_scan_number (name, p + 1, &L, &p)
|
|
|
|
|
|| name[p] != 'T' || !ada_scan_number (name, p + 1, &U, &p))
|
|
|
|
|
return 0;
|
|
|
|
|
if (val >= L && val <= U)
|
|
|
|
|
return 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case 'O':
|
|
|
|
|
return 1;
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* FIXME: Lots of redundancy below. Try to consolidate. */
|
|
|
|
|
|
|
|
|
|
/* Given a value ARG1 (offset by OFFSET bytes) of a struct or union type
|
|
|
|
|
ARG_TYPE, extract and return the value of one of its (non-static)
|
|
|
|
|
fields. FIELDNO says which field. Differs from value_primitive_field
|
|
|
|
|
only in that it can handle packed values of arbitrary type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *arg_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
arg_type = ada_check_typedef (arg_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
type = TYPE_FIELD_TYPE (arg_type, fieldno);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Handle packed fields. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
|
|
|
|
|
{
|
|
|
|
|
int bit_pos = TYPE_FIELD_BITPOS (arg_type, fieldno);
|
|
|
|
|
int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
return ada_value_primitive_packed_val (arg1, value_contents (arg1),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
offset + bit_pos / 8,
|
|
|
|
|
bit_pos % 8, bit_size, type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return value_primitive_field (arg1, offset, fieldno, arg_type);
|
|
|
|
|
}
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Find field with name NAME in object of type TYPE. If found,
|
|
|
|
|
set the following for each argument that is non-null:
|
|
|
|
|
- *FIELD_TYPE_P to the field's type;
|
|
|
|
|
- *BYTE_OFFSET_P to OFFSET + the byte offset of the field within
|
|
|
|
|
an object of that type;
|
|
|
|
|
- *BIT_OFFSET_P to the bit offset modulo byte size of the field;
|
|
|
|
|
- *BIT_SIZE_P to its size in bits if the field is packed, and
|
|
|
|
|
0 otherwise;
|
|
|
|
|
If INDEX_P is non-null, increment *INDEX_P by the number of source-visible
|
|
|
|
|
fields up to but not including the desired field, or by the total
|
|
|
|
|
number of fields if not found. A NULL value of NAME never
|
|
|
|
|
matches; the function just counts visible fields in this case.
|
|
|
|
|
|
|
|
|
|
Returns 1 if found, 0 otherwise. */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static int
|
2004-06-27 21:06:23 +02:00
|
|
|
|
find_struct_field (char *name, struct type *type, int offset,
|
|
|
|
|
struct type **field_type_p,
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
int *byte_offset_p, int *bit_offset_p, int *bit_size_p,
|
|
|
|
|
int *index_p)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (field_type_p != NULL)
|
|
|
|
|
*field_type_p = NULL;
|
|
|
|
|
if (byte_offset_p != NULL)
|
2007-01-03 20:01:25 +01:00
|
|
|
|
*byte_offset_p = 0;
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (bit_offset_p != NULL)
|
|
|
|
|
*bit_offset_p = 0;
|
|
|
|
|
if (bit_size_p != NULL)
|
|
|
|
|
*bit_size_p = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int bit_pos = TYPE_FIELD_BITPOS (type, i);
|
|
|
|
|
int fld_offset = offset + bit_pos / 8;
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (type, i);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (t_field_name == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
else if (name != NULL && field_name_match (t_field_name, name))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
int bit_size = TYPE_FIELD_BITSIZE (type, i);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (field_type_p != NULL)
|
|
|
|
|
*field_type_p = TYPE_FIELD_TYPE (type, i);
|
|
|
|
|
if (byte_offset_p != NULL)
|
|
|
|
|
*byte_offset_p = fld_offset;
|
|
|
|
|
if (bit_offset_p != NULL)
|
|
|
|
|
*bit_offset_p = bit_pos % 8;
|
|
|
|
|
if (bit_size_p != NULL)
|
|
|
|
|
*bit_size_p = bit_size;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (ada_is_wrapper_field (type, i))
|
|
|
|
|
{
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (find_struct_field (name, TYPE_FIELD_TYPE (type, i), fld_offset,
|
|
|
|
|
field_type_p, byte_offset_p, bit_offset_p,
|
|
|
|
|
bit_size_p, index_p))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (ada_is_variant_part (type, i))
|
|
|
|
|
{
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* PNH: Wait. Do we ever execute this section, or is ARG always of
|
|
|
|
|
fixed type?? */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int j;
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
struct type *field_type
|
|
|
|
|
= ada_check_typedef (TYPE_FIELD_TYPE (type, i));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (find_struct_field (name, TYPE_FIELD_TYPE (field_type, j),
|
|
|
|
|
fld_offset
|
|
|
|
|
+ TYPE_FIELD_BITPOS (field_type, j) / 8,
|
|
|
|
|
field_type_p, byte_offset_p,
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
bit_offset_p, bit_size_p, index_p))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
else if (index_p != NULL)
|
|
|
|
|
*index_p += 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Number of user-visible fields in record type TYPE. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
static int
|
|
|
|
|
num_visible_fields (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
int n;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
n = 0;
|
|
|
|
|
find_struct_field (NULL, type, 0, NULL, NULL, NULL, NULL, &n);
|
|
|
|
|
return n;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Look for a field NAME in ARG. Adjust the address of ARG by OFFSET bytes,
|
2002-06-04 17:28:49 +02:00
|
|
|
|
and search in it assuming it has (class) type TYPE.
|
|
|
|
|
If found, return value, else return NULL.
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
Searches recursively through wrapper fields (e.g., '_parent'). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_search_struct_field (char *name, struct value *arg, int offset,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-05-18 21:23:37 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (type, i);
|
|
|
|
|
|
|
|
|
|
if (t_field_name == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
continue;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (field_name_match (t_field_name, name))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_value_primitive_field (arg, offset, i, type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (ada_is_wrapper_field (type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-28 20:59:14 +02:00
|
|
|
|
struct value *v = /* Do not let indent join lines here. */
|
|
|
|
|
ada_search_struct_field (name, arg,
|
|
|
|
|
offset + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
|
|
|
TYPE_FIELD_TYPE (type, i));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (v != NULL)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (ada_is_variant_part (type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* PNH: Do we ever get here? See find_struct_field. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int j;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
|
|
|
|
|
i));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int var_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-28 20:59:14 +02:00
|
|
|
|
struct value *v = ada_search_struct_field /* Force line break. */
|
|
|
|
|
(name, arg,
|
|
|
|
|
var_offset + TYPE_FIELD_BITPOS (field_type, j) / 8,
|
|
|
|
|
TYPE_FIELD_TYPE (field_type, j));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (v != NULL)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
static struct value *ada_index_struct_field_1 (int *, struct value *,
|
|
|
|
|
int, struct type *);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return field #INDEX in ARG, where the index is that returned by
|
|
|
|
|
* find_struct_field through its INDEX_P argument. Adjust the address
|
|
|
|
|
* of ARG by OFFSET bytes, and search in it assuming it has (class) type TYPE.
|
|
|
|
|
* If found, return value, else return NULL. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_index_struct_field (int index, struct value *arg, int offset,
|
|
|
|
|
struct type *type)
|
|
|
|
|
{
|
|
|
|
|
return ada_index_struct_field_1 (&index, arg, offset, type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Auxiliary function for ada_index_struct_field. Like
|
|
|
|
|
* ada_index_struct_field, but takes index from *INDEX_P and modifies
|
|
|
|
|
* *INDEX_P. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_index_struct_field_1 (int *index_p, struct value *arg, int offset,
|
|
|
|
|
struct type *type)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
type = ada_check_typedef (type);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_FIELD_NAME (type, i) == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
else if (ada_is_wrapper_field (type, i))
|
|
|
|
|
{
|
|
|
|
|
struct value *v = /* Do not let indent join lines here. */
|
|
|
|
|
ada_index_struct_field_1 (index_p, arg,
|
|
|
|
|
offset + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
|
|
|
TYPE_FIELD_TYPE (type, i));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (v != NULL)
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (ada_is_variant_part (type, i))
|
|
|
|
|
{
|
|
|
|
|
/* PNH: Do we ever get here? See ada_search_struct_field,
|
|
|
|
|
find_struct_field. */
|
|
|
|
|
error (_("Cannot assign this kind of variant record"));
|
|
|
|
|
}
|
|
|
|
|
else if (*index_p == 0)
|
|
|
|
|
return ada_value_primitive_field (arg, offset, i, type);
|
|
|
|
|
else
|
|
|
|
|
*index_p -= 1;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Given ARG, a value of type (pointer or reference to a)*
|
|
|
|
|
structure/union, extract the component named NAME from the ultimate
|
|
|
|
|
target structure/union and return it as a value with its
|
2008-12-15 11:40:28 +01:00
|
|
|
|
appropriate type.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
The routine searches for NAME among all members of the structure itself
|
|
|
|
|
and (recursively) among all members of any wrapper members
|
2002-06-04 17:28:49 +02:00
|
|
|
|
(e.g., '_parent').
|
|
|
|
|
|
2006-01-12 09:36:29 +01:00
|
|
|
|
If NO_ERR, then simply return NULL in case of error, rather than
|
|
|
|
|
calling error. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *
|
2006-01-12 09:36:29 +01:00
|
|
|
|
ada_value_struct_elt (struct value *arg, char *name, int no_err)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *t, *t1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *v;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
v = NULL;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
t1 = t = ada_check_typedef (value_type (arg));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
t1 = TYPE_TARGET_TYPE (t);
|
|
|
|
|
if (t1 == NULL)
|
2006-01-12 09:36:29 +01:00
|
|
|
|
goto BadValue;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
t1 = ada_check_typedef (t1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (t1) == TYPE_CODE_PTR)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2004-11-10 Andrew Cagney <cagney@gnu.org>
* value.h (COERCE_REF, COERCE_ARRAY, COERCE_NUMBER, COERCE_ENUM)
(coerce_ref, coerce_array, coerce_number, coerce_enum): Replace
macros with function declarations.
* value.c (coerce_ref, coerce_array, coerce_number)
(coerce_enum): New functions.
(value_as_long, value_as_address): Update.
* ada-lang.c (ada_coerce_ref, ada_value_binop)
(ada_evaluate_subexp, ada_value_assign, ada_value_struct_elt): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* valarith.c (value_less, value_neg, value_complement)
(value_binop, value_add, value_subscript, value_x_binop)
(value_logical_not, value_sub): Update.
* valops.c (check_field, value_struct_elt, value_ind)
(value_find_oload_method_list, value_cast, value_assign): Update.
* eval.c (evaluate_subexp_standard): Update.
2004-11-10 19:52:25 +01:00
|
|
|
|
arg = coerce_ref (arg);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
t = t1;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
while (TYPE_CODE (t) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
t1 = TYPE_TARGET_TYPE (t);
|
|
|
|
|
if (t1 == NULL)
|
2006-01-12 09:36:29 +01:00
|
|
|
|
goto BadValue;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
t1 = ada_check_typedef (t1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (t1) == TYPE_CODE_PTR)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
arg = value_ind (arg);
|
|
|
|
|
t = t1;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2004-06-27 21:06:23 +02:00
|
|
|
|
break;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (t1) != TYPE_CODE_STRUCT && TYPE_CODE (t1) != TYPE_CODE_UNION)
|
2006-01-12 09:36:29 +01:00
|
|
|
|
goto BadValue;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (t1 == t)
|
|
|
|
|
v = ada_search_struct_field (name, arg, 0, t);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int bit_offset, bit_size, byte_offset;
|
|
|
|
|
struct type *field_type;
|
|
|
|
|
CORE_ADDR address;
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_PTR)
|
|
|
|
|
address = value_as_address (arg);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
address = unpack_pointer (t, value_contents (arg));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2008-01-03 13:30:38 +01:00
|
|
|
|
t1 = ada_to_fixed_type (ada_get_base_type (t1), NULL, address, NULL, 1);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (find_struct_field (name, t1, 0,
|
|
|
|
|
&field_type, &byte_offset, &bit_offset,
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
&bit_size, NULL))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
if (bit_size != 0)
|
|
|
|
|
{
|
2004-10-15 11:12:24 +02:00
|
|
|
|
if (TYPE_CODE (t) == TYPE_CODE_REF)
|
|
|
|
|
arg = ada_coerce_ref (arg);
|
|
|
|
|
else
|
|
|
|
|
arg = ada_value_ind (arg);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
v = ada_value_primitive_packed_val (arg, NULL, byte_offset,
|
|
|
|
|
bit_offset, bit_size,
|
|
|
|
|
field_type);
|
|
|
|
|
}
|
|
|
|
|
else
|
2008-12-15 11:40:28 +01:00
|
|
|
|
v = value_at_lazy (field_type, address + byte_offset);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-12 09:36:29 +01:00
|
|
|
|
if (v != NULL || no_err)
|
|
|
|
|
return v;
|
|
|
|
|
else
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("There is no member named %s."), name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2006-01-12 09:36:29 +01:00
|
|
|
|
BadValue:
|
|
|
|
|
if (no_err)
|
|
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
error (_("Attempt to extract a component of a value that is not a record."));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Given a type TYPE, look up the type of the component of type named NAME.
|
2004-06-02 11:55:36 +02:00
|
|
|
|
If DISPP is non-null, add its byte displacement from the beginning of a
|
|
|
|
|
structure (pointed to by a value) of type TYPE to *DISPP (does not
|
2002-06-04 17:28:49 +02:00
|
|
|
|
work for packed fields).
|
|
|
|
|
|
|
|
|
|
Matches any field whose name has NAME as a prefix, possibly
|
2004-06-02 11:55:36 +02:00
|
|
|
|
followed by "___".
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE can be either a struct or union. If REFOK, TYPE may also
|
|
|
|
|
be a (pointer or reference)+ to a struct or union, and the
|
|
|
|
|
ultimate target type will be searched.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
Looks recursively into variant clauses and parent types.
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
If NOERR is nonzero, return NULL if NAME is not suitably defined or
|
|
|
|
|
TYPE is not a type of the right kind. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct type *
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
|
|
|
|
|
int noerr, int *dispp)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
goto BadName;
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (refok && type != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (TYPE_CODE (type) != TYPE_CODE_PTR
|
|
|
|
|
&& TYPE_CODE (type) != TYPE_CODE_REF)
|
|
|
|
|
break;
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (type == NULL
|
2004-06-27 21:28:20 +02:00
|
|
|
|
|| (TYPE_CODE (type) != TYPE_CODE_STRUCT
|
|
|
|
|
&& TYPE_CODE (type) != TYPE_CODE_UNION))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noerr)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return NULL;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
target_terminal_ours ();
|
|
|
|
|
gdb_flush (gdb_stdout);
|
2004-12-12 18:06:26 +01:00
|
|
|
|
if (type == NULL)
|
|
|
|
|
error (_("Type (null) is not a structure or union type"));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* XXX: type_sprint */
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, _("Type "));
|
|
|
|
|
type_print (type, "", gdb_stderr, -1);
|
|
|
|
|
error (_(" is not a structure or union type"));
|
|
|
|
|
}
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type = to_static_fixed_type (type);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
|
|
|
|
{
|
|
|
|
|
char *t_field_name = TYPE_FIELD_NAME (type, i);
|
|
|
|
|
struct type *t;
|
|
|
|
|
int disp;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (t_field_name == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
continue;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (field_name_match (t_field_name, name))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (dispp != NULL)
|
|
|
|
|
*dispp += TYPE_FIELD_BITPOS (type, i) / 8;
|
2004-10-08 11:40:12 +02:00
|
|
|
|
return ada_check_typedef (TYPE_FIELD_TYPE (type, i));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (ada_is_wrapper_field (type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
disp = 0;
|
|
|
|
|
t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (type, i), name,
|
|
|
|
|
0, 1, &disp);
|
|
|
|
|
if (t != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (dispp != NULL)
|
|
|
|
|
*dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
|
|
|
|
|
return t;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
else if (ada_is_variant_part (type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int j;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
|
|
|
|
|
i));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
for (j = TYPE_NFIELDS (field_type) - 1; j >= 0; j -= 1)
|
|
|
|
|
{
|
2008-09-30 23:36:21 +02:00
|
|
|
|
/* FIXME pnh 2008/01/26: We check for a field that is
|
|
|
|
|
NOT wrapped in a struct, since the compiler sometimes
|
|
|
|
|
generates these for unchecked variant types. Revisit
|
|
|
|
|
if the compiler changes this practice. */
|
|
|
|
|
char *v_field_name = TYPE_FIELD_NAME (field_type, j);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
disp = 0;
|
2008-09-30 23:36:21 +02:00
|
|
|
|
if (v_field_name != NULL
|
|
|
|
|
&& field_name_match (v_field_name, name))
|
|
|
|
|
t = ada_check_typedef (TYPE_FIELD_TYPE (field_type, j));
|
|
|
|
|
else
|
|
|
|
|
t = ada_lookup_struct_elt_type (TYPE_FIELD_TYPE (field_type, j),
|
|
|
|
|
name, 0, 1, &disp);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (t != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (dispp != NULL)
|
|
|
|
|
*dispp += disp + TYPE_FIELD_BITPOS (type, i) / 8;
|
|
|
|
|
return t;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BadName:
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (!noerr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
target_terminal_ours ();
|
|
|
|
|
gdb_flush (gdb_stdout);
|
2004-12-12 18:06:26 +01:00
|
|
|
|
if (name == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* XXX: type_sprint */
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, _("Type "));
|
|
|
|
|
type_print (type, "", gdb_stderr, -1);
|
|
|
|
|
error (_(" has no component named <null>"));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* XXX: type_sprint */
|
|
|
|
|
fprintf_unfiltered (gdb_stderr, _("Type "));
|
|
|
|
|
type_print (type, "", gdb_stderr, -1);
|
|
|
|
|
error (_(" has no component named %s"), name);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-30 23:36:21 +02:00
|
|
|
|
/* Assuming that VAR_TYPE is the type of a variant part of a record (a union),
|
|
|
|
|
within a value of type OUTER_TYPE, return true iff VAR_TYPE
|
|
|
|
|
represents an unchecked union (that is, the variant part of a
|
|
|
|
|
record that is named in an Unchecked_Union pragma). */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_unchecked_variant (struct type *var_type, struct type *outer_type)
|
|
|
|
|
{
|
|
|
|
|
char *discrim_name = ada_variant_discrim_name (var_type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-09-30 23:36:21 +02:00
|
|
|
|
return (ada_lookup_struct_elt_type (outer_type, discrim_name, 0, 1, NULL)
|
|
|
|
|
== NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Assuming that VAR_TYPE is the type of a variant part of a record (a union),
|
|
|
|
|
within a value of type OUTER_TYPE that is stored in GDB at
|
2004-06-02 11:55:36 +02:00
|
|
|
|
OUTER_VALADDR, determine which variant clause (field number in VAR_TYPE,
|
|
|
|
|
numbering from 0) is applicable. Returns -1 if none are. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_which_variant_applies (struct type *var_type, struct type *outer_type,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *outer_valaddr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int others_clause;
|
|
|
|
|
int i;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *discrim_name = ada_variant_discrim_name (var_type);
|
2008-01-05 16:44:53 +01:00
|
|
|
|
struct value *outer;
|
|
|
|
|
struct value *discrim;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
LONGEST discrim_val;
|
|
|
|
|
|
2008-01-05 16:44:53 +01:00
|
|
|
|
outer = value_from_contents_and_address (outer_type, outer_valaddr, 0);
|
|
|
|
|
discrim = ada_value_struct_elt (outer, discrim_name, 1);
|
|
|
|
|
if (discrim == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return -1;
|
2008-01-05 16:44:53 +01:00
|
|
|
|
discrim_val = value_as_long (discrim);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
others_clause = -1;
|
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (var_type); i += 1)
|
|
|
|
|
{
|
|
|
|
|
if (ada_is_others_clause (var_type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
others_clause = i;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (ada_in_variant (discrim_val, var_type, i))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return i;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return others_clause;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Dynamic-Sized Records */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Strategy: The type ostensibly attached to a value with dynamic size
|
|
|
|
|
(i.e., a size that is not statically recorded in the debugging
|
|
|
|
|
data) does not accurately reflect the size or layout of the value.
|
|
|
|
|
Our strategy is to convert these values to values with accurate,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
conventional types that are constructed on the fly. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* There is a subtle and tricky problem here. In general, we cannot
|
|
|
|
|
determine the size of dynamic records without its data. However,
|
|
|
|
|
the 'struct value' data structure, which GDB uses to represent
|
|
|
|
|
quantities in the inferior process (the target), requires the size
|
|
|
|
|
of the type at the time of its allocation in order to reserve space
|
|
|
|
|
for GDB's internal copy of the data. That's why the
|
|
|
|
|
'to_fixed_xxx_type' routines take (target) addresses as parameters,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
rather than struct value*s.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
However, GDB's internal history variables ($1, $2, etc.) are
|
|
|
|
|
struct value*s containing internal copies of the data that are not, in
|
|
|
|
|
general, the same as the data at their corresponding addresses in
|
|
|
|
|
the target. Fortunately, the types we give to these values are all
|
|
|
|
|
conventional, fixed-size types (as per the strategy described
|
|
|
|
|
above), so that we don't usually have to perform the
|
|
|
|
|
'to_fixed_xxx_type' conversions to look at their values.
|
|
|
|
|
Unfortunately, there is one exception: if one of the internal
|
|
|
|
|
history variables is an array whose elements are unconstrained
|
|
|
|
|
records, then we will need to create distinct fixed types for each
|
|
|
|
|
element selected. */
|
|
|
|
|
|
|
|
|
|
/* The upshot of all of this is that many routines take a (type, host
|
|
|
|
|
address, target address) triple as arguments to represent a value.
|
|
|
|
|
The host address, if non-null, is supposed to contain an internal
|
|
|
|
|
copy of the relevant data; otherwise, the program is to consult the
|
2004-06-02 11:55:36 +02:00
|
|
|
|
target at the target address. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Assuming that VAL0 represents a pointer value, the result of
|
|
|
|
|
dereferencing it. Differs from value_ind in its treatment of
|
2004-06-02 11:55:36 +02:00
|
|
|
|
dynamic-sized types. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *
|
|
|
|
|
ada_value_ind (struct value *val0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *val = unwrap_value (value_ind (val0));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_to_fixed_value (val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The value resulting from dereferencing any "reference to"
|
2004-06-02 11:55:36 +02:00
|
|
|
|
qualifiers on VAL0. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
ada_coerce_ref (struct value *val0)
|
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (val0)) == TYPE_CODE_REF)
|
2002-08-18 20:11:12 +02:00
|
|
|
|
{
|
|
|
|
|
struct value *val = val0;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-11-10 Andrew Cagney <cagney@gnu.org>
* value.h (COERCE_REF, COERCE_ARRAY, COERCE_NUMBER, COERCE_ENUM)
(coerce_ref, coerce_array, coerce_number, coerce_enum): Replace
macros with function declarations.
* value.c (coerce_ref, coerce_array, coerce_number)
(coerce_enum): New functions.
(value_as_long, value_as_address): Update.
* ada-lang.c (ada_coerce_ref, ada_value_binop)
(ada_evaluate_subexp, ada_value_assign, ada_value_struct_elt): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* valarith.c (value_less, value_neg, value_complement)
(value_binop, value_add, value_subscript, value_x_binop)
(value_logical_not, value_sub): Update.
* valops.c (check_field, value_struct_elt, value_ind)
(value_find_oload_method_list, value_cast, value_assign): Update.
* eval.c (evaluate_subexp_standard): Update.
2004-11-10 19:52:25 +01:00
|
|
|
|
val = coerce_ref (val);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
val = unwrap_value (val);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_to_fixed_value (val);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return val0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return OFF rounded upward if necessary to a multiple of
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ALIGNMENT (a power of 2). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static unsigned int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
align_value (unsigned int off, unsigned int alignment)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return (off + alignment - 1) & ~(alignment - 1);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Return the bit alignment required for field #F of template type TYPE. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static unsigned int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
field_alignment (struct type *type, int f)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *name = TYPE_FIELD_NAME (type, f);
|
2007-08-14 22:16:18 +02:00
|
|
|
|
int len;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int align_offset;
|
|
|
|
|
|
2007-08-14 22:16:18 +02:00
|
|
|
|
/* The field name should never be null, unless the debugging information
|
|
|
|
|
is somehow malformed. In this case, we assume the field does not
|
|
|
|
|
require any alignment. */
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
len = strlen (name);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (!isdigit (name[len - 1]))
|
|
|
|
|
return 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (isdigit (name[len - 2]))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
align_offset = len - 2;
|
|
|
|
|
else
|
|
|
|
|
align_offset = len - 1;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (align_offset < 7 || strncmp ("___XV", name + align_offset - 6, 5) != 0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return TARGET_CHAR_BIT;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return atoi (name + align_offset) * TARGET_CHAR_BIT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a symbol named NAME. Ignores ambiguity. */
|
|
|
|
|
|
|
|
|
|
struct symbol *
|
|
|
|
|
ada_find_any_symbol (const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
sym = standard_lookup (name, get_selected_block (NULL), VAR_DOMAIN);
|
|
|
|
|
if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
|
|
|
|
|
return sym;
|
|
|
|
|
|
|
|
|
|
sym = standard_lookup (name, NULL, STRUCT_DOMAIN);
|
|
|
|
|
return sym;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-18 16:00:08 +02:00
|
|
|
|
/* Find a type named NAME. Ignores ambiguity. This routine will look
|
|
|
|
|
solely for types defined by debug info, it will not search the GDB
|
|
|
|
|
primitive types. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_find_any_type (const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct symbol *sym = ada_find_any_symbol (name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (sym != NULL)
|
2009-05-18 16:00:08 +02:00
|
|
|
|
return SYMBOL_TYPE (sym);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-05-18 16:00:08 +02:00
|
|
|
|
return NULL;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-12-21 12:50:11 +01:00
|
|
|
|
/* Given NAME and an associated BLOCK, search all symbols for
|
|
|
|
|
NAME suffixed with "___XR", which is the ``renaming'' symbol
|
2004-06-02 11:55:36 +02:00
|
|
|
|
associated to NAME. Return this symbol if found, return
|
|
|
|
|
NULL otherwise. */
|
|
|
|
|
|
|
|
|
|
struct symbol *
|
|
|
|
|
ada_find_renaming_symbol (const char *name, struct block *block)
|
2007-12-21 12:50:11 +01:00
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
sym = find_old_style_renaming_symbol (name, block);
|
|
|
|
|
|
|
|
|
|
if (sym != NULL)
|
|
|
|
|
return sym;
|
|
|
|
|
|
|
|
|
|
/* Not right yet. FIXME pnh 7/20/2007. */
|
|
|
|
|
sym = ada_find_any_symbol (name);
|
|
|
|
|
if (sym != NULL && strstr (SYMBOL_LINKAGE_NAME (sym), "___XR") != NULL)
|
|
|
|
|
return sym;
|
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct symbol *
|
|
|
|
|
find_old_style_renaming_symbol (const char *name, struct block *block)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-07-15 21:11:34 +02:00
|
|
|
|
const struct symbol *function_sym = block_linkage_function (block);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
char *rename;
|
|
|
|
|
|
|
|
|
|
if (function_sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* If the symbol is defined inside a function, NAME is not fully
|
|
|
|
|
qualified. This means we need to prepend the function name
|
|
|
|
|
as well as adding the ``___XR'' suffix to build the name of
|
|
|
|
|
the associated renaming symbol. */
|
|
|
|
|
char *function_name = SYMBOL_LINKAGE_NAME (function_sym);
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Function names sometimes contain suffixes used
|
|
|
|
|
for instance to qualify nested subprograms. When building
|
|
|
|
|
the XR type name, we need to make sure that this suffix is
|
|
|
|
|
not included. So do not include any suffix in the function
|
|
|
|
|
name length below. */
|
2009-11-19 23:34:50 +01:00
|
|
|
|
int function_name_len = ada_name_prefix_len (function_name);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
const int rename_len = function_name_len + 2 /* "__" */
|
|
|
|
|
+ strlen (name) + 6 /* "___XR\0" */ ;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Strip the suffix if necessary. */
|
2009-11-19 23:34:50 +01:00
|
|
|
|
ada_remove_trailing_digits (function_name, &function_name_len);
|
|
|
|
|
ada_remove_po_subprogram_suffix (function_name, &function_name_len);
|
|
|
|
|
ada_remove_Xbn_suffix (function_name, &function_name_len);
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Library-level functions are a special case, as GNAT adds
|
|
|
|
|
a ``_ada_'' prefix to the function name to avoid namespace
|
2007-12-21 12:50:11 +01:00
|
|
|
|
pollution. However, the renaming symbols themselves do not
|
2004-06-02 11:55:36 +02:00
|
|
|
|
have this prefix, so we need to skip this prefix if present. */
|
|
|
|
|
if (function_name_len > 5 /* "_ada_" */
|
|
|
|
|
&& strstr (function_name, "_ada_") == function_name)
|
2009-11-19 23:34:50 +01:00
|
|
|
|
{
|
|
|
|
|
function_name += 5;
|
|
|
|
|
function_name_len -= 5;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
rename = (char *) alloca (rename_len * sizeof (char));
|
2009-11-19 23:34:50 +01:00
|
|
|
|
strncpy (rename, function_name, function_name_len);
|
|
|
|
|
xsnprintf (rename + function_name_len, rename_len - function_name_len,
|
|
|
|
|
"__%s___XR", name);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const int rename_len = strlen (name) + 6;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
rename = (char *) alloca (rename_len * sizeof (char));
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (rename, rename_len * sizeof (char), "%s___XR", name);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ada_find_any_symbol (rename);
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Because of GNAT encoding conventions, several GDB symbols may match a
|
2004-06-02 11:55:36 +02:00
|
|
|
|
given type name. If the type denoted by TYPE0 is to be preferred to
|
2002-06-04 17:28:49 +02:00
|
|
|
|
that of TYPE1 for purposes of type printing, return non-zero;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
otherwise return 0. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_prefer_type (struct type *type0, struct type *type1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (type1 == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
else if (type0 == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
else if (TYPE_CODE (type1) == TYPE_CODE_VOID)
|
|
|
|
|
return 1;
|
|
|
|
|
else if (TYPE_CODE (type0) == TYPE_CODE_VOID)
|
|
|
|
|
return 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (TYPE_NAME (type1) == NULL && TYPE_NAME (type0) != NULL)
|
|
|
|
|
return 1;
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
else if (ada_is_constrained_packed_array_type (type0))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (ada_is_array_descriptor_type (type0)
|
|
|
|
|
&& !ada_is_array_descriptor_type (type1))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 1;
|
2007-12-21 12:50:11 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const char *type0_name = type_name_no_tag (type0);
|
|
|
|
|
const char *type1_name = type_name_no_tag (type1);
|
|
|
|
|
|
|
|
|
|
if (type0_name != NULL && strstr (type0_name, "___XR") != NULL
|
|
|
|
|
&& (type1_name == NULL || strstr (type1_name, "___XR") == NULL))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The name of TYPE, which is either its TYPE_NAME, or, if that is
|
2004-06-02 11:55:36 +02:00
|
|
|
|
null, its TYPE_TAG_NAME. Null if TYPE is null. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *
|
|
|
|
|
ada_type_name (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (type == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
else if (TYPE_NAME (type) != NULL)
|
|
|
|
|
return TYPE_NAME (type);
|
|
|
|
|
else
|
|
|
|
|
return TYPE_TAG_NAME (type);
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-12 06:49:00 +01:00
|
|
|
|
/* Search the list of "descriptive" types associated to TYPE for a type
|
|
|
|
|
whose name is NAME. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
find_parallel_type_by_descriptive_type (struct type *type, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct type *result;
|
|
|
|
|
|
|
|
|
|
/* If there no descriptive-type info, then there is no parallel type
|
|
|
|
|
to be found. */
|
|
|
|
|
if (!HAVE_GNAT_AUX_INFO (type))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
result = TYPE_DESCRIPTIVE_TYPE (type);
|
|
|
|
|
while (result != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *result_name = ada_type_name (result);
|
|
|
|
|
|
|
|
|
|
if (result_name == NULL)
|
|
|
|
|
{
|
|
|
|
|
warning (_("unexpected null name on descriptive type"));
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the names match, stop. */
|
|
|
|
|
if (strcmp (result_name, name) == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Otherwise, look at the next item on the list, if any. */
|
|
|
|
|
if (HAVE_GNAT_AUX_INFO (result))
|
|
|
|
|
result = TYPE_DESCRIPTIVE_TYPE (result);
|
|
|
|
|
else
|
|
|
|
|
result = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we didn't find a match, see whether this is a packed array. With
|
|
|
|
|
older compilers, the descriptive type information is either absent or
|
|
|
|
|
irrelevant when it comes to packed arrays so the above lookup fails.
|
|
|
|
|
Fall back to using a parallel lookup by name in this case. */
|
2010-01-15 13:07:04 +01:00
|
|
|
|
if (result == NULL && ada_is_constrained_packed_array_type (type))
|
2010-01-12 06:49:00 +01:00
|
|
|
|
return ada_find_any_type (name);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a parallel type to TYPE with the specified NAME, using the
|
|
|
|
|
descriptive type taken from the debugging information, if available,
|
|
|
|
|
and otherwise using the (slower) name-based method. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
ada_find_parallel_type_with_name (struct type *type, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct type *result = NULL;
|
|
|
|
|
|
|
|
|
|
if (HAVE_GNAT_AUX_INFO (type))
|
|
|
|
|
result = find_parallel_type_by_descriptive_type (type, name);
|
|
|
|
|
else
|
|
|
|
|
result = ada_find_any_type (name);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Same as above, but specify the name of the parallel type by appending
|
2004-06-02 11:55:36 +02:00
|
|
|
|
SUFFIX to the name of TYPE. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_find_parallel_type (struct type *type, const char *suffix)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2010-01-12 06:49:00 +01:00
|
|
|
|
char *name, *typename = ada_type_name (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int len;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (typename == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
len = strlen (typename);
|
|
|
|
|
|
2010-01-12 06:49:00 +01:00
|
|
|
|
name = (char *) alloca (len + strlen (suffix) + 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
strcpy (name, typename);
|
|
|
|
|
strcpy (name + len, suffix);
|
|
|
|
|
|
2010-01-12 06:49:00 +01:00
|
|
|
|
return ada_find_parallel_type_with_name (type, name);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If TYPE is a variable-size record type, return the corresponding template
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type describing its fields. Otherwise, return NULL. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
dynamic_template_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|| ada_type_name (type) == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return NULL;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int len = strlen (ada_type_name (type));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (len > 6 && strcmp (ada_type_name (type) + len - 6, "___XVE") == 0)
|
|
|
|
|
return type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_find_parallel_type (type, "___XVE");
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that TEMPL_TYPE is a union or struct type, returns
|
2004-06-02 11:55:36 +02:00
|
|
|
|
non-zero iff field FIELD_NUM of TEMPL_TYPE has dynamic size. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int
|
|
|
|
|
is_dynamic_field (struct type *templ_type, int field_num)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
const char *name = TYPE_FIELD_NAME (templ_type, field_num);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return name != NULL
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& TYPE_CODE (TYPE_FIELD_TYPE (templ_type, field_num)) == TYPE_CODE_PTR
|
|
|
|
|
&& strstr (name, "___XVL") != NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The index of the variant field of TYPE, or -1 if TYPE does not
|
|
|
|
|
represent a variant record type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static int
|
2004-06-02 11:55:36 +02:00
|
|
|
|
variant_field_index (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int f;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_STRUCT)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
for (f = 0; f < TYPE_NFIELDS (type); f += 1)
|
|
|
|
|
{
|
|
|
|
|
if (ada_is_variant_part (type, f))
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* A record type with no fields. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
empty_record (struct type *template)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
struct type *type = alloc_type_copy (template);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_STRUCT;
|
|
|
|
|
TYPE_NFIELDS (type) = 0;
|
|
|
|
|
TYPE_FIELDS (type) = NULL;
|
2008-09-30 23:36:21 +02:00
|
|
|
|
INIT_CPLUS_SPECIFIC (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_NAME (type) = "<empty>";
|
|
|
|
|
TYPE_TAG_NAME (type) = NULL;
|
|
|
|
|
TYPE_LENGTH (type) = 0;
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An ordinary record type (with fixed-length fields) that describes
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the value of type TYPE at VALADDR or ADDRESS (see comments at
|
|
|
|
|
the beginning of this section) VAL according to GNAT conventions.
|
|
|
|
|
DVAL0 should describe the (portion of a) record that contains any
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
necessary discriminants. It should be NULL if value_type (VAL) is
|
2002-06-04 17:28:49 +02:00
|
|
|
|
an outer-level type (i.e., as opposed to a branch of a variant.) A
|
|
|
|
|
variant field (unless unchecked) is replaced by a particular branch
|
2004-06-02 11:55:36 +02:00
|
|
|
|
of the variant.
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
If not KEEP_DYNAMIC_FIELDS, then all fields whose position or
|
|
|
|
|
length are not statically known are discarded. As a consequence,
|
|
|
|
|
VALADDR, ADDRESS and DVAL0 are ignored.
|
|
|
|
|
|
|
|
|
|
NOTE: Limitations: For now, we assume that dynamic fields and
|
|
|
|
|
variants occupy whole numbers of bytes. However, they need not be
|
|
|
|
|
byte-aligned. */
|
|
|
|
|
|
|
|
|
|
struct type *
|
2005-01-28 20:56:01 +01:00
|
|
|
|
ada_template_to_fixed_record_type_1 (struct type *type,
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR address, struct value *dval0,
|
|
|
|
|
int keep_dynamic_fields)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *mark = value_mark ();
|
|
|
|
|
struct value *dval;
|
|
|
|
|
struct type *rtype;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int nfields, bit_len;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int variant_field;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
long off;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int fld_bit_len, bit_incr;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int f;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Compute the number of fields in this record type that are going
|
|
|
|
|
to be processed: unless keep_dynamic_fields, this includes only
|
|
|
|
|
fields whose position and length are static will be processed. */
|
|
|
|
|
if (keep_dynamic_fields)
|
|
|
|
|
nfields = TYPE_NFIELDS (type);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nfields = 0;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
while (nfields < TYPE_NFIELDS (type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& !ada_is_variant_part (type, nfields)
|
|
|
|
|
&& !is_dynamic_field (type, nfields))
|
|
|
|
|
nfields++;
|
|
|
|
|
}
|
|
|
|
|
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
rtype = alloc_type_copy (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
|
|
|
|
|
INIT_CPLUS_SPECIFIC (rtype);
|
|
|
|
|
TYPE_NFIELDS (rtype) = nfields;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
TYPE_FIELDS (rtype) = (struct field *)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_ALLOC (rtype, nfields * sizeof (struct field));
|
|
|
|
|
memset (TYPE_FIELDS (rtype), 0, sizeof (struct field) * nfields);
|
|
|
|
|
TYPE_NAME (rtype) = ada_type_name (type);
|
|
|
|
|
TYPE_TAG_NAME (rtype) = NULL;
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (rtype) = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
off = 0;
|
|
|
|
|
bit_len = 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
variant_field = -1;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
for (f = 0; f < nfields; f += 1)
|
|
|
|
|
{
|
2004-09-18 12:11:06 +02:00
|
|
|
|
off = align_value (off, field_alignment (type, f))
|
|
|
|
|
+ TYPE_FIELD_BITPOS (type, f);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_FIELD_BITPOS (rtype, f) = off;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
TYPE_FIELD_BITSIZE (rtype, f) = 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (ada_is_variant_part (type, f))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
variant_field = f;
|
|
|
|
|
fld_bit_len = bit_incr = 0;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (is_dynamic_field (type, f))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2009-06-23 18:43:24 +02:00
|
|
|
|
const gdb_byte *field_valaddr = valaddr;
|
|
|
|
|
CORE_ADDR field_address = address;
|
|
|
|
|
struct type *field_type =
|
|
|
|
|
TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, f));
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (dval0 == NULL)
|
2009-02-04 18:46:36 +01:00
|
|
|
|
{
|
|
|
|
|
/* rtype's length is computed based on the run-time
|
|
|
|
|
value of discriminants. If the discriminants are not
|
|
|
|
|
initialized, the type size may be completely bogus and
|
|
|
|
|
GDB may fail to allocate a value for it. So check the
|
|
|
|
|
size first before creating the value. */
|
|
|
|
|
check_size (rtype);
|
|
|
|
|
dval = value_from_contents_and_address (rtype, valaddr, address);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
|
|
|
|
dval = dval0;
|
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
/* If the type referenced by this field is an aligner type, we need
|
|
|
|
|
to unwrap that aligner type, because its size might not be set.
|
|
|
|
|
Keeping the aligner type would cause us to compute the wrong
|
|
|
|
|
size for this field, impacting the offset of the all the fields
|
|
|
|
|
that follow this one. */
|
|
|
|
|
if (ada_is_aligner_type (field_type))
|
|
|
|
|
{
|
|
|
|
|
long field_offset = TYPE_FIELD_BITPOS (field_type, f);
|
|
|
|
|
|
|
|
|
|
field_valaddr = cond_offset_host (field_valaddr, field_offset);
|
|
|
|
|
field_address = cond_offset_target (field_address, field_offset);
|
|
|
|
|
field_type = ada_aligned_type (field_type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
field_valaddr = cond_offset_host (field_valaddr,
|
|
|
|
|
off / TARGET_CHAR_BIT);
|
|
|
|
|
field_address = cond_offset_target (field_address,
|
|
|
|
|
off / TARGET_CHAR_BIT);
|
|
|
|
|
|
|
|
|
|
/* Get the fixed type of the field. Note that, in this case,
|
|
|
|
|
we do not want to get the real type out of the tag: if
|
|
|
|
|
the current field is the parent part of a tagged record,
|
|
|
|
|
we will get the tag of the object. Clearly wrong: the real
|
|
|
|
|
type of the parent is not the real type of the child. We
|
|
|
|
|
would end up in an infinite loop. */
|
|
|
|
|
field_type = ada_get_base_type (field_type);
|
|
|
|
|
field_type = ada_to_fixed_type (field_type, field_valaddr,
|
|
|
|
|
field_address, dval, 0);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_TYPE (rtype, f) = field_type;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_NAME (rtype, f) = TYPE_FIELD_NAME (type, f);
|
|
|
|
|
bit_incr = fld_bit_len =
|
|
|
|
|
TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, f)) * TARGET_CHAR_BIT;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2010-01-15 13:11:21 +01:00
|
|
|
|
struct type *field_type = TYPE_FIELD_TYPE (type, f);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_TYPE (rtype, f) = field_type;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_NAME (rtype, f) = TYPE_FIELD_NAME (type, f);
|
|
|
|
|
if (TYPE_FIELD_BITSIZE (type, f) > 0)
|
|
|
|
|
bit_incr = fld_bit_len =
|
|
|
|
|
TYPE_FIELD_BITSIZE (rtype, f) = TYPE_FIELD_BITSIZE (type, f);
|
|
|
|
|
else
|
|
|
|
|
bit_incr = fld_bit_len =
|
2010-01-15 13:11:21 +01:00
|
|
|
|
TYPE_LENGTH (ada_check_typedef (field_type)) * TARGET_CHAR_BIT;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (off + fld_bit_len > bit_len)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
bit_len = off + fld_bit_len;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
off += bit_incr;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (rtype) =
|
|
|
|
|
align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
/* We handle the variant part, if any, at the end because of certain
|
2008-09-30 23:36:21 +02:00
|
|
|
|
odd cases in which it is re-ordered so as NOT to be the last field of
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the record. This can happen in the presence of representation
|
|
|
|
|
clauses. */
|
|
|
|
|
if (variant_field >= 0)
|
|
|
|
|
{
|
|
|
|
|
struct type *branch_type;
|
|
|
|
|
|
|
|
|
|
off = TYPE_FIELD_BITPOS (rtype, variant_field);
|
|
|
|
|
|
|
|
|
|
if (dval0 == NULL)
|
|
|
|
|
dval = value_from_contents_and_address (rtype, valaddr, address);
|
|
|
|
|
else
|
|
|
|
|
dval = dval0;
|
|
|
|
|
|
|
|
|
|
branch_type =
|
|
|
|
|
to_fixed_variant_branch_type
|
|
|
|
|
(TYPE_FIELD_TYPE (type, variant_field),
|
|
|
|
|
cond_offset_host (valaddr, off / TARGET_CHAR_BIT),
|
|
|
|
|
cond_offset_target (address, off / TARGET_CHAR_BIT), dval);
|
|
|
|
|
if (branch_type == NULL)
|
|
|
|
|
{
|
|
|
|
|
for (f = variant_field + 1; f < TYPE_NFIELDS (rtype); f += 1)
|
|
|
|
|
TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
|
|
|
|
|
TYPE_NFIELDS (rtype) -= 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
|
|
|
|
|
TYPE_FIELD_NAME (rtype, variant_field) = "S";
|
|
|
|
|
fld_bit_len =
|
|
|
|
|
TYPE_LENGTH (TYPE_FIELD_TYPE (rtype, variant_field)) *
|
|
|
|
|
TARGET_CHAR_BIT;
|
|
|
|
|
if (off + fld_bit_len > bit_len)
|
|
|
|
|
bit_len = off + fld_bit_len;
|
|
|
|
|
TYPE_LENGTH (rtype) =
|
|
|
|
|
align_value (bit_len, TARGET_CHAR_BIT) / TARGET_CHAR_BIT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-15 11:12:24 +02:00
|
|
|
|
/* According to exp_dbug.ads, the size of TYPE for variable-size records
|
|
|
|
|
should contain the alignment of that record, which should be a strictly
|
|
|
|
|
positive value. If null or negative, then something is wrong, most
|
|
|
|
|
probably in the debug info. In that case, we don't round up the size
|
|
|
|
|
of the resulting type. If this record is not part of another structure,
|
|
|
|
|
the current RTYPE length might be good enough for our purposes. */
|
|
|
|
|
if (TYPE_LENGTH (type) <= 0)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
if (TYPE_NAME (rtype))
|
|
|
|
|
warning (_("Invalid type size for `%s' detected: %d."),
|
|
|
|
|
TYPE_NAME (rtype), TYPE_LENGTH (type));
|
|
|
|
|
else
|
|
|
|
|
warning (_("Invalid type size for <unnamed> detected: %d."),
|
|
|
|
|
TYPE_LENGTH (type));
|
2004-10-15 11:12:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
TYPE_LENGTH (rtype) = align_value (TYPE_LENGTH (rtype),
|
|
|
|
|
TYPE_LENGTH (type));
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
value_free_to_mark (mark);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_LENGTH (rtype) > varsize_limit)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("record type with dynamic size is larger than varsize-limit"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return rtype;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* As for ada_template_to_fixed_record_type_1 with KEEP_DYNAMIC_FIELDS
|
|
|
|
|
of 1. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
template_to_fixed_record_type (struct type *type, const gdb_byte *valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR address, struct value *dval0)
|
|
|
|
|
{
|
|
|
|
|
return ada_template_to_fixed_record_type_1 (type, valaddr,
|
|
|
|
|
address, dval0, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An ordinary record type in which ___XVL-convention fields and
|
|
|
|
|
___XVU- and ___XVN-convention field types in TYPE0 are replaced with
|
|
|
|
|
static approximations, containing all possible fields. Uses
|
|
|
|
|
no runtime values. Useless for use in values, but that's OK,
|
|
|
|
|
since the results are used only for type determinations. Works on both
|
|
|
|
|
structs and unions. Representation note: to save space, we memorize
|
|
|
|
|
the result of this function in the TYPE_TARGET_TYPE of the
|
|
|
|
|
template type. */
|
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
template_to_static_fixed_type (struct type *type0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
int nfields;
|
|
|
|
|
int f;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_TARGET_TYPE (type0) != NULL)
|
|
|
|
|
return TYPE_TARGET_TYPE (type0);
|
|
|
|
|
|
|
|
|
|
nfields = TYPE_NFIELDS (type0);
|
|
|
|
|
type = type0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
for (f = 0; f < nfields; f += 1)
|
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type0, f));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *new_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (is_dynamic_field (type0, f))
|
|
|
|
|
new_type = to_static_fixed_type (TYPE_TARGET_TYPE (field_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2008-01-03 14:11:51 +01:00
|
|
|
|
new_type = static_unwrap_type (field_type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (type == type0 && new_type != field_type)
|
|
|
|
|
{
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
TYPE_TARGET_TYPE (type0) = type = alloc_type_copy (type0);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_CODE (type) = TYPE_CODE (type0);
|
|
|
|
|
INIT_CPLUS_SPECIFIC (type);
|
|
|
|
|
TYPE_NFIELDS (type) = nfields;
|
|
|
|
|
TYPE_FIELDS (type) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (type, nfields * sizeof (struct field));
|
|
|
|
|
memcpy (TYPE_FIELDS (type), TYPE_FIELDS (type0),
|
|
|
|
|
sizeof (struct field) * nfields);
|
|
|
|
|
TYPE_NAME (type) = ada_type_name (type0);
|
|
|
|
|
TYPE_TAG_NAME (type) = NULL;
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (type) = 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (type) = 0;
|
|
|
|
|
}
|
|
|
|
|
TYPE_FIELD_TYPE (type, f) = new_type;
|
|
|
|
|
TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (type0, f);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Given an object of type TYPE whose contents are at VALADDR and
|
2008-09-10 22:10:48 +02:00
|
|
|
|
whose address in memory is ADDRESS, returns a revision of TYPE,
|
|
|
|
|
which should be a non-dynamic-sized record, in which the variant
|
|
|
|
|
part, if any, is replaced with the appropriate branch. Looks
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for discriminant values in DVAL0, which can be NULL if the record
|
|
|
|
|
contains the necessary discriminant values. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
to_record_with_fixed_variant_part (struct type *type, const gdb_byte *valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR address, struct value *dval0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *mark = value_mark ();
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *dval;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *rtype;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
struct type *branch_type;
|
|
|
|
|
int nfields = TYPE_NFIELDS (type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int variant_field = variant_field_index (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (variant_field == -1)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return type;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (dval0 == NULL)
|
|
|
|
|
dval = value_from_contents_and_address (type, valaddr, address);
|
|
|
|
|
else
|
|
|
|
|
dval = dval0;
|
|
|
|
|
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
rtype = alloc_type_copy (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_CODE (rtype) = TYPE_CODE_STRUCT;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
INIT_CPLUS_SPECIFIC (rtype);
|
|
|
|
|
TYPE_NFIELDS (rtype) = nfields;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
TYPE_FIELDS (rtype) =
|
|
|
|
|
(struct field *) TYPE_ALLOC (rtype, nfields * sizeof (struct field));
|
|
|
|
|
memcpy (TYPE_FIELDS (rtype), TYPE_FIELDS (type),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
sizeof (struct field) * nfields);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_NAME (rtype) = ada_type_name (type);
|
|
|
|
|
TYPE_TAG_NAME (rtype) = NULL;
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (rtype) = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_LENGTH (rtype) = TYPE_LENGTH (type);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
branch_type = to_fixed_variant_branch_type
|
|
|
|
|
(TYPE_FIELD_TYPE (type, variant_field),
|
2002-08-18 20:11:12 +02:00
|
|
|
|
cond_offset_host (valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_BITPOS (type, variant_field)
|
|
|
|
|
/ TARGET_CHAR_BIT),
|
2002-08-18 20:11:12 +02:00
|
|
|
|
cond_offset_target (address,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_BITPOS (type, variant_field)
|
|
|
|
|
/ TARGET_CHAR_BIT), dval);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (branch_type == NULL)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int f;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
for (f = variant_field + 1; f < nfields; f += 1)
|
|
|
|
|
TYPE_FIELDS (rtype)[f - 1] = TYPE_FIELDS (rtype)[f];
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_NFIELDS (rtype) -= 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_FIELD_TYPE (rtype, variant_field) = branch_type;
|
|
|
|
|
TYPE_FIELD_NAME (rtype, variant_field) = "S";
|
|
|
|
|
TYPE_FIELD_BITSIZE (rtype, variant_field) = 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
TYPE_LENGTH (rtype) += TYPE_LENGTH (branch_type);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_LENGTH (rtype) -= TYPE_LENGTH (TYPE_FIELD_TYPE (type, variant_field));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value_free_to_mark (mark);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return rtype;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An ordinary record type (with fixed-length fields) that describes
|
|
|
|
|
the value at (TYPE0, VALADDR, ADDRESS) [see explanation at
|
|
|
|
|
beginning of this section]. Any necessary discriminants' values
|
2004-06-02 11:55:36 +02:00
|
|
|
|
should be in DVAL, a record value; it may be NULL if the object
|
|
|
|
|
at ADDR itself contains any necessary discriminant values.
|
|
|
|
|
Additionally, VALADDR and ADDRESS may also be NULL if no discriminant
|
|
|
|
|
values from the record are needed. Except in the case that DVAL,
|
|
|
|
|
VALADDR, and ADDRESS are all 0 or NULL, a variant field (unless
|
|
|
|
|
unchecked) is replaced by a particular branch of the variant.
|
|
|
|
|
|
|
|
|
|
NOTE: the case in which DVAL and VALADDR are NULL and ADDRESS is 0
|
|
|
|
|
is questionable and may be removed. It can arise during the
|
|
|
|
|
processing of an unconstrained-array-of-record type where all the
|
|
|
|
|
variant branches have exactly the same size. This is because in
|
|
|
|
|
such cases, the compiler does not bother to use the XVS convention
|
|
|
|
|
when encoding the record. I am currently dubious of this
|
|
|
|
|
shortcut and suspect the compiler should be altered. FIXME. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
to_fixed_record_type (struct type *type0, const gdb_byte *valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR address, struct value *dval)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *templ_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
if (TYPE_FIXED_INSTANCE (type0))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type0;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
templ_type = dynamic_template_type (type0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (templ_type != NULL)
|
|
|
|
|
return template_to_fixed_record_type (templ_type, valaddr, address, dval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (variant_field_index (type0) >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (dval == NULL && valaddr == NULL && address == 0)
|
|
|
|
|
return type0;
|
|
|
|
|
return to_record_with_fixed_variant_part (type0, valaddr, address,
|
|
|
|
|
dval);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (type0) = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return type0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An ordinary record type (with fixed-length fields) that describes
|
|
|
|
|
the value at (VAR_TYPE0, VALADDR, ADDRESS), where VAR_TYPE0 is a
|
|
|
|
|
union type. Any necessary discriminants' values should be in DVAL,
|
|
|
|
|
a record value. That is, this routine selects the appropriate
|
|
|
|
|
branch of the union at ADDR according to the discriminant value
|
2008-09-30 23:36:21 +02:00
|
|
|
|
indicated in the union's type name. Returns VAR_TYPE0 itself if
|
|
|
|
|
it represents a variant subject to a pragma Unchecked_Union. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
to_fixed_variant_branch_type (struct type *var_type0, const gdb_byte *valaddr,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
CORE_ADDR address, struct value *dval)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
int which;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *templ_type;
|
|
|
|
|
struct type *var_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (var_type0) == TYPE_CODE_PTR)
|
|
|
|
|
var_type = TYPE_TARGET_TYPE (var_type0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
var_type = var_type0;
|
|
|
|
|
|
|
|
|
|
templ_type = ada_find_parallel_type (var_type, "___XVU");
|
|
|
|
|
|
|
|
|
|
if (templ_type != NULL)
|
|
|
|
|
var_type = templ_type;
|
|
|
|
|
|
2008-09-30 23:36:21 +02:00
|
|
|
|
if (is_unchecked_variant (var_type, value_type (dval)))
|
|
|
|
|
return var_type0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
which =
|
|
|
|
|
ada_which_variant_applies (var_type,
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
value_type (dval), value_contents (dval));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (which < 0)
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
return empty_record (var_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (is_dynamic_field (var_type, which))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return to_fixed_record_type
|
2002-08-18 20:11:12 +02:00
|
|
|
|
(TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (var_type, which)),
|
|
|
|
|
valaddr, address, dval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (variant_field_index (TYPE_FIELD_TYPE (var_type, which)) >= 0)
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
|
|
|
|
to_fixed_record_type
|
|
|
|
|
(TYPE_FIELD_TYPE (var_type, which), valaddr, address, dval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return TYPE_FIELD_TYPE (var_type, which);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that TYPE0 is an array type describing the type of a value
|
|
|
|
|
at ADDR, and that DVAL describes a record containing any
|
|
|
|
|
discriminants used in TYPE0, returns a type for the value that
|
|
|
|
|
contains no dynamic components (that is, no components whose sizes
|
|
|
|
|
are determined by run-time quantities). Unless IGNORE_TOO_BIG is
|
|
|
|
|
true, gives an error message if the resulting type's size is over
|
2004-06-02 11:55:36 +02:00
|
|
|
|
varsize_limit. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
to_fixed_array_type (struct type *type0, struct value *dval,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int ignore_too_big)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *index_type_desc;
|
|
|
|
|
struct type *result;
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
int constrained_packed_array_p;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
if (TYPE_FIXED_INSTANCE (type0))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
constrained_packed_array_p = ada_is_constrained_packed_array_type (type0);
|
|
|
|
|
if (constrained_packed_array_p)
|
|
|
|
|
type0 = decode_constrained_packed_array_type (type0);
|
2009-06-23 18:43:24 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
index_type_desc = ada_find_parallel_type (type0, "___XA");
|
2010-05-17 18:55:31 +02:00
|
|
|
|
ada_fixup_array_indexes_type (index_type_desc);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (index_type_desc == NULL)
|
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
struct type *elt_type0 = ada_check_typedef (TYPE_TARGET_TYPE (type0));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* NOTE: elt_type---the fixed version of elt_type0---should never
|
2004-06-02 11:55:36 +02:00
|
|
|
|
depend on the contents of the array in properly constructed
|
|
|
|
|
debugging data. */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Create a fixed version of the array element type.
|
|
|
|
|
We're not providing the address of an element here,
|
2006-01-08 08:19:40 +01:00
|
|
|
|
and thus the actual object value cannot be inspected to do
|
2006-01-02 10:39:21 +01:00
|
|
|
|
the conversion. This should not be a problem, since arrays of
|
|
|
|
|
unconstrained objects are not allowed. In particular, all
|
|
|
|
|
the elements of an array of a tagged type should all be of
|
|
|
|
|
the same type specified in the debugging info. No need to
|
|
|
|
|
consult the object tag. */
|
2008-01-03 13:30:38 +01:00
|
|
|
|
struct type *elt_type = ada_to_fixed_type (elt_type0, 0, 0, dval, 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
/* Make sure we always create a new array type when dealing with
|
|
|
|
|
packed array types, since we're going to fix-up the array
|
|
|
|
|
type length and element bitsize a little further down. */
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (elt_type0 == elt_type && !constrained_packed_array_p)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
result = type0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
result = create_array_type (alloc_type_copy (type0),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
elt_type, TYPE_INDEX_TYPE (type0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct type *elt_type0;
|
|
|
|
|
|
|
|
|
|
elt_type0 = type0;
|
|
|
|
|
for (i = TYPE_NFIELDS (index_type_desc); i > 0; i -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
elt_type0 = TYPE_TARGET_TYPE (elt_type0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* NOTE: result---the fixed version of elt_type0---should never
|
2004-06-02 11:55:36 +02:00
|
|
|
|
depend on the contents of the array in properly constructed
|
|
|
|
|
debugging data. */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* Create a fixed version of the array element type.
|
|
|
|
|
We're not providing the address of an element here,
|
2006-01-08 08:19:40 +01:00
|
|
|
|
and thus the actual object value cannot be inspected to do
|
2006-01-02 10:39:21 +01:00
|
|
|
|
the conversion. This should not be a problem, since arrays of
|
|
|
|
|
unconstrained objects are not allowed. In particular, all
|
|
|
|
|
the elements of an array of a tagged type should all be of
|
|
|
|
|
the same type specified in the debugging info. No need to
|
|
|
|
|
consult the object tag. */
|
2008-01-03 13:30:38 +01:00
|
|
|
|
result =
|
|
|
|
|
ada_to_fixed_type (ada_check_typedef (elt_type0), 0, 0, dval, 1);
|
2009-06-29 19:28:59 +02:00
|
|
|
|
|
|
|
|
|
elt_type0 = type0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
for (i = TYPE_NFIELDS (index_type_desc) - 1; i >= 0; i -= 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *range_type =
|
2010-05-17 18:55:31 +02:00
|
|
|
|
to_fixed_range_type (TYPE_FIELD_TYPE (index_type_desc, i), dval);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
result = create_array_type (alloc_type_copy (elt_type0),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
result, range_type);
|
2009-06-29 19:28:59 +02:00
|
|
|
|
elt_type0 = TYPE_TARGET_TYPE (elt_type0);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (!ignore_too_big && TYPE_LENGTH (result) > varsize_limit)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("array type with dynamic size is larger than varsize-limit"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (constrained_packed_array_p)
|
2009-06-23 18:43:24 +02:00
|
|
|
|
{
|
|
|
|
|
/* So far, the resulting type has been created as if the original
|
|
|
|
|
type was a regular (non-packed) array type. As a result, the
|
|
|
|
|
bitsize of the array elements needs to be set again, and the array
|
|
|
|
|
length needs to be recomputed based on that bitsize. */
|
|
|
|
|
int len = TYPE_LENGTH (result) / TYPE_LENGTH (TYPE_TARGET_TYPE (result));
|
|
|
|
|
int elt_bitsize = TYPE_FIELD_BITSIZE (type0, 0);
|
|
|
|
|
|
|
|
|
|
TYPE_FIELD_BITSIZE (result, 0) = TYPE_FIELD_BITSIZE (type0, 0);
|
|
|
|
|
TYPE_LENGTH (result) = len * elt_bitsize / HOST_CHAR_BIT;
|
|
|
|
|
if (TYPE_LENGTH (result) * HOST_CHAR_BIT < len * elt_bitsize)
|
|
|
|
|
TYPE_LENGTH (result)++;
|
|
|
|
|
}
|
|
|
|
|
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
TYPE_FIXED_INSTANCE (result) = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return result;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* A standard type (containing no dynamically sized components)
|
|
|
|
|
corresponding to TYPE for the value (TYPE, VALADDR, ADDRESS)
|
|
|
|
|
DVAL describes a record containing any discriminants used in TYPE0,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
and may be NULL if there are none, or if the object of type TYPE at
|
2006-01-02 10:39:21 +01:00
|
|
|
|
ADDRESS or in VALADDR contains these discriminants.
|
|
|
|
|
|
2008-01-03 13:30:38 +01:00
|
|
|
|
If CHECK_TAG is not null, in the case of tagged types, this function
|
|
|
|
|
attempts to locate the object's tag and use it to compute the actual
|
|
|
|
|
type. However, when ADDRESS is null, we cannot use it to determine the
|
|
|
|
|
location of the tag, and therefore compute the tagged type's actual type.
|
|
|
|
|
So we return the tagged type without consulting the tag. */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
2008-01-03 14:11:51 +01:00
|
|
|
|
static struct type *
|
|
|
|
|
ada_to_fixed_type_1 (struct type *type, const gdb_byte *valaddr,
|
2008-01-03 13:30:38 +01:00
|
|
|
|
CORE_ADDR address, struct value *dval, int check_tag)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
default:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
case TYPE_CODE_STRUCT:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct type *static_type = to_static_fixed_type (type);
|
2008-01-03 13:30:38 +01:00
|
|
|
|
struct type *fixed_record_type =
|
|
|
|
|
to_fixed_record_type (type, valaddr, address, NULL);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2006-01-02 10:39:21 +01:00
|
|
|
|
/* If STATIC_TYPE is a tagged type and we know the object's address,
|
|
|
|
|
then we can determine its tag, and compute the object's actual
|
2008-01-03 13:30:38 +01:00
|
|
|
|
type from there. Note that we have to use the fixed record
|
|
|
|
|
type (the parent part of the record may have dynamic fields
|
|
|
|
|
and the way the location of _tag is expressed may depend on
|
|
|
|
|
them). */
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|
2008-01-03 13:30:38 +01:00
|
|
|
|
if (check_tag && address != 0 && ada_is_tagged_type (static_type, 0))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *real_type =
|
2008-01-03 13:30:38 +01:00
|
|
|
|
type_from_tag (value_tag_from_contents_and_address
|
|
|
|
|
(fixed_record_type,
|
|
|
|
|
valaddr,
|
|
|
|
|
address));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (real_type != NULL)
|
2008-01-03 13:30:38 +01:00
|
|
|
|
return to_fixed_record_type (real_type, valaddr, address, NULL);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
2008-10-22 22:11:56 +02:00
|
|
|
|
|
|
|
|
|
/* Check to see if there is a parallel ___XVZ variable.
|
|
|
|
|
If there is, then it provides the actual size of our type. */
|
|
|
|
|
else if (ada_type_name (fixed_record_type) != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *name = ada_type_name (fixed_record_type);
|
|
|
|
|
char *xvz_name = alloca (strlen (name) + 7 /* "___XVZ\0" */);
|
|
|
|
|
int xvz_found = 0;
|
|
|
|
|
LONGEST size;
|
|
|
|
|
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (xvz_name, strlen (name) + 7, "%s___XVZ", name);
|
2008-10-22 22:11:56 +02:00
|
|
|
|
size = get_int_var_value (xvz_name, &xvz_found);
|
|
|
|
|
if (xvz_found && TYPE_LENGTH (fixed_record_type) != size)
|
|
|
|
|
{
|
|
|
|
|
fixed_record_type = copy_type (fixed_record_type);
|
|
|
|
|
TYPE_LENGTH (fixed_record_type) = size;
|
|
|
|
|
|
|
|
|
|
/* The FIXED_RECORD_TYPE may have be a stub. We have
|
|
|
|
|
observed this when the debugging info is STABS, and
|
|
|
|
|
apparently it is something that is hard to fix.
|
|
|
|
|
|
|
|
|
|
In practice, we don't need the actual type definition
|
|
|
|
|
at all, because the presence of the XVZ variable allows us
|
|
|
|
|
to assume that there must be a XVS type as well, which we
|
|
|
|
|
should be able to use later, when we need the actual type
|
|
|
|
|
definition.
|
|
|
|
|
|
|
|
|
|
In the meantime, pretend that the "fixed" type we are
|
|
|
|
|
returning is NOT a stub, because this can cause trouble
|
|
|
|
|
when using this type to create new types targeting it.
|
|
|
|
|
Indeed, the associated creation routines often check
|
|
|
|
|
whether the target type is a stub and will try to replace
|
|
|
|
|
it, thus using a type with the wrong size. This, in turn,
|
|
|
|
|
might cause the new type to have the wrong size too.
|
|
|
|
|
Consider the case of an array, for instance, where the size
|
|
|
|
|
of the array is computed from the number of elements in
|
|
|
|
|
our array multiplied by the size of its element. */
|
|
|
|
|
TYPE_STUB (fixed_record_type) = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-01-03 13:30:38 +01:00
|
|
|
|
return fixed_record_type;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
case TYPE_CODE_ARRAY:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return to_fixed_array_type (type, dval, 1);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
if (dval == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return to_fixed_variant_branch_type (type, valaddr, address, dval);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-01-03 14:11:51 +01:00
|
|
|
|
/* The same as ada_to_fixed_type_1, except that it preserves the type
|
|
|
|
|
if it is a TYPE_CODE_TYPEDEF of a type that is already fixed.
|
|
|
|
|
ada_to_fixed_type_1 would return the type referenced by TYPE. */
|
|
|
|
|
|
|
|
|
|
struct type *
|
|
|
|
|
ada_to_fixed_type (struct type *type, const gdb_byte *valaddr,
|
|
|
|
|
CORE_ADDR address, struct value *dval, int check_tag)
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct type *fixed_type =
|
|
|
|
|
ada_to_fixed_type_1 (type, valaddr, address, dval, check_tag);
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF
|
|
|
|
|
&& TYPE_TARGET_TYPE (type) == fixed_type)
|
|
|
|
|
return type;
|
|
|
|
|
|
|
|
|
|
return fixed_type;
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* A standard (static-sized) type corresponding as well as possible to
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE0, but based on no runtime data. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
to_static_fixed_type (struct type *type0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (type0 == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
gdb:
* xml-tdesc.c (tdesc_end_union): Update.
* stabsread.c (define_symbol): Update.
(read_type): Update.
(read_struct_type): Update.
(read_enum_type): Update.
* spu-tdep.c (spu_builtin_type_vec128): Update.
* sh-tdep.c (sh_push_dummy_call_fpu): Update.
(sh_push_dummy_call_nofpu): Update.
* mdebugread.c (parse_symbol): Update.
(parse_symbol): Update.
(parse_symbol): Update.
(upgrade_type): Update.
* jv-lang.c (java_lookup_class): Update.
* iq2000-tdep.c (iq2000_pointer_to_address): Update.
* i386-tdep.c (i386_mmx_type): Update.
(i386_sse_type): Update.
* gdbtypes.h (enum type_flag_value): New enum.
(enum type_instance_flag_value): New enum.
(TYPE_FLAG_UNSIGNED, TYPE_FLAG_NOSIGN, TYPE_FLAG_STUB,
TYPE_FLAG_TARGET_STUB, TYPE_FLAG_STATIC, TYPE_FLAG_PROTOTYPED,
TYPE_FLAG_INCOMPLETE, TYPE_FLAG_VARARGS, TYPE_FLAG_VECTOR,
TYPE_FLAG_FIXED_INSTANCE, TYPE_FLAG_STUB_SUPPORTED,
TYPE_FLAG_NOTTEXT): Now enum constants.
(TYPE_FLAG_CONST, TYPE_FLAG_VOLATILE, TYPE_FLAG_CODE_SPACE,
TYPE_FLAG_DATA_SPACE, TYPE_FLAG_ADDRESS_CLASS_1,
TYPE_FLAG_ADDRESS_CLASS_2): Remove.
(TYPE_INSTANCE_FLAG_CONST, TYPE_INSTANCE_FLAG_VOLATILE,
TYPE_INSTANCE_FLAG_CODE_SPACE, TYPE_INSTANCE_FLAG_DATA_SPACE,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1,
TYPE_INSTANCE_FLAG_ADDRESS_CLASS_2): New constants.
(TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB, TYPE_TARGET_STUB,
TYPE_STATIC, TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_VARARGS,
TYPE_VECTOR, TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED,
TYPE_NOTTEXT): Update.
(TYPE_FLAG_ADDRESS_CLASS_ALL): Remove.
(TYPE_INSTANCE_FLAG_ADDRESS_CLASS_ALL): New define.
(TYPE_VOLATILE, TYPE_CODE_SPACE, TYPE_DATA_SPACE,
TYPE_ADDRESS_CLASS_1, TYPE_ADDRESS_CLASS_2,
TYPE_ADDRESS_CLASS_ALL): Update.
(struct main_type) <flags>: Remove.
<flag_unsigned, flag_nosign, flag_stub, flag_target_stub,
flag_static, flag_prototyped, flag_incomplete, flag_varargs,
flag_vector, flag_stub_supported, flag_nottext,
flag_fixed_instance>: New fields.
<nfields, vptr_fieldno>: Move earlier.
(TYPE_FLAGS): Remove.
* gdbtypes.c (make_pointer_type): Update.
(address_space_name_to_int): Update.
(address_space_int_to_name): Update.
(make_type_with_address_space): Update.
(make_cv_type): Update.
(create_range_type): Update.
(get_discrete_bounds): Update.
(create_set_type): Update.
(make_vector_type): Update.
(smash_to_method_type): Update.
(check_typedef): Update.
(check_stub_method): Update.
(init_type): Individually assign flag fields.
(recursive_dump_type): Don't print entire TYPE_FLAGS field. Do
print TYPE_FIXED_INSTANCE, TYPE_STUB_SUPPORTED, and TYPE_NOTTEXT.
(copy_type_recursive): Copy the entire main type. Don't use
TYPE_FLAGS.
* features/rs6000/powerpc-altivec64l.c
(initialize_tdesc_powerpc_altivec64l): Update.
* features/rs6000/powerpc-altivec64.c
(initialize_tdesc_powerpc_altivec64): Update.
* features/rs6000/powerpc-altivec32l.c
(initialize_tdesc_powerpc_altivec32l): Update.
* features/rs6000/powerpc-altivec32.c
(initialize_tdesc_powerpc_altivec32): Update.
* features/rs6000/powerpc-7400.c (initialize_tdesc_powerpc_7400):
Update.
* features/arm-with-iwmmxt.c (initialize_tdesc_arm_with_iwmmxt):
Update.
* dwarf2read.c (read_structure_type): Update.
(read_enumeration_type): Likewise.
(process_enumeration_scope): Likewise.
(read_tag_pointer_type): Likewise.
(read_subroutine_type): Likewise.
(read_subroutine_type): Likewise.
(read_base_type): Likewise.
* coffread.c (coff_read_enum_type): Update.
* ada-valprint.c (adjust_type_signedness): Update.
* ada-typeprint.c (print_record_field_types): Update.
* ada-lang.c (packed_array_type): Update.
(empty_record): Don't reset TYPE_FLAGS.
(ada_template_to_fixed_record_type_1): Update.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_record_type): Likewise.
(to_fixed_array_type): Likewise.
(to_static_fixed_type): Likewise.
gdb/testsuite:
* gdb.base/maint.exp: Update "maint print type".
2008-08-24 18:39:57 +02:00
|
|
|
|
if (TYPE_FIXED_INSTANCE (type0))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type0;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type0 = ada_check_typedef (type0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
switch (TYPE_CODE (type0))
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
return type0;
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
type = dynamic_template_type (type0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (type != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return template_to_static_fixed_type (type);
|
|
|
|
|
else
|
|
|
|
|
return template_to_static_fixed_type (type0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
type = ada_find_parallel_type (type0, "___XVU");
|
|
|
|
|
if (type != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return template_to_static_fixed_type (type);
|
|
|
|
|
else
|
|
|
|
|
return template_to_static_fixed_type (type0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* A static approximation of TYPE with all type wrappers removed. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
|
|
|
|
static_unwrap_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (ada_is_aligner_type (type))
|
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
struct type *type1 = TYPE_FIELD_TYPE (ada_check_typedef (type), 0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (ada_type_name (type1) == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_NAME (type1) = ada_type_name (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return static_unwrap_type (type1);
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *raw_real_type = ada_get_base_type (type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (raw_real_type == type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return to_static_fixed_type (raw_real_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In some cases, incomplete and private types require
|
2004-06-02 11:55:36 +02:00
|
|
|
|
cross-references that are not resolved as records (for example,
|
2002-06-04 17:28:49 +02:00
|
|
|
|
type Foo;
|
|
|
|
|
type FooP is access Foo;
|
|
|
|
|
V: FooP;
|
|
|
|
|
type Foo is array ...;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
). In these cases, since there is no mechanism for producing
|
2002-06-04 17:28:49 +02:00
|
|
|
|
cross-references to such types, we instead substitute for FooP a
|
|
|
|
|
stub enumeration type that is nowhere resolved, and whose tag is
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the name of the actual type. Call these types "non-record stubs". */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* A type equivalent to TYPE that is not a non-record stub, if one
|
2004-06-02 11:55:36 +02:00
|
|
|
|
exists, otherwise TYPE. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
2004-10-08 11:40:12 +02:00
|
|
|
|
ada_check_typedef (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-01-04 21:45:05 +01:00
|
|
|
|
if (type == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
if (type == NULL || TYPE_CODE (type) != TYPE_CODE_ENUM
|
2006-01-02 10:39:21 +01:00
|
|
|
|
|| !TYPE_STUB (type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|| TYPE_TAG_NAME (type) == NULL)
|
|
|
|
|
return type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *name = TYPE_TAG_NAME (type);
|
|
|
|
|
struct type *type1 = ada_find_any_type (name);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2010-10-01 18:25:00 +02:00
|
|
|
|
if (type1 == NULL)
|
|
|
|
|
return type;
|
|
|
|
|
|
|
|
|
|
/* TYPE1 might itself be a TYPE_CODE_TYPEDEF (this can happen with
|
|
|
|
|
stubs pointing to arrays, as we don't create symbols for array
|
|
|
|
|
types, only for the typedef-to-array types). This is why
|
|
|
|
|
we process TYPE1 with ada_check_typedef before returning
|
|
|
|
|
the result. */
|
|
|
|
|
return ada_check_typedef (type1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A value representing the data at VALADDR/ADDRESS as described by
|
|
|
|
|
type TYPE0, but with a standard (static-sized) type that correctly
|
|
|
|
|
describes it. If VAL0 is not NULL and TYPE0 already is a standard
|
|
|
|
|
type, then return VAL0 [this feature is simply to avoid redundant
|
2004-06-02 11:55:36 +02:00
|
|
|
|
creation of struct values]. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
ada_to_fixed_value_create (struct type *type0, CORE_ADDR address,
|
|
|
|
|
struct value *val0)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-01-03 13:30:38 +01:00
|
|
|
|
struct type *type = ada_to_fixed_type (type0, 0, address, NULL, 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (type == type0 && val0 != NULL)
|
|
|
|
|
return val0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return value_from_contents_and_address (type, 0, address);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A value representing VAL, but with a standard (static-sized) type
|
|
|
|
|
that correctly describes it. Does not necessarily create a new
|
|
|
|
|
value. */
|
|
|
|
|
|
2010-04-21 00:26:57 +02:00
|
|
|
|
struct value *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_to_fixed_value (struct value *val)
|
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return ada_to_fixed_value_create (value_type (val),
|
2009-05-28 02:53:52 +02:00
|
|
|
|
value_address (val),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Attributes */
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Table mapping attribute numbers to names.
|
|
|
|
|
NOTE: Keep up to date with enum ada_attribute definition in ada-lang.h. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static const char *attribute_names[] = {
|
2002-06-04 17:28:49 +02:00
|
|
|
|
"<?>",
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
"first",
|
2002-06-04 17:28:49 +02:00
|
|
|
|
"last",
|
|
|
|
|
"length",
|
|
|
|
|
"image",
|
|
|
|
|
"max",
|
|
|
|
|
"min",
|
2004-06-02 11:55:36 +02:00
|
|
|
|
"modulus",
|
|
|
|
|
"pos",
|
|
|
|
|
"size",
|
|
|
|
|
"tag",
|
2002-06-04 17:28:49 +02:00
|
|
|
|
"val",
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_attribute_name (enum exp_opcode n)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (n >= OP_ATR_FIRST && n <= (int) OP_ATR_VAL)
|
|
|
|
|
return attribute_names[n - OP_ATR_FIRST + 1];
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return attribute_names[0];
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Evaluate the 'POS attribute applied to ARG. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static LONGEST
|
|
|
|
|
pos_atr (struct value *arg)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-08-16 11:26:25 +02:00
|
|
|
|
struct value *val = coerce_ref (arg);
|
|
|
|
|
struct type *type = value_type (val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (!discrete_type_p (type))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("'POS only defined on discrete types"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ENUM)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2008-08-16 11:26:25 +02:00
|
|
|
|
LONGEST v = value_as_long (val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
for (i = 0; i < TYPE_NFIELDS (type); i += 1)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (v == TYPE_FIELD_BITPOS (type, i))
|
|
|
|
|
return i;
|
|
|
|
|
}
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("enumeration value is invalid: can't find 'POS"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2008-08-16 11:26:25 +02:00
|
|
|
|
return value_as_long (val);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct value *
|
2008-09-11 16:19:09 +02:00
|
|
|
|
value_pos_atr (struct type *type, struct value *arg)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-09-11 16:19:09 +02:00
|
|
|
|
return value_from_longest (type, pos_atr (arg));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Evaluate the TYPE'VAL attribute applied to ARG. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
value_val_atr (struct type *type, struct value *arg)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (!discrete_type_p (type))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("'VAL only defined on discrete types"));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (!integer_type_p (value_type (arg)))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("'VAL requires integral argument"));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ENUM)
|
|
|
|
|
{
|
|
|
|
|
long pos = value_as_long (arg);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (pos < 0 || pos >= TYPE_NFIELDS (type))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("argument to 'VAL out of range"));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return value_from_longest (type, TYPE_FIELD_BITPOS (type, pos));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return value_from_longest (type, value_as_long (arg));
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Evaluation */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True if TYPE appears to be an Ada character type.
|
|
|
|
|
[At the moment, this is true only for Character and Wide_Character;
|
|
|
|
|
It is a heuristic test that could stand improvement]. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
int
|
|
|
|
|
ada_is_character_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2007-12-24 07:29:27 +01:00
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
/* If the type code says it's a character, then assume it really is,
|
|
|
|
|
and don't check any further. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_CHAR)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Otherwise, assume it's a character type iff it is a discrete type
|
|
|
|
|
with a known character type name. */
|
|
|
|
|
name = ada_type_name (type);
|
|
|
|
|
return (name != NULL
|
|
|
|
|
&& (TYPE_CODE (type) == TYPE_CODE_INT
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_RANGE)
|
|
|
|
|
&& (strcmp (name, "character") == 0
|
|
|
|
|
|| strcmp (name, "wide_character") == 0
|
2007-12-24 17:52:24 +01:00
|
|
|
|
|| strcmp (name, "wide_wide_character") == 0
|
2007-12-24 07:29:27 +01:00
|
|
|
|
|| strcmp (name, "unsigned char") == 0));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True if TYPE appears to be an Ada string type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_string_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (type != NULL
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& TYPE_CODE (type) != TYPE_CODE_PTR
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& (ada_is_simple_array_type (type)
|
|
|
|
|
|| ada_is_array_descriptor_type (type))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& ada_array_arity (type) == 1)
|
|
|
|
|
{
|
|
|
|
|
struct type *elttype = ada_array_element_type (type, 1);
|
|
|
|
|
|
|
|
|
|
return ada_is_character_type (elttype);
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-18 11:24:26 +01:00
|
|
|
|
/* The compiler sometimes provides a parallel XVS type for a given
|
|
|
|
|
PAD type. Normally, it is safe to follow the PAD type directly,
|
|
|
|
|
but older versions of the compiler have a bug that causes the offset
|
|
|
|
|
of its "F" field to be wrong. Following that field in that case
|
|
|
|
|
would lead to incorrect results, but this can be worked around
|
|
|
|
|
by ignoring the PAD type and using the associated XVS type instead.
|
|
|
|
|
|
|
|
|
|
Set to True if the debugger should trust the contents of PAD types.
|
|
|
|
|
Otherwise, ignore the PAD type if there is a parallel XVS type. */
|
|
|
|
|
static int trust_pad_over_xvs = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* True if TYPE is a struct type introduced by the compiler to force the
|
|
|
|
|
alignment of a value. Such types have a single field with a
|
2004-06-02 11:55:36 +02:00
|
|
|
|
distinctive name. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_aligner_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (type);
|
2004-10-15 11:12:24 +02:00
|
|
|
|
|
2010-01-18 11:24:26 +01:00
|
|
|
|
if (!trust_pad_over_xvs && ada_find_parallel_type (type, "___XVS") != NULL)
|
2004-10-15 11:12:24 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return (TYPE_CODE (type) == TYPE_CODE_STRUCT
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& TYPE_NFIELDS (type) == 1
|
|
|
|
|
&& strcmp (TYPE_FIELD_NAME (type, 0), "F") == 0);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there is an ___XVS-convention type parallel to SUBTYPE, return
|
2004-06-02 11:55:36 +02:00
|
|
|
|
the parallel type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_get_base_type (struct type *raw_type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *real_type_namer;
|
|
|
|
|
struct type *raw_real_type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (raw_type == NULL || TYPE_CODE (raw_type) != TYPE_CODE_STRUCT)
|
|
|
|
|
return raw_type;
|
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
if (ada_is_aligner_type (raw_type))
|
|
|
|
|
/* The encoding specifies that we should always use the aligner type.
|
|
|
|
|
So, even if this aligner type has an associated XVS type, we should
|
|
|
|
|
simply ignore it.
|
|
|
|
|
|
|
|
|
|
According to the compiler gurus, an XVS type parallel to an aligner
|
|
|
|
|
type may exist because of a stabs limitation. In stabs, aligner
|
|
|
|
|
types are empty because the field has a variable-sized type, and
|
|
|
|
|
thus cannot actually be used as an aligner type. As a result,
|
|
|
|
|
we need the associated parallel XVS type to decode the type.
|
|
|
|
|
Since the policy in the compiler is to not change the internal
|
|
|
|
|
representation based on the debugging info format, we sometimes
|
|
|
|
|
end up having a redundant XVS type parallel to the aligner type. */
|
|
|
|
|
return raw_type;
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
real_type_namer = ada_find_parallel_type (raw_type, "___XVS");
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (real_type_namer == NULL
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|| TYPE_CODE (real_type_namer) != TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_NFIELDS (real_type_namer) != 1)
|
|
|
|
|
return raw_type;
|
|
|
|
|
|
2010-01-18 11:26:02 +01:00
|
|
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (real_type_namer, 0)) != TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
/* This is an older encoding form where the base type needs to be
|
|
|
|
|
looked up by name. We prefer the newer enconding because it is
|
|
|
|
|
more efficient. */
|
|
|
|
|
raw_real_type = ada_find_any_type (TYPE_FIELD_NAME (real_type_namer, 0));
|
|
|
|
|
if (raw_real_type == NULL)
|
|
|
|
|
return raw_type;
|
|
|
|
|
else
|
|
|
|
|
return raw_real_type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The field in our XVS type is a reference to the base type. */
|
|
|
|
|
return TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (real_type_namer, 0));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The type of value designated by TYPE, with all aligners removed. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *
|
|
|
|
|
ada_aligned_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
if (ada_is_aligner_type (type))
|
|
|
|
|
return ada_aligned_type (TYPE_FIELD_TYPE (type, 0));
|
|
|
|
|
else
|
|
|
|
|
return ada_get_base_type (type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The address of the aligned value in an object at address VALADDR
|
2004-06-02 11:55:36 +02:00
|
|
|
|
having type TYPE. Assumes ada_is_aligner_type (TYPE). */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2005-05-09 Andrew Cagney <cagney@gnu.org>
Use gdb_byte in preference to bfd_byte.
* gdbarch.sh: Update.
* gdbarch.h, gdbarch.c: Re-generate.
* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
* valprint.h, value.c, value.h: Update.
2005-05-09 23:20:35 +02:00
|
|
|
|
const gdb_byte *
|
|
|
|
|
ada_aligned_value_addr (struct type *type, const gdb_byte *valaddr)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (ada_is_aligner_type (type))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return ada_aligned_value_addr (TYPE_FIELD_TYPE (type, 0),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
valaddr +
|
|
|
|
|
TYPE_FIELD_BITPOS (type,
|
|
|
|
|
0) / TARGET_CHAR_BIT);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
return valaddr;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* The printed representation of an enumeration literal with encoded
|
2004-06-02 11:55:36 +02:00
|
|
|
|
name NAME. The value is good to the next call of ada_enum_name. */
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *
|
|
|
|
|
ada_enum_name (const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *result;
|
|
|
|
|
static size_t result_len = 0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *tmp;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* First, unqualify the enumeration name:
|
|
|
|
|
1. Search for the last '.' character. If we find one, then skip
|
2004-06-27 21:06:23 +02:00
|
|
|
|
all the preceeding characters, the unqualified name starts
|
|
|
|
|
right after that dot.
|
2004-06-02 11:55:36 +02:00
|
|
|
|
2. Otherwise, we may be debugging on a target where the compiler
|
2004-06-27 21:06:23 +02:00
|
|
|
|
translates dots into "__". Search forward for double underscores,
|
|
|
|
|
but stop searching when we hit an overloading suffix, which is
|
|
|
|
|
of the form "__" followed by digits. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-07-09 21:29:56 +02:00
|
|
|
|
tmp = strrchr (name, '.');
|
|
|
|
|
if (tmp != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
name = tmp + 1;
|
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
while ((tmp = strstr (name, "__")) != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (isdigit (tmp[2]))
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
name = tmp + 2;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (name[0] == 'Q')
|
|
|
|
|
{
|
|
|
|
|
int v;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (name[1] == 'U' || name[1] == 'W')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (sscanf (name + 2, "%x", &v) != 1)
|
|
|
|
|
return name;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return name;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
GROW_VECT (result, result_len, 16);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (isascii (v) && isprint (v))
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (result, result_len, "'%c'", v);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (name[1] == 'U')
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (result, result_len, "[\"%02x\"]", v);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2009-04-14 21:04:24 +02:00
|
|
|
|
xsnprintf (result, result_len, "[\"%04x\"]", v);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-07-09 21:29:56 +02:00
|
|
|
|
tmp = strstr (name, "__");
|
|
|
|
|
if (tmp == NULL)
|
|
|
|
|
tmp = strstr (name, "$");
|
|
|
|
|
if (tmp != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
GROW_VECT (result, result_len, tmp - name + 1);
|
|
|
|
|
strncpy (result, name, tmp - name);
|
|
|
|
|
result[tmp - name] = '\0';
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return name;
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Evaluate the subexpression of EXP starting at *POS as for
|
|
|
|
|
evaluate_type, updating *POS to point just past the evaluated
|
2004-06-02 11:55:36 +02:00
|
|
|
|
expression. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
evaluate_subexp_type (struct expression *exp, int *pos)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2009-06-23 18:37:19 +02:00
|
|
|
|
return evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If VAL is wrapped in an aligner or subtype wrapper, return the
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value it wraps. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
unwrap_value (struct value *val)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type = ada_check_typedef (value_type (val));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (ada_is_aligner_type (type))
|
|
|
|
|
{
|
2008-05-03 01:41:40 +02:00
|
|
|
|
struct value *v = ada_value_struct_elt (val, "F", 0);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *val_type = ada_check_typedef (value_type (v));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (ada_type_name (val_type) == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
TYPE_NAME (val_type) = ada_type_name (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return unwrap_value (v);
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct type *raw_real_type =
|
2004-10-08 11:40:12 +02:00
|
|
|
|
ada_check_typedef (ada_get_base_type (type));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2010-01-18 11:24:26 +01:00
|
|
|
|
/* If there is no parallel XVS or XVE type, then the value is
|
|
|
|
|
already unwrapped. Return it without further modification. */
|
|
|
|
|
if ((type == raw_real_type)
|
|
|
|
|
&& ada_find_parallel_type (type, "___XVE") == NULL)
|
|
|
|
|
return val;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return
|
2004-06-02 11:55:36 +02:00
|
|
|
|
coerce_unspec_val_to_type
|
|
|
|
|
(val, ada_to_fixed_type (raw_real_type, 0,
|
2009-05-28 02:53:52 +02:00
|
|
|
|
value_address (val),
|
2008-01-03 13:30:38 +01:00
|
|
|
|
NULL, 1));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
cast_to_fixed (struct type *type, struct value *arg)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
LONGEST val;
|
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (type == value_type (arg))
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return arg;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
else if (ada_is_fixed_point_type (value_type (arg)))
|
2002-08-18 20:11:12 +02:00
|
|
|
|
val = ada_float_to_fixed (type,
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
ada_fixed_to_float (value_type (arg),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value_as_long (arg)));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2008-09-11 16:18:34 +02:00
|
|
|
|
DOUBLEST argd = value_as_double (arg);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
val = ada_float_to_fixed (type, argd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value_from_longest (type, val);
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
2008-09-11 16:18:34 +02:00
|
|
|
|
cast_from_fixed (struct type *type, struct value *arg)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
DOUBLEST val = ada_fixed_to_float (value_type (arg),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
value_as_long (arg));
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-09-11 16:18:34 +02:00
|
|
|
|
return value_from_double (type, val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Coerce VAL as necessary for assignment to an lval of type TYPE, and
|
|
|
|
|
return the converted value. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
coerce_for_assign (struct type *type, struct value *val)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type2 = value_type (val);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (type == type2)
|
|
|
|
|
return val;
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type2 = ada_check_typedef (type2);
|
|
|
|
|
type = ada_check_typedef (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (type2) == TYPE_CODE_PTR
|
|
|
|
|
&& TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
val = ada_value_ind (val);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
type2 = value_type (val);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (TYPE_CODE (type2) == TYPE_CODE_ARRAY
|
2002-06-04 17:28:49 +02:00
|
|
|
|
&& TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_LENGTH (type2) != TYPE_LENGTH (type)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|| TYPE_LENGTH (TYPE_TARGET_TYPE (type2))
|
|
|
|
|
!= TYPE_LENGTH (TYPE_TARGET_TYPE (type2)))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Incompatible types in assignment"));
|
2005-02-07 Andrew Cagney <cagney@gnu.org>
* value.h (deprecated_set_value_type): Declare.
* value.c (deprecated_set_value_type): Define.
* hpacc-abi.c, gnu-v2-abi.c, cp-valprint.c: Update.
* c-valprint.c, jv-lang.c, objc-lang.c, ada-lang.c: Update.
* infcall.c, printcmd.c, valops.c, eval.c, p-exp.y: Update.
* ax-gdb.c, tracepoint.c: Update.
2005-02-08 00:51:03 +01:00
|
|
|
|
deprecated_set_value_type (val, type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return val;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
|
|
|
|
|
{
|
|
|
|
|
struct value *val;
|
|
|
|
|
struct type *type1, *type2;
|
|
|
|
|
LONGEST v, v1, v2;
|
|
|
|
|
|
2004-11-10 Andrew Cagney <cagney@gnu.org>
* value.h (COERCE_REF, COERCE_ARRAY, COERCE_NUMBER, COERCE_ENUM)
(coerce_ref, coerce_array, coerce_number, coerce_enum): Replace
macros with function declarations.
* value.c (coerce_ref, coerce_array, coerce_number)
(coerce_enum): New functions.
(value_as_long, value_as_address): Update.
* ada-lang.c (ada_coerce_ref, ada_value_binop)
(ada_evaluate_subexp, ada_value_assign, ada_value_struct_elt): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* valarith.c (value_less, value_neg, value_complement)
(value_binop, value_add, value_subscript, value_x_binop)
(value_logical_not, value_sub): Update.
* valops.c (check_field, value_struct_elt, value_ind)
(value_find_oload_method_list, value_cast, value_assign): Update.
* eval.c (evaluate_subexp_standard): Update.
2004-11-10 19:52:25 +01:00
|
|
|
|
arg1 = coerce_ref (arg1);
|
|
|
|
|
arg2 = coerce_ref (arg2);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
type1 = base_type (ada_check_typedef (value_type (arg1)));
|
|
|
|
|
type2 = base_type (ada_check_typedef (value_type (arg2)));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (TYPE_CODE (type1) != TYPE_CODE_INT
|
|
|
|
|
|| TYPE_CODE (type2) != TYPE_CODE_INT)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return value_binop (arg1, arg2, op);
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
switch (op)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case BINOP_MOD:
|
|
|
|
|
case BINOP_DIV:
|
|
|
|
|
case BINOP_REM:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return value_binop (arg1, arg2, op);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
v2 = value_as_long (arg2);
|
|
|
|
|
if (v2 == 0)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("second operand of %s must not be zero."), op_string (op));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
if (TYPE_UNSIGNED (type1) || op == BINOP_MOD)
|
|
|
|
|
return value_binop (arg1, arg2, op);
|
|
|
|
|
|
|
|
|
|
v1 = value_as_long (arg1);
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
case BINOP_DIV:
|
|
|
|
|
v = v1 / v2;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (!TRUNCATION_TOWARDS_ZERO && v1 * (v1 % v2) < 0)
|
|
|
|
|
v += v > 0 ? -1 : 1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
case BINOP_REM:
|
|
|
|
|
v = v1 % v2;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (v * v1 < 0)
|
|
|
|
|
v -= v2;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* Should not reach this point. */
|
|
|
|
|
v = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = allocate_value (type1);
|
2005-02-02 01:20:07 +01:00
|
|
|
|
store_unsigned_integer (value_contents_raw (val),
|
* defs.h (extract_signed_integer, extract_unsigned_integer,
extract_long_unsigned_integer, store_signed_integer,
store_unsigned_integer): Add BYTE_ORDER parameter.
* findvar.c (extract_signed_integer, extract_unsigned_integer,
extract_long_unsigned_integer, store_signed_integer,
store_unsigned_integer): Add BYTE_ORDER parameter. Use it
instead of current_gdbarch.
* gdbcore.h (read_memory_integer, safe_read_memory_integer,
read_memory_unsigned_integer, write_memory_signed_integer,
write_memory_unsigned_integer): Add BYTE_ORDER parameter.
* corefile.c (struct captured_read_memory_integer_arguments): Add
BYTE_ORDER member.
(safe_read_memory_integer): Add BYTE_ORDER parameter. Store it into
struct captured_read_memory_integer_arguments.
(do_captured_read_memory_integer): Pass it to read_memory_integer.
(read_memory_integer): Add BYTE_ORDER parameter. Pass it to
extract_signed_integer.
(read_memory_unsigned_integer): Add BYTE_ORDER parameter. Pass it to
extract_unsigned_integer.
(write_memory_signed_integer): Add BYTE_ORDER parameter. Pass it
to store_signed_integer.
(write_memory_unsigned_integer): Add BYTE_ORDER parameter. Pass it
to store_unsigned_integer.
* target.h (get_target_memory_unsigned): Add BYTE_ORDER parameter.
* target.c (get_target_memory_unsigned): Add BYTE_ORDER parameter.
Pass it to extract_unsigned_integer.
Update calls to extract_signed_integer, extract_unsigned_integer,
extract_long_unsigned_integer, store_signed_integer,
store_unsigned_integer, read_memory_integer,
read_memory_unsigned_integer, safe_read_memory_integer,
write_memory_signed_integer, write_memory_unsigned_integer, and
get_target_memory_unsigned to pass byte order:
* ada-lang.c (ada_value_binop): Update.
* ada-valprint.c (char_at): Update.
* alpha-osf1-tdep.c (alpha_osf1_sigcontext_addr): Update.
* alpha-tdep.c (alpha_lds, alpha_sts, alpha_push_dummy_call,
alpha_extract_return_value, alpha_read_insn,
alpha_get_longjmp_target): Update.
* amd64-linux-tdep.c (amd64_linux_sigcontext_addr): Update.
* amd64obsd-tdep.c (amd64obsd_supply_uthread,
amd64obsd_collect_uthread, amd64obsd_trapframe_cache): Update.
* amd64-tdep.c (amd64_push_dummy_call, amd64_analyze_prologue,
amd64_frame_cache, amd64_sigtramp_frame_cache, fixup_riprel,
amd64_displaced_step_fixup): Update.
* arm-linux-tdep.c (arm_linux_sigreturn_init,
arm_linux_rt_sigreturn_init, arm_linux_supply_gregset): Update.
* arm-tdep.c (thumb_analyze_prologue, arm_skip_prologue,
arm_scan_prologue, arm_push_dummy_call, thumb_get_next_pc,
arm_get_next_pc, arm_extract_return_value, arm_store_return_value,
arm_return_value): Update.
* arm-wince-tdep.c (arm_pe_skip_trampoline_code): Update.
* auxv.c (default_auxv_parse): Update.
* avr-tdep.c (avr_address_to_pointer, avr_pointer_to_address,
avr_scan_prologue, avr_extract_return_value,
avr_frame_prev_register, avr_push_dummy_call): Update.
* bsd-uthread.c (bsd_uthread_check_magic, bsd_uthread_lookup_offset,
bsd_uthread_wait, bsd_uthread_thread_alive,
bsd_uthread_extra_thread_info): Update.
* c-lang.c (c_printstr, print_wchar): Update.
* cp-valprint.c (cp_print_class_member): Update.
* cris-tdep.c (cris_sigcontext_addr, cris_sigtramp_frame_unwind_cache,
cris_push_dummy_call, cris_scan_prologue, cris_store_return_value,
cris_extract_return_value, find_step_target, dip_prefix,
sixteen_bit_offset_branch_op, none_reg_mode_jump_op,
move_mem_to_reg_movem_op, get_data_from_address): Update.
* dwarf2expr.c (dwarf2_read_address, execute_stack_op): Update.
* dwarf2-frame.c (execute_cfa_program): Update.
* dwarf2loc.c (find_location_expression): Update.
* dwarf2read.c (dwarf2_const_value): Update.
* expprint.c (print_subexp_standard): Update.
* findvar.c (unsigned_pointer_to_address, signed_pointer_to_address,
unsigned_address_to_pointer, address_to_signed_pointer,
read_var_value): Update.
* frame.c (frame_unwind_register_signed,
frame_unwind_register_unsigned, get_frame_memory_signed,
get_frame_memory_unsigned): Update.
* frame-unwind.c (frame_unwind_got_constant): Update.
* frv-linux-tdep.c (frv_linux_pc_in_sigtramp,
frv_linux_sigcontext_reg_addr, frv_linux_sigtramp_frame_cache):
Update.
* frv-tdep.c (frv_analyze_prologue, frv_skip_main_prologue,
frv_extract_return_value, find_func_descr,
frv_convert_from_func_ptr_addr, frv_push_dummy_call): Update.
* f-valprint.c (f_val_print): Update.
* gnu-v3-abi.c (gnuv3_decode_method_ptr, gnuv3_make_method_ptr):
Update.
* h8300-tdep.c (h8300_is_argument_spill, h8300_analyze_prologue,
h8300_push_dummy_call, h8300_extract_return_value,
h8300h_extract_return_value, h8300_store_return_value,
h8300h_store_return_value): Update.
* hppabsd-tdep.c (hppabsd_find_global_pointer): Update.
* hppa-hpux-nat.c (hppa_hpux_fetch_register, hppa_hpux_store_register):
Update.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline,
hppa64_hpux_in_solib_call_trampoline,
hppa_hpux_in_solib_return_trampoline, hppa_hpux_skip_trampoline_code,
hppa_hpux_sigtramp_frame_unwind_cache,
hppa_hpux_sigtramp_unwind_sniffer, hppa32_hpux_find_global_pointer,
hppa64_hpux_find_global_pointer, hppa_hpux_search_pattern,
hppa32_hpux_search_dummy_call_sequence,
hppa64_hpux_search_dummy_call_sequence, hppa_hpux_supply_save_state,
hppa_hpux_unwind_adjust_stub): Update.
* hppa-linux-tdep.c (insns_match_pattern,
hppa_linux_find_global_pointer): Update.
* hppa-tdep.c (hppa_in_function_epilogue_p, hppa32_push_dummy_call,
hppa64_convert_code_addr_to_fptr, hppa64_push_dummy_call,
skip_prologue_hard_way, hppa_frame_cache, hppa_fallback_frame_cache,
hppa_pseudo_register_read, hppa_frame_prev_register_helper,
hppa_match_insns): Update.
* hpux-thread.c (hpux_thread_fetch_registers): Update.
* i386-tdep.c (i386bsd_sigcontext_addr): Update.
* i386-cygwin-tdep.c (core_process_module_section): Update.
* i386-darwin-nat.c (i386_darwin_sstep_at_sigreturn,
amd64_darwin_sstep_at_sigreturn): Update.
* i386-darwin-tdep.c (i386_darwin_sigcontext_addr,
amd64_darwin_sigcontext_addr): Likewise.
* i386-linux-nat.c (i386_linux_sigcontext_addr): Update.
* i386nbsd-tdep.c (i386nbsd_sigtramp_cache_init): Update.
* i386-nto-tdep.c (i386nto_sigcontext_addr): Update.
* i386obsd-nat.c (i386obsd_supply_pcb): Update.
* i386obsd-tdep.c (i386obsd_supply_uthread, i386obsd_collect_uthread,
i386obsd_trapframe_cache): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_follow_jump,
i386_analyze_frame_setup, i386_analyze_prologue,
i386_skip_main_prologue, i386_frame_cache, i386_sigtramp_frame_cache,
i386_get_longjmp_target, i386_push_dummy_call,
i386_pe_skip_trampoline_code, i386_svr4_sigcontext_addr,
i386_fetch_pointer_argument): Update.
* i387-tdep.c (i387_supply_fsave): Update.
* ia64-linux-tdep.c (ia64_linux_sigcontext_register_address): Update.
* ia64-tdep.c (ia64_pseudo_register_read, ia64_pseudo_register_write,
examine_prologue, ia64_frame_cache, ia64_frame_prev_register,
ia64_sigtramp_frame_cache, ia64_sigtramp_frame_prev_register,
ia64_access_reg, ia64_access_rse_reg, ia64_libunwind_frame_this_id,
ia64_libunwind_frame_prev_register,
ia64_libunwind_sigtramp_frame_this_id,
ia64_libunwind_sigtramp_frame_prev_register, ia64_find_global_pointer,
find_extant_func_descr, find_func_descr,
ia64_convert_from_func_ptr_addr, ia64_push_dummy_call, ia64_dummy_id,
ia64_unwind_pc): Update.
* iq2000-tdep.c (iq2000_pointer_to_address, iq2000_address_to_pointer,
iq2000_scan_prologue, iq2000_extract_return_value,
iq2000_push_dummy_call): Update.
* irix5nat.c (fill_gregset): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* jv-valprint.c (java_value_print): Update.
* lm32-tdep.c (lm32_analyze_prologue, lm32_push_dummy_call,
lm32_extract_return_value, lm32_store_return_value): Update.
* m32c-tdep.c (m32c_push_dummy_call, m32c_return_value,
m32c_skip_trampoline_code, m32c_m16c_address_to_pointer,
m32c_m16c_pointer_to_address): Update.
* m32r-tdep.c (m32r_store_return_value, decode_prologue,
m32r_skip_prologue, m32r_push_dummy_call, m32r_extract_return_value):
Update.
* m68hc11-tdep.c (m68hc11_pseudo_register_read,
m68hc11_pseudo_register_write, m68hc11_analyze_instruction,
m68hc11_push_dummy_call): Update.
* m68linux-tdep.c (m68k_linux_pc_in_sigtramp,
m68k_linux_get_sigtramp_info, m68k_linux_sigtramp_frame_cache):
Update.
* m68k-tdep.c (m68k_push_dummy_call, m68k_analyze_frame_setup,
m68k_analyze_register_saves, m68k_analyze_prologue, m68k_frame_cache,
m68k_get_longjmp_target): Update.
* m88k-tdep.c (m88k_fetch_instruction): Update.
* mep-tdep.c (mep_pseudo_cr32_read, mep_pseudo_csr_write,
mep_pseudo_cr32_write, mep_get_insn, mep_push_dummy_call): Update.
* mi/mi-main.c (mi_cmd_data_write_memory): Update.
* mips-linux-tdep.c (mips_linux_get_longjmp_target, supply_32bit_reg,
mips64_linux_get_longjmp_target, mips64_fill_gregset,
mips64_fill_fpregset, mips_linux_in_dynsym_stub): Update.
* mipsnbdsd-tdep.c (mipsnbsd_get_longjmp_target): Update.
* mips-tdep.c (mips_fetch_instruction, fetch_mips_16,
mips_eabi_push_dummy_call, mips_n32n64_push_dummy_call,
mips_o32_push_dummy_call, mips_o64_push_dummy_call,
mips_single_step_through_delay, mips_skip_pic_trampoline_code,
mips_integer_to_address): Update.
* mn10300-tdep.c (mn10300_analyze_prologue, mn10300_push_dummy_call):
Update.
* monitor.c (monitor_supply_register, monitor_write_memory,
monitor_read_memory_single): Update.
* moxie-tdep.c (moxie_store_return_value, moxie_extract_return_value,
moxie_analyze_prologue): Update.
* mt-tdep.c (mt_return_value, mt_skip_prologue, mt_select_coprocessor,
mt_pseudo_register_read, mt_pseudo_register_write, mt_registers_info,
mt_push_dummy_call): Update.
* objc-lang.c (read_objc_method, read_objc_methlist_nmethods,
read_objc_methlist_method, read_objc_object, read_objc_super,
read_objc_class, find_implementation_from_class): Update.
* ppc64-linux-tdep.c (ppc64_desc_entry_point,
ppc64_linux_convert_from_func_ptr_addr, ppc_linux_sigtramp_cache):
Update.
* ppcobsd-tdep.c (ppcobsd_sigtramp_frame_sniffer,
ppcobsd_sigtramp_frame_cache): Update.
* ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call,
do_ppc_sysv_return_value, ppc64_sysv_abi_push_dummy_call,
ppc64_sysv_abi_return_value): Update.
* ppc-linux-nat.c (ppc_linux_auxv_parse): Update.
* procfs.c (procfs_auxv_parse): Update.
* p-valprint.c (pascal_val_print): Update.
* regcache.c (regcache_raw_read_signed, regcache_raw_read_unsigned,
regcache_raw_write_signed, regcache_raw_write_unsigned,
regcache_cooked_read_signed, regcache_cooked_read_unsigned,
regcache_cooked_write_signed, regcache_cooked_write_unsigned): Update.
* remote-m32r-sdi.c (m32r_fetch_register): Update.
* remote-mips.c (mips_wait, mips_fetch_registers, mips_xfer_memory):
Update.
* rs6000-aix-tdep.c (rs6000_push_dummy_call, rs6000_return_value,
rs6000_convert_from_func_ptr_addr, branch_dest,
rs6000_software_single_step): Update.
* rs6000-tdep.c (rs6000_in_function_epilogue_p,
ppc_displaced_step_fixup, ppc_deal_with_atomic_sequence,
bl_to_blrl_insn_p, rs6000_fetch_instruction, skip_prologue,
rs6000_skip_main_prologue, rs6000_skip_trampoline_code,
rs6000_frame_cache): Update.
* s390-tdep.c (s390_pseudo_register_read, s390_pseudo_register_write,
s390x_pseudo_register_read, s390x_pseudo_register_write, s390_load,
s390_backchain_frame_unwind_cache, s390_sigtramp_frame_unwind_cache,
extend_simple_arg, s390_push_dummy_call, s390_return_value): Update.
* scm-exp.c (scm_lreadr): Update.
* scm-lang.c (scm_get_field, scm_unpack): Update.
* scm-valprint.c (scm_val_print): Update.
* score-tdep.c (score_breakpoint_from_pc, score_push_dummy_call,
score_fetch_inst): Update.
* sh64-tdep.c (look_for_args_moves, sh64_skip_prologue_hard_way,
sh64_analyze_prologue, sh64_push_dummy_call, sh64_extract_return_value,
sh64_pseudo_register_read, sh64_pseudo_register_write,
sh64_frame_prev_register): Update:
* sh-tdep.c (sh_analyze_prologue, sh_push_dummy_call_fpu,
sh_push_dummy_call_nofpu, sh_extract_return_value_nofpu,
sh_store_return_value_nofpu, sh_in_function_epilogue_p): Update.
* solib-darwin.c (darwin_load_image_infos): Update.
* solib-frv.c (fetch_loadmap, lm_base, frv_current_sos, enable_break2,
find_canonical_descriptor_in_load_object): Update.
* solib-irix.c (extract_mips_address, fetch_lm_info, irix_current_sos,
irix_open_symbol_file_object): Update.
* solib-som.c (som_solib_create_inferior_hook, link_map_start,
som_current_sos, som_open_symbol_file_object): Update.
* solib-sunos.c (SOLIB_EXTRACT_ADDRESS, LM_ADDR, LM_NEXT, LM_NAME):
Update.
* solib-svr4.c (read_program_header, scan_dyntag_auxv,
solib_svr4_r_ldsomap): Update.
* sparc64-linux-tdep.c (sparc64_linux_step_trap): Update.
* sparc64obsd-tdep.c (sparc64obsd_supply_uthread,
sparc64obsd_collect_uthread): Update.
* sparc64-tdep.c (sparc64_pseudo_register_read,
sparc64_pseudo_register_write, sparc64_supply_gregset,
sparc64_collect_gregset): Update.
* sparc-linux-tdep.c (sparc32_linux_step_trap): Update.
* sparcobsd-tdep.c (sparc32obsd_supply_uthread,
sparc32obsd_collect_uthread): Update.
* sparc-tdep.c (sparc_fetch_wcookie, sparc32_push_dummy_code,
sparc32_store_arguments, sparc32_return_value, sparc_supply_rwindow,
sparc_collect_rwindow): Update.
* spu-linux-nat.c (parse_spufs_run): Update.
* spu-tdep.c (spu_pseudo_register_read_spu,
spu_pseudo_register_write_spu, spu_pointer_to_address,
spu_analyze_prologue, spu_in_function_epilogue_p,
spu_frame_unwind_cache, spu_push_dummy_call, spu_software_single_step,
spu_get_longjmp_target, spu_get_overlay_table, spu_overlay_update_osect,
info_spu_signal_command, info_spu_mailbox_list, info_spu_dma_cmdlist,
info_spu_dma_command, info_spu_proxydma_command): Update.
* stack.c (print_frame_nameless_args, frame_info): Update.
* symfile.c (read_target_long_array, simple_read_overlay_table,
simple_read_overlay_region_table): Update.
* target.c (debug_print_register): Update.
* tramp-frame.c (tramp_frame_start): Update.
* v850-tdep.c (v850_analyze_prologue, v850_push_dummy_call,
v850_extract_return_value, v850_store_return_value,
* valarith.c (value_binop, value_bit_index): Update.
* valops.c (value_cast): Update.
* valprint.c (val_print_type_code_int, val_print_string,
read_string): Update.
* value.c (unpack_long, unpack_double, unpack_field_as_long,
modify_field, pack_long): Update.
* vax-tdep.c (vax_store_arguments, vax_push_dummy_call,
vax_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_push_dummy_call,
xstormy16_analyze_prologue, xstormy16_in_function_epilogue_p,
xstormy16_resolve_jmp_table_entry, xstormy16_find_jmp_table_entry,
xstormy16_pointer_to_address, xstormy16_address_to_pointer): Update.
* xtensa-tdep.c (extract_call_winsize, xtensa_pseudo_register_read,
xtensa_pseudo_register_write, xtensa_frame_cache,
xtensa_push_dummy_call, call0_track_op, call0_frame_cache): Update.
* dfp.h (decimal_to_string, decimal_from_string, decimal_from_integral,
decimal_from_floating, decimal_to_doublest, decimal_is_zero): Add
BYTE_ORDER parameter.
(decimal_binop): Add BYTE_ORDER_X, BYTE_ORDER_Y, and BYTE_ORDER_RESULT
parameters.
(decimal_compare): Add BYTE_ORDER_X and BYTE_ORDER_Y parameters.
(decimal_convert): Add BYTE_ORDER_FROM and BYTE_ORDER_TO parameters.
* dfp.c (match_endianness): Add BYTE_ORDER parameter. Use it
instead of current_gdbarch.
(decimal_to_string, decimal_from_integral, decimal_from_floating,
decimal_to_doublest, decimal_is_zero): Add BYTE_ORDER parameter.
Pass it to match_endianness.
(decimal_binop): Add BYTE_ORDER_X, BYTE_ORDER_Y, and BYTE_ORDER_RESULT
parameters. Pass them to match_endianness.
(decimal_compare): Add BYTE_ORDER_X and BYTE_ORDER_Y parameters.
Pass them to match_endianness.
(decimal_convert): Add BYTE_ORDER_FROM and BYTE_ORDER_TO parameters.
Pass them to match_endianness.
* valarith.c (value_args_as_decimal): Add BYTE_ORDER_X and
BYTE_ORDER_Y output parameters.
(value_binop): Update call to value_args_as_decimal.
Update calls to decimal_to_string, decimal_from_string,
decimal_from_integral, decimal_from_floating, decimal_to_doublest,
decimal_is_zero, decimal_binop, decimal_compare and decimal_convert
to pass/receive byte order:
* c-exp.y (parse_number): Update.
* printcmd.c (printf_command): Update.
* valarith.c (value_args_as_decimal, value_binop, value_logical_not,
value_equal, value_less): Update.
* valops.c (value_cast, value_one): Update.
* valprint.c (print_decimal_floating): Update.
* value.c (unpack_long, unpack_double): Update.
* python/python-value.c (valpy_nonzero): Update.
* ada-valprint.c (char_at): Add BYTE_ORDER parameter.
(printstr): Update calls to char_at.
(ada_val_print_array): Likewise.
* valprint.c (read_string): Add BYTE_ORDER parameter.
(val_print_string): Update call to read_string.
* c-lang.c (c_get_string): Likewise.
* charset.h (target_wide_charset): Add BYTE_ORDER parameter.
* charset.c (target_wide_charset): Add BYTE_ORDER parameter.
Use it instead of current_gdbarch.
* printcmd.c (printf_command): Update calls to target_wide_charset.
* c-lang.c (charset_for_string_type): Add BYTE_ORDER parameter.
Pass to target_wide_charset. Use it instead of current_gdbarch.
(classify_type): Add BYTE_ORDER parameter. Pass to
charset_for_string_type. Allow NULL encoding pointer.
(print_wchar): Add BYTE_ORDER parameter.
(c_emit_char): Update calls to classify_type and print_wchar.
(c_printchar, c_printstr): Likewise.
* gdbarch.sh (in_solib_return_trampoline): Convert to type "m".
* gdbarch.c, gdbarch.h: Regenerate.
* arch-utils.h (generic_in_solib_return_trampoline): Add GDBARCH
parameter.
* arch-utils.c (generic_in_solib_return_trampoline): Likewise.
* hppa-hpux-tdep.c (hppa_hpux_in_solib_return_trampoline): Likewise.
* rs6000-tdep.c (rs6000_in_solib_return_trampoline): Likewise.
(rs6000_skip_trampoline_code): Update call.
* alpha-tdep.h (struct gdbarch_tdep): Add GDBARCH parameter to
dynamic_sigtramp_offset and pc_in_sigtramp callbacks.
(alpha_read_insn): Add GDBARCH parameter.
* alpha-tdep.c (alpha_lds, alpha_sts): Add GDBARCH parameter.
(alpha_register_to_value): Pass architecture to alpha_sts.
(alpha_extract_return_value): Likewise.
(alpha_value_to_register): Pass architecture to alpha_lds.
(alpha_store_return_value): Likewise.
(alpha_read_insn): Add GDBARCH parameter.
(alpha_skip_prologue): Pass architecture to alpha_read_insn.
(alpha_heuristic_proc_start): Likewise.
(alpha_heuristic_frame_unwind_cache): Likewise.
(alpha_next_pc): Likewise.
(alpha_sigtramp_frame_this_id): Pass architecture to
tdep->dynamic_sigtramp_offset callback.
(alpha_sigtramp_frame_sniffer): Pass architecture to
tdep->pc_in_sigtramp callback.
* alphafbsd-tdep.c (alphafbsd_pc_in_sigtramp): Add GDBARCH parameter.
(alphafbsd_sigtramp_offset): Likewise.
* alpha-linux-tdep.c (alpha_linux_sigtramp_offset_1): Add GDBARCH
parameter. Pass to alpha_read_insn.
(alpha_linux_sigtramp_offset): Add GDBARCH parameter. Pass to
alpha_linux_sigtramp_offset_1.
(alpha_linux_pc_in_sigtramp): Add GDBARCH parameter. Pass to
alpha_linux_sigtramp_offset.
(alpha_linux_sigcontext_addr): Pass architecture to alpha_read_insn
and alpha_linux_sigtramp_offset.
* alphanbsd-tdep.c (alphanbsd_sigtramp_offset): Add GDBARCH parameter.
(alphanbsd_pc_in_sigtramp): Add GDBARCH parameter. Pass to
alphanbsd_sigtramp_offset.
* alphaobsd-tdep.c (alphaobsd_sigtramp_offset): Add GDBARCH parameter.
(alphaobsd_pc_in_sigtramp): Add GDBARCH parameter. Pass to
alpha_read_insn.
(alphaobsd_sigcontext_addr): Pass architecture to
alphaobsd_sigtramp_offset.
* alpha-osf1-tdep.c (alpha_osf1_pc_in_sigtramp): Add GDBARCH
parameter.
* amd64-tdep.c (amd64_analyze_prologue): Add GDBARCH parameter.
(amd64_skip_prologue): Pass architecture to amd64_analyze_prologue.
(amd64_frame_cache): Likewise.
* arm-tdep.c (SWAP_SHORT, SWAP_INT): Remove.
(thumb_analyze_prologue, arm_skip_prologue, arm_scan_prologue,
thumb_get_next_pc, arm_get_next_pc): Do not use SWAP_ macros.
* arm-wince-tdep.c: Include "frame.h".
* avr-tdep.c (EXTRACT_INSN): Remove.
(avr_scan_prologue): Add GDBARCH argument, inline EXTRACT_INSN.
(avr_skip_prologue): Pass architecture to avr_scan_prologue.
(avr_frame_unwind_cache): Likewise.
* cris-tdep.c (struct instruction_environment): Add BYTE_ORDER member.
(find_step_target): Initialize it.
(get_data_from_address): Add BYTE_ORDER parameter.
(bdap_prefix): Pass byte order to get_data_from_address.
(handle_prefix_assign_mode_for_aritm_op): Likewise.
(three_operand_add_sub_cmp_and_or_op): Likewise.
(handle_inc_and_index_mode_for_aritm_op): Likewise.
* frv-linux-tdep.c (frv_linux_pc_in_sigtramp): Add GDBARCH parameter.
(frv_linux_sigcontext_reg_addr): Pass architecture to
frv_linux_pc_in_sigtramp.
(frv_linux_sigtramp_frame_sniffer): Likewise.
* h8300-tdep.c (h8300_is_argument_spill): Add GDBARCH parameter.
(h8300_analyze_prologue): Add GDBARCH parameter. Pass to
h8300_is_argument_spill.
(h8300_frame_cache, h8300_skip_prologue): Pass architecture
to h8300_analyze_prologue.
* hppa-tdep.h (struct gdbarch_tdep): Add GDBARCH parameter to
in_solib_call_trampoline callback.
(hppa_in_solib_call_trampoline): Add GDBARCH parameter.
* hppa-tdep.c (hppa64_convert_code_addr_to_fptr): Add GDBARCH
parameter.
(hppa64_push_dummy_call): Pass architecture to
hppa64_convert_code_addr_to_fptr.
(hppa_match_insns): Add GDBARCH parameter.
(hppa_match_insns_relaxed): Add GDBARCH parameter. Pass to
hppa_match_insns.
(hppa_skip_trampoline_code): Pass architecture to hppa_match_insns.
(hppa_in_solib_call_trampoline): Add GDBARCH parameter. Pass to
hppa_match_insns_relaxed.
(hppa_stub_unwind_sniffer): Pass architecture to
tdep->in_solib_call_trampoline callback.
* hppa-hpux-tdep.c (hppa_hpux_search_pattern): Add GDBARCH parameter.
(hppa32_hpux_search_dummy_call_sequence): Pass architecture to
hppa_hpux_search_pattern.
* hppa-linux-tdep.c (insns_match_pattern): Add GDBARCH parameter.
(hppa_linux_sigtramp_find_sigcontext): Add GDBARCH parameter.
Pass to insns_match_pattern.
(hppa_linux_sigtramp_frame_unwind_cache): Pass architecture to
hppa_linux_sigtramp_find_sigcontext.
(hppa_linux_sigtramp_frame_sniffer): Likewise.
(hppa32_hpux_in_solib_call_trampoline): Add GDBARCH parameter.
(hppa64_hpux_in_solib_call_trampoline): Likewise.
* i386-tdep.c (i386_follow_jump): Add GDBARCH parameter.
(i386_analyze_frame_setup): Add GDBARCH parameter.
(i386_analyze_prologue): Add GDBARCH parameter. Pass to
i386_follow_jump and i386_analyze_frame_setup.
(i386_skip_prologue): Pass architecture to i386_analyze_prologue
and i386_follow_jump.
(i386_frame_cache): Pass architecture to i386_analyze_prologue.
(i386_pe_skip_trampoline_code): Add FRAME parameter.
* i386-tdep.h (i386_pe_skip_trampoline_code): Add FRAME parameter.
* i386-cygwin-tdep.c (i386_cygwin_skip_trampoline_code): Pass
frame to i386_pe_skip_trampoline_code.
* ia64-tdep.h (struct gdbarch_tdep): Add GDBARCH parameter
to sigcontext_register_address callback.
* ia64-tdep.c (ia64_find_global_pointer): Add GDBARCH parameter.
(ia64_find_unwind_table): Pass architecture to
ia64_find_global_pointer.
(find_extant_func_descr): Add GDBARCH parameter.
(find_func_descr): Pass architecture to find_extant_func_descr
and ia64_find_global_pointer.
(ia64_sigtramp_frame_init_saved_regs): Pass architecture to
tdep->sigcontext_register_address callback.
* ia64-linux-tdep.c (ia64_linux_sigcontext_register_address): Add
GDBARCH parameter.
* iq2000-tdep.c (iq2000_scan_prologue): Add GDBARCH parameter.
(iq2000_frame_cache): Pass architecture to iq2000_scan_prologue.
* lm32-tdep.c (lm32_analyze_prologue): Add GDBARCH parameter.
(lm32_skip_prologue, lm32_frame_cache): Pass architecture to
lm32_analyze_prologue.
* m32r-tdep.c (decode_prologue): Add GDBARCH parameter.
(m32r_skip_prologue): Pass architecture to decode_prologue.
* m68hc11-tdep.c (m68hc11_analyze_instruction): Add GDBARCH parameter.
(m68hc11_scan_prologue): Pass architecture to
m68hc11_analyze_instruction.
* m68k-tdep.c (m68k_analyze_frame_setup): Add GDBARCH parameter.
(m68k_analyze_prologue): Pass architecture to
m68k_analyze_frame_setup.
* m88k-tdep.c (m88k_fetch_instruction): Add BYTE_ORDER parameter.
(m88k_analyze_prologue): Add GDBARCH parameter. Pass byte order
to m88k_fetch_instruction.
(m88k_skip_prologue): Pass architecture to m88k_analyze_prologue.
(m88k_frame_cache): Likewise.
* mep-tdep.c (mep_get_insn): Add GDBARCH parameter.
(mep_analyze_prologue): Pass architecture to mep_get_insn.
* mips-tdep.c (mips_fetch_instruction): Add GDBARCH parameter.
(mips32_next_pc): Pass architecture to mips_fetch_instruction.
(deal_with_atomic_sequence): Likewise.
(unpack_mips16): Add GDBARCH parameter, pass to mips_fetch_instruction.
(mips16_scan_prologue): Likewise.
(mips32_scan_prologue): Likewise.
(mips16_in_function_epilogue_p): Likewise.
(mips32_in_function_epilogue_p): Likewise.
(mips_about_to_return): Likewise.
(mips_insn16_frame_cache): Pass architecture to mips16_scan_prologue.
(mips_insn32_frame_cache): Pass architecture to mips32_scan_prologue.
(mips_skip_prologue): Pass architecture to mips16_scan_prologue
and mips32_scan_prologue.
(mips_in_function_epilogue_p): Pass architecture to
mips16_in_function_epilogue_p and
mips32_in_function_epilogue_p.
(heuristic_proc_start): Pass architecture to mips_fetch_instruction
and mips_about_to_return.
(mips_skip_mips16_trampoline_code): Pass architecture to
mips_fetch_instruction.
(fetch_mips_16): Add GDBARCH parameter.
(mips16_next_pc): Pass architecture to fetch_mips_16.
(extended_mips16_next_pc): Pass architecture to unpack_mips16 and
fetch_mips_16.
* objc-lang.c (read_objc_method, read_objc_methlist_nmethods,
read_objc_methlist_method, read_objc_object, read_objc_super,
read_objc_class): Add GDBARCH parameter.
(find_implementation_from_class): Add GDBARCH parameter, pass
to read_objc_class, read_objc_methlist_nmethods, and
read_objc_methlist_method.
(find_implementation): Add GDBARCH parameter, pass to
read_objc_object and find_implementation_from_class.
(resolve_msgsend, resolve_msgsend_stret): Pass architecture
to find_implementation.
(resolve_msgsend_super, resolve_msgsend_super_stret): Pass
architecture to read_objc_super and find_implementation_from_class.
* ppc64-linux-tdep.c (ppc64_desc_entry_point): Add GDBARCH parameter.
(ppc64_standard_linkage1_target, ppc64_standard_linkage2_target,
ppc64_standard_linkage3_target): Pass architecture to
ppc64_desc_entry_point.
* rs6000-tdep.c (bl_to_blrl_insn_p): Add BYTE_ORDER parameter.
(skip_prologue): Pass byte order to bl_to_blrl_insn_p.
(rs6000_fetch_instruction): Add GDBARCH parameter.
(rs6000_skip_stack_check): Add GDBARCH parameter, pass to
rs6000_fetch_instruction.
(skip_prologue): Pass architecture to rs6000_fetch_instruction.
* remote-mips.c (mips_store_word): Return old_contents as host
integer value instead of target bytes.
* s390-tdep.c (struct s390_prologue_data): Add BYTE_ORDER member.
(s390_analyze_prologue): Initialize it.
(extend_simple_arg): Add GDBARCH parameter.
(s390_push_dummy_call): Pass architecture to extend_simple_arg.
* scm-lang.c (scm_get_field): Add BYTE_ORDER parameter.
* scm-lang.h (scm_get_field): Add BYTE_ORDER parameter.
(SCM_CAR, SCM_CDR): Pass SCM_BYTE_ORDER to scm_get_field.
* scm-valprint.c (scm_scmval_print): Likewise.
(scm_scmlist_print, scm_ipruk, scm_scmval_print): Define
SCM_BYTE_ORDER.
* sh64-tdep.c (look_for_args_moves): Add GDBARCH parameter.
(sh64_skip_prologue_hard_way): Add GDBARCH parameter, pass to
look_for_args_moves.
(sh64_skip_prologue): Pass architecture to
sh64_skip_prologue_hard_way.
* sh-tdep.c (sh_analyze_prologue): Add GDBARCH parameter.
(sh_skip_prologue): Pass architecture to sh_analyze_prologue.
(sh_frame_cache): Likewise.
* solib-irix.c (extract_mips_address): Add GDBARCH parameter.
(fetch_lm_info, irix_current_sos, irix_open_symbol_file_object):
Pass architecture to extract_mips_address.
* sparc-tdep.h (sparc_fetch_wcookie): Add GDBARCH parameter.
* sparc-tdep.c (sparc_fetch_wcookie): Add GDBARCH parameter.
(sparc_supply_rwindow, sparc_collect_rwindow): Pass architecture
to sparc_fetch_wcookie.
(sparc32_frame_prev_register): Likewise.
* sparc64-tdep.c (sparc64_frame_prev_register): Likewise.
* sparc32nbsd-tdep.c (sparc32nbsd_sigcontext_saved_regs): Likewise.
* sparc64nbsd-tdep.c (sparc64nbsd_sigcontext_saved_regs): Likewise.
* spu-tdep.c (spu_analyze_prologue): Add GDBARCH parameter.
(spu_skip_prologue): Pass architecture to spu_analyze_prologue.
(spu_virtual_frame_pointer): Likewise.
(spu_frame_unwind_cache): Likewise.
(info_spu_mailbox_list): Add BYTE_ORER parameter.
(info_spu_mailbox_command): Pass byte order to info_spu_mailbox_list.
(info_spu_dma_cmdlist): Add BYTE_ORER parameter.
(info_spu_dma_command, info_spu_proxydma_command): Pass byte order
to info_spu_dma_cmdlist.
* symfile.c (read_target_long_array): Add GDBARCH parameter.
(simple_read_overlay_table, simple_read_overlay_region_table,
simple_overlay_update_1): Pass architecture to read_target_long_array.
* v850-tdep.c (v850_analyze_prologue): Add GDBARCH parameter.
(v850_frame_cache): Pass architecture to v850_analyze_prologue.
* xstormy16-tdep.c (xstormy16_analyze_prologue): Add GDBARCH
parameter.
(xstormy16_skip_prologue, xstormy16_frame_cache): Pass architecture
to xstormy16_analyze_prologue.
(xstormy16_resolve_jmp_table_entry): Add GDBARCH parameter.
(xstormy16_find_jmp_table_entry): Likewise.
(xstormy16_skip_trampoline_code): Pass architecture to
xstormy16_resolve_jmp_table_entry.
(xstormy16_pointer_to_address): Likewise.
(xstormy16_address_to_pointer): Pass architecture to
xstormy16_find_jmp_table_entry.
* xtensa-tdep.c (call0_track_op): Add GDBARCH parameter.
(call0_analyze_prologue): Add GDBARCH parameter, pass to
call0_track_op.
(call0_frame_cache): Pass architecture to call0_analyze_prologue.
(xtensa_skip_prologue): Likewise.
2009-07-02 19:25:59 +02:00
|
|
|
|
TYPE_LENGTH (value_type (val)),
|
|
|
|
|
gdbarch_byte_order (get_type_arch (type1)), v);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_value_equal (struct value *arg1, struct value *arg2)
|
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_direct_array_type (value_type (arg1))
|
|
|
|
|
|| ada_is_direct_array_type (value_type (arg2)))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-01-02 12:18:03 +01:00
|
|
|
|
/* Automatically dereference any array reference before
|
|
|
|
|
we attempt to perform the comparison. */
|
|
|
|
|
arg1 = ada_coerce_ref (arg1);
|
|
|
|
|
arg2 = ada_coerce_ref (arg2);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
arg1 = ada_coerce_to_simple_array (arg1);
|
|
|
|
|
arg2 = ada_coerce_to_simple_array (arg2);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (arg1)) != TYPE_CODE_ARRAY
|
|
|
|
|
|| TYPE_CODE (value_type (arg2)) != TYPE_CODE_ARRAY)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Attempt to compare array with non-array"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* FIXME: The following works only for types whose
|
2004-06-27 21:06:23 +02:00
|
|
|
|
representations use all bits (no padding or undefined bits)
|
|
|
|
|
and do not have user-defined equality. */
|
|
|
|
|
return
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
TYPE_LENGTH (value_type (arg1)) == TYPE_LENGTH (value_type (arg2))
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
|
&& memcmp (value_contents (arg1), value_contents (arg2),
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
TYPE_LENGTH (value_type (arg1))) == 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
return value_equal (arg1, arg2);
|
|
|
|
|
}
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
/* Total number of component associations in the aggregate starting at
|
|
|
|
|
index PC in EXP. Assumes that index PC is the start of an
|
|
|
|
|
OP_AGGREGATE. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
num_component_specs (struct expression *exp, int pc)
|
|
|
|
|
{
|
|
|
|
|
int n, m, i;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
m = exp->elts[pc + 1].longconst;
|
|
|
|
|
pc += 3;
|
|
|
|
|
n = 0;
|
|
|
|
|
for (i = 0; i < m; i += 1)
|
|
|
|
|
{
|
|
|
|
|
switch (exp->elts[pc].opcode)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
n += 1;
|
|
|
|
|
break;
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
n += exp->elts[pc + 1].longconst;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, &pc, EVAL_SKIP);
|
|
|
|
|
}
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign the result of evaluating EXP starting at *POS to the INDEXth
|
|
|
|
|
component of LHS (a simple array or a record), updating *POS past
|
|
|
|
|
the expression, assuming that LHS is contained in CONTAINER. Does
|
|
|
|
|
not modify the inferior's memory, nor does it modify LHS (unless
|
|
|
|
|
LHS == CONTAINER). */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
assign_component (struct value *container, struct value *lhs, LONGEST index,
|
|
|
|
|
struct expression *exp, int *pos)
|
|
|
|
|
{
|
|
|
|
|
struct value *mark = value_mark ();
|
|
|
|
|
struct value *elt;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (TYPE_CODE (value_type (lhs)) == TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
2009-07-02 14:20:18 +02:00
|
|
|
|
struct type *index_type = builtin_type (exp->gdbarch)->builtin_int;
|
|
|
|
|
struct value *index_val = value_from_longest (index_type, index);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
elt = unwrap_value (ada_value_subscript (lhs, 1, &index_val));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
elt = ada_index_struct_field (index, lhs, 0, value_type (lhs));
|
|
|
|
|
elt = ada_to_fixed_value (unwrap_value (elt));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (exp->elts[*pos].opcode == OP_AGGREGATE)
|
|
|
|
|
assign_aggregate (container, elt, exp, pos, EVAL_NORMAL);
|
|
|
|
|
else
|
|
|
|
|
value_assign_to_component (container, elt,
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos,
|
|
|
|
|
EVAL_NORMAL));
|
|
|
|
|
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that LHS represents an lvalue having a record or array
|
|
|
|
|
type, and EXP->ELTS[*POS] is an OP_AGGREGATE, evaluate an assignment
|
|
|
|
|
of that aggregate's value to LHS, advancing *POS past the
|
|
|
|
|
aggregate. NOSIDE is as for evaluate_subexp. CONTAINER is an
|
|
|
|
|
lvalue containing LHS (possibly LHS itself). Does not modify
|
|
|
|
|
the inferior's memory, nor does it modify the contents of
|
|
|
|
|
LHS (unless == CONTAINER). Returns the modified CONTAINER. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
assign_aggregate (struct value *container,
|
|
|
|
|
struct value *lhs, struct expression *exp,
|
|
|
|
|
int *pos, enum noside noside)
|
|
|
|
|
{
|
|
|
|
|
struct type *lhs_type;
|
|
|
|
|
int n = exp->elts[*pos+1].longconst;
|
|
|
|
|
LONGEST low_index, high_index;
|
|
|
|
|
int num_specs;
|
|
|
|
|
LONGEST *indices;
|
|
|
|
|
int max_indices, num_indices;
|
|
|
|
|
int is_array_aggregate;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
*pos += 3;
|
|
|
|
|
if (noside != EVAL_NORMAL)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (i = 0; i < n; i += 1)
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, noside);
|
|
|
|
|
return container;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
container = ada_coerce_ref (container);
|
|
|
|
|
if (ada_is_direct_array_type (value_type (container)))
|
|
|
|
|
container = ada_coerce_to_simple_array (container);
|
|
|
|
|
lhs = ada_coerce_ref (lhs);
|
|
|
|
|
if (!deprecated_value_modifiable (lhs))
|
|
|
|
|
error (_("Left operand of assignment is not a modifiable lvalue."));
|
|
|
|
|
|
|
|
|
|
lhs_type = value_type (lhs);
|
|
|
|
|
if (ada_is_direct_array_type (lhs_type))
|
|
|
|
|
{
|
|
|
|
|
lhs = ada_coerce_to_simple_array (lhs);
|
|
|
|
|
lhs_type = value_type (lhs);
|
|
|
|
|
low_index = TYPE_ARRAY_LOWER_BOUND_VALUE (lhs_type);
|
|
|
|
|
high_index = TYPE_ARRAY_UPPER_BOUND_VALUE (lhs_type);
|
|
|
|
|
is_array_aggregate = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (lhs_type) == TYPE_CODE_STRUCT)
|
|
|
|
|
{
|
|
|
|
|
low_index = 0;
|
|
|
|
|
high_index = num_visible_fields (lhs_type) - 1;
|
|
|
|
|
is_array_aggregate = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
error (_("Left-hand side must be array or record."));
|
|
|
|
|
|
|
|
|
|
num_specs = num_component_specs (exp, *pos - 3);
|
|
|
|
|
max_indices = 4 * num_specs + 4;
|
|
|
|
|
indices = alloca (max_indices * sizeof (indices[0]));
|
|
|
|
|
indices[0] = indices[1] = low_index - 1;
|
|
|
|
|
indices[2] = indices[3] = high_index + 1;
|
|
|
|
|
num_indices = 4;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n; i += 1)
|
|
|
|
|
{
|
|
|
|
|
switch (exp->elts[*pos].opcode)
|
|
|
|
|
{
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
aggregate_assign_from_choices (container, lhs, exp, pos, indices,
|
|
|
|
|
&num_indices, max_indices,
|
|
|
|
|
low_index, high_index);
|
|
|
|
|
break;
|
|
|
|
|
case OP_POSITIONAL:
|
|
|
|
|
aggregate_assign_positional (container, lhs, exp, pos, indices,
|
|
|
|
|
&num_indices, max_indices,
|
|
|
|
|
low_index, high_index);
|
|
|
|
|
break;
|
|
|
|
|
case OP_OTHERS:
|
|
|
|
|
if (i != n-1)
|
|
|
|
|
error (_("Misplaced 'others' clause"));
|
|
|
|
|
aggregate_assign_others (container, lhs, exp, pos, indices,
|
|
|
|
|
num_indices, low_index, high_index);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
error (_("Internal error: bad aggregate clause"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return container;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign into the component of LHS indexed by the OP_POSITIONAL
|
|
|
|
|
construct at *POS, updating *POS past the construct, given that
|
|
|
|
|
the positions are relative to lower bound LOW, where HIGH is the
|
|
|
|
|
upper bound. Record the position in INDICES[0 .. MAX_INDICES-1]
|
|
|
|
|
updating *NUM_INDICES as needed. CONTAINER is as for
|
|
|
|
|
assign_aggregate. */
|
|
|
|
|
static void
|
|
|
|
|
aggregate_assign_positional (struct value *container,
|
|
|
|
|
struct value *lhs, struct expression *exp,
|
|
|
|
|
int *pos, LONGEST *indices, int *num_indices,
|
|
|
|
|
int max_indices, LONGEST low, LONGEST high)
|
|
|
|
|
{
|
|
|
|
|
LONGEST ind = longest_to_int (exp->elts[*pos + 1].longconst) + low;
|
|
|
|
|
|
|
|
|
|
if (ind - 1 == high)
|
2006-01-08 08:19:40 +01:00
|
|
|
|
warning (_("Extra components in aggregate ignored."));
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (ind <= high)
|
|
|
|
|
{
|
|
|
|
|
add_component_interval (ind, ind, indices, num_indices, max_indices);
|
|
|
|
|
*pos += 3;
|
|
|
|
|
assign_component (container, lhs, ind, exp, pos);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign into the components of LHS indexed by the OP_CHOICES
|
|
|
|
|
construct at *POS, updating *POS past the construct, given that
|
|
|
|
|
the allowable indices are LOW..HIGH. Record the indices assigned
|
|
|
|
|
to in INDICES[0 .. MAX_INDICES-1], updating *NUM_INDICES as
|
|
|
|
|
needed. CONTAINER is as for assign_aggregate. */
|
|
|
|
|
static void
|
|
|
|
|
aggregate_assign_from_choices (struct value *container,
|
|
|
|
|
struct value *lhs, struct expression *exp,
|
|
|
|
|
int *pos, LONGEST *indices, int *num_indices,
|
|
|
|
|
int max_indices, LONGEST low, LONGEST high)
|
|
|
|
|
{
|
|
|
|
|
int j;
|
|
|
|
|
int n_choices = longest_to_int (exp->elts[*pos+1].longconst);
|
|
|
|
|
int choice_pos, expr_pc;
|
|
|
|
|
int is_array = ada_is_direct_array_type (value_type (lhs));
|
|
|
|
|
|
|
|
|
|
choice_pos = *pos += 3;
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < n_choices; j += 1)
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
|
|
|
|
|
expr_pc = *pos;
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < n_choices; j += 1)
|
|
|
|
|
{
|
|
|
|
|
LONGEST lower, upper;
|
|
|
|
|
enum exp_opcode op = exp->elts[choice_pos].opcode;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (op == OP_DISCRETE_RANGE)
|
|
|
|
|
{
|
|
|
|
|
choice_pos += 1;
|
|
|
|
|
lower = value_as_long (ada_evaluate_subexp (NULL, exp, pos,
|
|
|
|
|
EVAL_NORMAL));
|
|
|
|
|
upper = value_as_long (ada_evaluate_subexp (NULL, exp, pos,
|
|
|
|
|
EVAL_NORMAL));
|
|
|
|
|
}
|
|
|
|
|
else if (is_array)
|
|
|
|
|
{
|
|
|
|
|
lower = value_as_long (ada_evaluate_subexp (NULL, exp, &choice_pos,
|
|
|
|
|
EVAL_NORMAL));
|
|
|
|
|
upper = lower;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int ind;
|
|
|
|
|
char *name;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
name = &exp->elts[choice_pos + 2].string;
|
|
|
|
|
break;
|
|
|
|
|
case OP_VAR_VALUE:
|
|
|
|
|
name = SYMBOL_NATURAL_NAME (exp->elts[choice_pos + 2].symbol);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
error (_("Invalid record component association."));
|
|
|
|
|
}
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, &choice_pos, EVAL_SKIP);
|
|
|
|
|
ind = 0;
|
|
|
|
|
if (! find_struct_field (name, value_type (lhs), 0,
|
|
|
|
|
NULL, NULL, NULL, NULL, &ind))
|
|
|
|
|
error (_("Unknown component name: %s."), name);
|
|
|
|
|
lower = upper = ind;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lower <= upper && (lower < low || upper > high))
|
|
|
|
|
error (_("Index in component association out of bounds."));
|
|
|
|
|
|
|
|
|
|
add_component_interval (lower, upper, indices, num_indices,
|
|
|
|
|
max_indices);
|
|
|
|
|
while (lower <= upper)
|
|
|
|
|
{
|
|
|
|
|
int pos1;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
pos1 = expr_pc;
|
|
|
|
|
assign_component (container, lhs, lower, exp, &pos1);
|
|
|
|
|
lower += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign the value of the expression in the OP_OTHERS construct in
|
|
|
|
|
EXP at *POS into the components of LHS indexed from LOW .. HIGH that
|
|
|
|
|
have not been previously assigned. The index intervals already assigned
|
|
|
|
|
are in INDICES[0 .. NUM_INDICES-1]. Updates *POS to after the
|
|
|
|
|
OP_OTHERS clause. CONTAINER is as for assign_aggregate*/
|
|
|
|
|
static void
|
|
|
|
|
aggregate_assign_others (struct value *container,
|
|
|
|
|
struct value *lhs, struct expression *exp,
|
|
|
|
|
int *pos, LONGEST *indices, int num_indices,
|
|
|
|
|
LONGEST low, LONGEST high)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int expr_pc = *pos+1;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < num_indices - 2; i += 2)
|
|
|
|
|
{
|
|
|
|
|
LONGEST ind;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (ind = indices[i + 1] + 1; ind < indices[i + 2]; ind += 1)
|
|
|
|
|
{
|
|
|
|
|
int pos;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
pos = expr_pc;
|
|
|
|
|
assign_component (container, lhs, ind, exp, &pos);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the interval [LOW .. HIGH] to the sorted set of intervals
|
|
|
|
|
[ INDICES[0] .. INDICES[1] ],..., [ INDICES[*SIZE-2] .. INDICES[*SIZE-1] ],
|
|
|
|
|
modifying *SIZE as needed. It is an error if *SIZE exceeds
|
|
|
|
|
MAX_SIZE. The resulting intervals do not overlap. */
|
|
|
|
|
static void
|
|
|
|
|
add_component_interval (LONGEST low, LONGEST high,
|
|
|
|
|
LONGEST* indices, int *size, int max_size)
|
|
|
|
|
{
|
|
|
|
|
int i, j;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (i = 0; i < *size; i += 2) {
|
|
|
|
|
if (high >= indices[i] && low <= indices[i + 1])
|
|
|
|
|
{
|
|
|
|
|
int kh;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
for (kh = i + 2; kh < *size; kh += 2)
|
|
|
|
|
if (high < indices[kh])
|
|
|
|
|
break;
|
|
|
|
|
if (low < indices[i])
|
|
|
|
|
indices[i] = low;
|
|
|
|
|
indices[i + 1] = indices[kh - 1];
|
|
|
|
|
if (high > indices[i + 1])
|
|
|
|
|
indices[i + 1] = high;
|
|
|
|
|
memcpy (indices + i + 2, indices + kh, *size - kh);
|
|
|
|
|
*size -= kh - i - 2;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else if (high < indices[i])
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*size == max_size)
|
|
|
|
|
error (_("Internal error: miscounted aggregate components."));
|
|
|
|
|
*size += 2;
|
|
|
|
|
for (j = *size-1; j >= i+2; j -= 1)
|
|
|
|
|
indices[j] = indices[j - 2];
|
|
|
|
|
indices[i] = low;
|
|
|
|
|
indices[i + 1] = high;
|
|
|
|
|
}
|
|
|
|
|
|
2007-12-28 07:25:56 +01:00
|
|
|
|
/* Perform and Ada cast of ARG2 to type TYPE if the type of ARG2
|
|
|
|
|
is different. */
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_cast (struct type *type, struct value *arg2, enum noside noside)
|
|
|
|
|
{
|
|
|
|
|
if (type == ada_check_typedef (value_type (arg2)))
|
|
|
|
|
return arg2;
|
|
|
|
|
|
|
|
|
|
if (ada_is_fixed_point_type (type))
|
|
|
|
|
return (cast_to_fixed (type, arg2));
|
|
|
|
|
|
|
|
|
|
if (ada_is_fixed_point_type (value_type (arg2)))
|
2008-09-11 16:18:34 +02:00
|
|
|
|
return cast_from_fixed (type, arg2);
|
2007-12-28 07:25:56 +01:00
|
|
|
|
|
|
|
|
|
return value_cast (type, arg2);
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
/* Evaluating Ada expressions, and printing their result.
|
|
|
|
|
------------------------------------------------------
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
1. Introduction:
|
|
|
|
|
----------------
|
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
We usually evaluate an Ada expression in order to print its value.
|
|
|
|
|
We also evaluate an expression in order to print its type, which
|
|
|
|
|
happens during the EVAL_AVOID_SIDE_EFFECTS phase of the evaluation,
|
|
|
|
|
but we'll focus mostly on the EVAL_NORMAL phase. In practice, the
|
|
|
|
|
EVAL_AVOID_SIDE_EFFECTS phase allows us to simplify certain aspects of
|
|
|
|
|
the evaluation compared to the EVAL_NORMAL, but is otherwise very
|
|
|
|
|
similar.
|
|
|
|
|
|
|
|
|
|
Evaluating expressions is a little more complicated for Ada entities
|
|
|
|
|
than it is for entities in languages such as C. The main reason for
|
|
|
|
|
this is that Ada provides types whose definition might be dynamic.
|
|
|
|
|
One example of such types is variant records. Or another example
|
|
|
|
|
would be an array whose bounds can only be known at run time.
|
|
|
|
|
|
|
|
|
|
The following description is a general guide as to what should be
|
|
|
|
|
done (and what should NOT be done) in order to evaluate an expression
|
|
|
|
|
involving such types, and when. This does not cover how the semantic
|
|
|
|
|
information is encoded by GNAT as this is covered separatly. For the
|
|
|
|
|
document used as the reference for the GNAT encoding, see exp_dbug.ads
|
|
|
|
|
in the GNAT sources.
|
|
|
|
|
|
|
|
|
|
Ideally, we should embed each part of this description next to its
|
|
|
|
|
associated code. Unfortunately, the amount of code is so vast right
|
|
|
|
|
now that it's hard to see whether the code handling a particular
|
|
|
|
|
situation might be duplicated or not. One day, when the code is
|
|
|
|
|
cleaned up, this guide might become redundant with the comments
|
|
|
|
|
inserted in the code, and we might want to remove it.
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
2. ``Fixing'' an Entity, the Simple Case:
|
|
|
|
|
-----------------------------------------
|
|
|
|
|
|
2009-06-23 18:43:24 +02:00
|
|
|
|
When evaluating Ada expressions, the tricky issue is that they may
|
|
|
|
|
reference entities whose type contents and size are not statically
|
|
|
|
|
known. Consider for instance a variant record:
|
|
|
|
|
|
|
|
|
|
type Rec (Empty : Boolean := True) is record
|
|
|
|
|
case Empty is
|
|
|
|
|
when True => null;
|
|
|
|
|
when False => Value : Integer;
|
|
|
|
|
end case;
|
|
|
|
|
end record;
|
|
|
|
|
Yes : Rec := (Empty => False, Value => 1);
|
|
|
|
|
No : Rec := (empty => True);
|
|
|
|
|
|
|
|
|
|
The size and contents of that record depends on the value of the
|
|
|
|
|
descriminant (Rec.Empty). At this point, neither the debugging
|
|
|
|
|
information nor the associated type structure in GDB are able to
|
|
|
|
|
express such dynamic types. So what the debugger does is to create
|
|
|
|
|
"fixed" versions of the type that applies to the specific object.
|
|
|
|
|
We also informally refer to this opperation as "fixing" an object,
|
|
|
|
|
which means creating its associated fixed type.
|
|
|
|
|
|
|
|
|
|
Example: when printing the value of variable "Yes" above, its fixed
|
|
|
|
|
type would look like this:
|
|
|
|
|
|
|
|
|
|
type Rec is record
|
|
|
|
|
Empty : Boolean;
|
|
|
|
|
Value : Integer;
|
|
|
|
|
end record;
|
|
|
|
|
|
|
|
|
|
On the other hand, if we printed the value of "No", its fixed type
|
|
|
|
|
would become:
|
|
|
|
|
|
|
|
|
|
type Rec is record
|
|
|
|
|
Empty : Boolean;
|
|
|
|
|
end record;
|
|
|
|
|
|
|
|
|
|
Things become a little more complicated when trying to fix an entity
|
|
|
|
|
with a dynamic type that directly contains another dynamic type,
|
|
|
|
|
such as an array of variant records, for instance. There are
|
|
|
|
|
two possible cases: Arrays, and records.
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
3. ``Fixing'' Arrays:
|
|
|
|
|
---------------------
|
|
|
|
|
|
|
|
|
|
The type structure in GDB describes an array in terms of its bounds,
|
|
|
|
|
and the type of its elements. By design, all elements in the array
|
|
|
|
|
have the same type and we cannot represent an array of variant elements
|
|
|
|
|
using the current type structure in GDB. When fixing an array,
|
|
|
|
|
we cannot fix the array element, as we would potentially need one
|
|
|
|
|
fixed type per element of the array. As a result, the best we can do
|
|
|
|
|
when fixing an array is to produce an array whose bounds and size
|
|
|
|
|
are correct (allowing us to read it from memory), but without having
|
|
|
|
|
touched its element type. Fixing each element will be done later,
|
|
|
|
|
when (if) necessary.
|
|
|
|
|
|
|
|
|
|
Arrays are a little simpler to handle than records, because the same
|
|
|
|
|
amount of memory is allocated for each element of the array, even if
|
2009-11-27 16:33:47 +01:00
|
|
|
|
the amount of space actually used by each element differs from element
|
2009-11-27 02:49:41 +01:00
|
|
|
|
to element. Consider for instance the following array of type Rec:
|
2009-06-23 18:43:24 +02:00
|
|
|
|
|
|
|
|
|
type Rec_Array is array (1 .. 2) of Rec;
|
|
|
|
|
|
2009-11-27 16:33:47 +01:00
|
|
|
|
The actual amount of memory occupied by each element might be different
|
|
|
|
|
from element to element, depending on the value of their discriminant.
|
2009-11-27 02:49:41 +01:00
|
|
|
|
But the amount of space reserved for each element in the array remains
|
2009-11-27 16:33:47 +01:00
|
|
|
|
fixed regardless. So we simply need to compute that size using
|
2009-11-27 02:49:41 +01:00
|
|
|
|
the debugging information available, from which we can then determine
|
|
|
|
|
the array size (we multiply the number of elements of the array by
|
|
|
|
|
the size of each element).
|
|
|
|
|
|
|
|
|
|
The simplest case is when we have an array of a constrained element
|
|
|
|
|
type. For instance, consider the following type declarations:
|
|
|
|
|
|
|
|
|
|
type Bounded_String (Max_Size : Integer) is
|
|
|
|
|
Length : Integer;
|
|
|
|
|
Buffer : String (1 .. Max_Size);
|
|
|
|
|
end record;
|
|
|
|
|
type Bounded_String_Array is array (1 ..2) of Bounded_String (80);
|
|
|
|
|
|
|
|
|
|
In this case, the compiler describes the array as an array of
|
|
|
|
|
variable-size elements (identified by its XVS suffix) for which
|
|
|
|
|
the size can be read in the parallel XVZ variable.
|
|
|
|
|
|
|
|
|
|
In the case of an array of an unconstrained element type, the compiler
|
|
|
|
|
wraps the array element inside a private PAD type. This type should not
|
|
|
|
|
be shown to the user, and must be "unwrap"'ed before printing. Note
|
2009-06-23 18:43:24 +02:00
|
|
|
|
that we also use the adjective "aligner" in our code to designate
|
|
|
|
|
these wrapper types.
|
|
|
|
|
|
2009-11-27 16:33:47 +01:00
|
|
|
|
In some cases, the size allocated for each element is statically
|
2009-11-27 02:49:41 +01:00
|
|
|
|
known. In that case, the PAD type already has the correct size,
|
|
|
|
|
and the array element should remain unfixed.
|
|
|
|
|
|
|
|
|
|
But there are cases when this size is not statically known.
|
|
|
|
|
For instance, assuming that "Five" is an integer variable:
|
2009-06-23 18:43:24 +02:00
|
|
|
|
|
|
|
|
|
type Dynamic is array (1 .. Five) of Integer;
|
|
|
|
|
type Wrapper (Has_Length : Boolean := False) is record
|
|
|
|
|
Data : Dynamic;
|
|
|
|
|
case Has_Length is
|
|
|
|
|
when True => Length : Integer;
|
|
|
|
|
when False => null;
|
|
|
|
|
end case;
|
|
|
|
|
end record;
|
|
|
|
|
type Wrapper_Array is array (1 .. 2) of Wrapper;
|
|
|
|
|
|
|
|
|
|
Hello : Wrapper_Array := (others => (Has_Length => True,
|
|
|
|
|
Data => (others => 17),
|
|
|
|
|
Length => 1));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The debugging info would describe variable Hello as being an
|
|
|
|
|
array of a PAD type. The size of that PAD type is not statically
|
|
|
|
|
known, but can be determined using a parallel XVZ variable.
|
|
|
|
|
In that case, a copy of the PAD type with the correct size should
|
|
|
|
|
be used for the fixed array.
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
3. ``Fixing'' record type objects:
|
|
|
|
|
----------------------------------
|
|
|
|
|
|
|
|
|
|
Things are slightly different from arrays in the case of dynamic
|
2009-06-23 18:43:24 +02:00
|
|
|
|
record types. In this case, in order to compute the associated
|
|
|
|
|
fixed type, we need to determine the size and offset of each of
|
|
|
|
|
its components. This, in turn, requires us to compute the fixed
|
|
|
|
|
type of each of these components.
|
|
|
|
|
|
|
|
|
|
Consider for instance the example:
|
|
|
|
|
|
|
|
|
|
type Bounded_String (Max_Size : Natural) is record
|
|
|
|
|
Str : String (1 .. Max_Size);
|
|
|
|
|
Length : Natural;
|
|
|
|
|
end record;
|
|
|
|
|
My_String : Bounded_String (Max_Size => 10);
|
|
|
|
|
|
|
|
|
|
In that case, the position of field "Length" depends on the size
|
|
|
|
|
of field Str, which itself depends on the value of the Max_Size
|
2009-11-27 02:49:41 +01:00
|
|
|
|
discriminant. In order to fix the type of variable My_String,
|
2009-06-23 18:43:24 +02:00
|
|
|
|
we need to fix the type of field Str. Therefore, fixing a variant
|
|
|
|
|
record requires us to fix each of its components.
|
|
|
|
|
|
|
|
|
|
However, if a component does not have a dynamic size, the component
|
|
|
|
|
should not be fixed. In particular, fields that use a PAD type
|
|
|
|
|
should not fixed. Here is an example where this might happen
|
|
|
|
|
(assuming type Rec above):
|
|
|
|
|
|
|
|
|
|
type Container (Big : Boolean) is record
|
|
|
|
|
First : Rec;
|
|
|
|
|
After : Integer;
|
|
|
|
|
case Big is
|
|
|
|
|
when True => Another : Integer;
|
|
|
|
|
when False => null;
|
|
|
|
|
end case;
|
|
|
|
|
end record;
|
|
|
|
|
My_Container : Container := (Big => False,
|
|
|
|
|
First => (Empty => True),
|
|
|
|
|
After => 42);
|
|
|
|
|
|
|
|
|
|
In that example, the compiler creates a PAD type for component First,
|
|
|
|
|
whose size is constant, and then positions the component After just
|
|
|
|
|
right after it. The offset of component After is therefore constant
|
|
|
|
|
in this case.
|
|
|
|
|
|
|
|
|
|
The debugger computes the position of each field based on an algorithm
|
|
|
|
|
that uses, among other things, the actual position and size of the field
|
2009-11-27 02:49:41 +01:00
|
|
|
|
preceding it. Let's now imagine that the user is trying to print
|
|
|
|
|
the value of My_Container. If the type fixing was recursive, we would
|
2009-06-23 18:43:24 +02:00
|
|
|
|
end up computing the offset of field After based on the size of the
|
|
|
|
|
fixed version of field First. And since in our example First has
|
|
|
|
|
only one actual field, the size of the fixed type is actually smaller
|
|
|
|
|
than the amount of space allocated to that field, and thus we would
|
|
|
|
|
compute the wrong offset of field After.
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
To make things more complicated, we need to watch out for dynamic
|
|
|
|
|
components of variant records (identified by the ___XVL suffix in
|
|
|
|
|
the component name). Even if the target type is a PAD type, the size
|
|
|
|
|
of that type might not be statically known. So the PAD type needs
|
|
|
|
|
to be unwrapped and the resulting type needs to be fixed. Otherwise,
|
|
|
|
|
we might end up with the wrong size for our component. This can be
|
|
|
|
|
observed with the following type declarations:
|
2009-06-23 18:43:24 +02:00
|
|
|
|
|
|
|
|
|
type Octal is new Integer range 0 .. 7;
|
|
|
|
|
type Octal_Array is array (Positive range <>) of Octal;
|
|
|
|
|
pragma Pack (Octal_Array);
|
|
|
|
|
|
|
|
|
|
type Octal_Buffer (Size : Positive) is record
|
|
|
|
|
Buffer : Octal_Array (1 .. Size);
|
|
|
|
|
Length : Integer;
|
|
|
|
|
end record;
|
|
|
|
|
|
|
|
|
|
In that case, Buffer is a PAD type whose size is unset and needs
|
|
|
|
|
to be computed by fixing the unwrapped type.
|
|
|
|
|
|
2009-11-27 02:49:41 +01:00
|
|
|
|
4. When to ``Fix'' un-``Fixed'' sub-elements of an entity:
|
|
|
|
|
----------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
Lastly, when should the sub-elements of an entity that remained unfixed
|
2009-06-23 18:43:24 +02:00
|
|
|
|
thus far, be actually fixed?
|
|
|
|
|
|
|
|
|
|
The answer is: Only when referencing that element. For instance
|
|
|
|
|
when selecting one component of a record, this specific component
|
|
|
|
|
should be fixed at that point in time. Or when printing the value
|
|
|
|
|
of a record, each component should be fixed before its value gets
|
|
|
|
|
printed. Similarly for arrays, the element of the array should be
|
|
|
|
|
fixed when printing each element of the array, or when extracting
|
|
|
|
|
one element out of that array. On the other hand, fixing should
|
|
|
|
|
not be performed on the elements when taking a slice of an array!
|
|
|
|
|
|
|
|
|
|
Note that one of the side-effects of miscomputing the offset and
|
|
|
|
|
size of each field is that we end up also miscomputing the size
|
|
|
|
|
of the containing type. This can have adverse results when computing
|
|
|
|
|
the value of an entity. GDB fetches the value of an entity based
|
|
|
|
|
on the size of its type, and thus a wrong size causes GDB to fetch
|
|
|
|
|
the wrong amount of memory. In the case where the computed size is
|
|
|
|
|
too small, GDB fetches too little data to print the value of our
|
|
|
|
|
entiry. Results in this case as unpredicatble, as we usually read
|
|
|
|
|
past the buffer containing the data =:-o. */
|
|
|
|
|
|
|
|
|
|
/* Implement the evaluate_exp routine in the exp_descriptor structure
|
|
|
|
|
for the Ada language. */
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
static struct value *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int *pos, enum noside noside)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
enum exp_opcode op;
|
2010-05-07 01:36:39 +02:00
|
|
|
|
int tem;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int pc;
|
|
|
|
|
struct value *arg1 = NULL, *arg2 = NULL, *arg3;
|
|
|
|
|
struct type *type;
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
int nargs, oplen;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value **argvec;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
pc = *pos;
|
|
|
|
|
*pos += 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
op = exp->elts[pc].opcode;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
switch (op)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
*pos -= 1;
|
2007-12-28 07:25:56 +01:00
|
|
|
|
arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
|
|
|
arg1 = unwrap_value (arg1);
|
|
|
|
|
|
|
|
|
|
/* If evaluating an OP_DOUBLE and an EXPECT_TYPE was provided,
|
|
|
|
|
then we need to perform the conversion manually, because
|
|
|
|
|
evaluate_subexp_standard doesn't do it. This conversion is
|
|
|
|
|
necessary in Ada because the different kinds of float/fixed
|
|
|
|
|
types in Ada have different representations.
|
|
|
|
|
|
|
|
|
|
Similarly, we need to perform the conversion from OP_LONG
|
|
|
|
|
ourselves. */
|
|
|
|
|
if ((op == OP_DOUBLE || op == OP_LONG) && expect_type != NULL)
|
|
|
|
|
arg1 = ada_value_cast (expect_type, arg1, noside);
|
|
|
|
|
|
|
|
|
|
return arg1;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case OP_STRING:
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct value *result;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
*pos -= 1;
|
|
|
|
|
result = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
|
|
|
/* The result type will have code OP_STRING, bashed there from
|
|
|
|
|
OP_ARRAY. Bash it back. */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (result)) == TYPE_CODE_STRING)
|
|
|
|
|
TYPE_CODE (value_type (result)) = TYPE_CODE_ARRAY;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return result;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case UNOP_CAST:
|
|
|
|
|
(*pos) += 2;
|
|
|
|
|
type = exp->elts[pc + 1].type;
|
|
|
|
|
arg1 = evaluate_subexp (type, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2007-12-28 07:25:56 +01:00
|
|
|
|
arg1 = ada_value_cast (type, arg1, noside);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return arg1;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_QUAL:
|
|
|
|
|
(*pos) += 2;
|
|
|
|
|
type = exp->elts[pc + 1].type;
|
|
|
|
|
return ada_evaluate_subexp (type, exp, pos, noside);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case BINOP_ASSIGN:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
if (exp->elts[*pos].opcode == OP_AGGREGATE)
|
|
|
|
|
{
|
|
|
|
|
arg1 = assign_aggregate (arg1, arg1, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
return arg1;
|
|
|
|
|
return ada_value_assign (arg1, arg1);
|
|
|
|
|
}
|
2008-05-10 01:50:41 +02:00
|
|
|
|
/* Force the evaluation of the rhs ARG2 to the type of the lhs ARG1,
|
|
|
|
|
except if the lhs of our assignment is a convenience variable.
|
|
|
|
|
In the case of assigning to a convenience variable, the lhs
|
|
|
|
|
should be exactly the result of the evaluation of the rhs. */
|
|
|
|
|
type = value_type (arg1);
|
|
|
|
|
if (VALUE_LVAL (arg1) == lval_internalvar)
|
|
|
|
|
type = NULL;
|
|
|
|
|
arg2 = evaluate_subexp (type, exp, pos, noside);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return arg1;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_fixed_point_type (value_type (arg1)))
|
|
|
|
|
arg2 = cast_to_fixed (value_type (arg1), arg2);
|
|
|
|
|
else if (ada_is_fixed_point_type (value_type (arg2)))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
error
|
2004-12-12 18:06:26 +01:00
|
|
|
|
(_("Fixed-point values must be assigned to fixed-point variables"));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
arg2 = coerce_for_assign (value_type (arg1), arg2);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_value_assign (arg1, arg2);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_ADD:
|
|
|
|
|
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2008-09-10 18:12:35 +02:00
|
|
|
|
if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_PTR)
|
|
|
|
|
return (value_from_longest
|
|
|
|
|
(value_type (arg1),
|
|
|
|
|
value_as_long (arg1) + value_as_long (arg2)));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if ((ada_is_fixed_point_type (value_type (arg1))
|
|
|
|
|
|| ada_is_fixed_point_type (value_type (arg2)))
|
|
|
|
|
&& value_type (arg1) != value_type (arg2))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Operands of fixed-point addition must have the same type"));
|
2008-01-01 08:38:37 +01:00
|
|
|
|
/* Do the addition, and cast the result to the type of the first
|
|
|
|
|
argument. We cannot cast the result to a reference type, so if
|
|
|
|
|
ARG1 is a reference type, find its underlying type. */
|
|
|
|
|
type = value_type (arg1);
|
|
|
|
|
while (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
* value.h (value_add, value_sub): Remove.
(value_ptradd, value_ptrsub, value_ptrdiff): Add prototypes.
* valarith.c (value_add, value_sub): Remove.
(value_ptradd, value_ptrsub, value_ptrdiff): New functions.
(find_size_for_pointer_math): Add assertion. Update comment.
(value_binop): Update comment.
* eval.c (ptrmath_type_p): New function.
(evaluate_subexp_standard): Replace value_add and value_sub
by value_ptradd, value_ptrsub, value_ptrdiff or value_binop.
Use builtin_type_uint8 instead of builtin_type_char to hold
the increment for BINOP_{PRE,POST}{IN,DE}CREMENT operations.
* valarith.c (value_subscript): Replace value_add by
value_ptradd. Replace value_sub by value_binop.
* ada-lang.c (ada_value_ptr_subscript): Likewise.
(ada_tag_name_2): Replace value_add by value_ptradd.
(ada_evaluate_subexp): Replace value_add and value_sub by
value_binop.
* m2-lang.c (evaluate_subexp_modula2): Replace value_add
by value_ptradd.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Likewise.
* gnu-v3-abi.c (gnuv3_method_ptr_to_value): Likewise.
2008-09-11 16:13:46 +02:00
|
|
|
|
return value_cast (type, value_binop (arg1, arg2, BINOP_ADD));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_SUB:
|
|
|
|
|
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2008-09-10 18:12:35 +02:00
|
|
|
|
if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_PTR)
|
|
|
|
|
return (value_from_longest
|
|
|
|
|
(value_type (arg1),
|
|
|
|
|
value_as_long (arg1) - value_as_long (arg2)));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if ((ada_is_fixed_point_type (value_type (arg1))
|
|
|
|
|
|| ada_is_fixed_point_type (value_type (arg2)))
|
|
|
|
|
&& value_type (arg1) != value_type (arg2))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Operands of fixed-point subtraction must have the same type"));
|
2008-01-01 08:38:37 +01:00
|
|
|
|
/* Do the substraction, and cast the result to the type of the first
|
|
|
|
|
argument. We cannot cast the result to a reference type, so if
|
|
|
|
|
ARG1 is a reference type, find its underlying type. */
|
|
|
|
|
type = value_type (arg1);
|
|
|
|
|
while (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
* value.h (value_add, value_sub): Remove.
(value_ptradd, value_ptrsub, value_ptrdiff): Add prototypes.
* valarith.c (value_add, value_sub): Remove.
(value_ptradd, value_ptrsub, value_ptrdiff): New functions.
(find_size_for_pointer_math): Add assertion. Update comment.
(value_binop): Update comment.
* eval.c (ptrmath_type_p): New function.
(evaluate_subexp_standard): Replace value_add and value_sub
by value_ptradd, value_ptrsub, value_ptrdiff or value_binop.
Use builtin_type_uint8 instead of builtin_type_char to hold
the increment for BINOP_{PRE,POST}{IN,DE}CREMENT operations.
* valarith.c (value_subscript): Replace value_add by
value_ptradd. Replace value_sub by value_binop.
* ada-lang.c (ada_value_ptr_subscript): Likewise.
(ada_tag_name_2): Replace value_add by value_ptradd.
(ada_evaluate_subexp): Replace value_add and value_sub by
value_binop.
* m2-lang.c (evaluate_subexp_modula2): Replace value_add
by value_ptradd.
* gnu-v2-abi.c (gnuv2_virtual_fn_field): Likewise.
* gnu-v3-abi.c (gnuv3_method_ptr_to_value): Likewise.
2008-09-11 16:13:46 +02:00
|
|
|
|
return value_cast (type, value_binop (arg1, arg2, BINOP_SUB));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_MUL:
|
|
|
|
|
case BINOP_DIV:
|
2009-03-13 03:30:55 +01:00
|
|
|
|
case BINOP_REM:
|
|
|
|
|
case BINOP_MOD:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2009-03-13 03:30:55 +01:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2009-03-13 03:15:01 +01:00
|
|
|
|
{
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
return value_zero (value_type (arg1), not_lval);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-09-11 16:18:34 +02:00
|
|
|
|
type = builtin_type (exp->gdbarch)->builtin_double;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_fixed_point_type (value_type (arg1)))
|
2008-09-11 16:18:34 +02:00
|
|
|
|
arg1 = cast_from_fixed (type, arg1);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (ada_is_fixed_point_type (value_type (arg2)))
|
2008-09-11 16:18:34 +02:00
|
|
|
|
arg2 = cast_from_fixed (type, arg2);
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_value_binop (arg1, arg2, op);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case BINOP_EQUAL:
|
|
|
|
|
case BINOP_NOTEQUAL:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
tem = 0;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2008-09-11 16:15:01 +02:00
|
|
|
|
{
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
tem = ada_value_equal (arg1, arg2);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (op == BINOP_NOTEQUAL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
tem = !tem;
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
|
|
|
return value_from_longest (type, (LONGEST) tem);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case UNOP_NEG:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
else if (ada_is_fixed_point_type (value_type (arg1)))
|
|
|
|
|
return value_cast (value_type (arg1), value_neg (arg1));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2008-09-11 16:15:01 +02:00
|
|
|
|
{
|
|
|
|
|
unop_promote (exp->language_defn, exp->gdbarch, &arg1);
|
|
|
|
|
return value_neg (arg1);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2007-12-28 07:13:51 +01:00
|
|
|
|
case BINOP_LOGICAL_AND:
|
|
|
|
|
case BINOP_LOGICAL_OR:
|
|
|
|
|
case UNOP_LOGICAL_NOT:
|
2007-12-28 14:06:17 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *val;
|
|
|
|
|
|
|
|
|
|
*pos -= 1;
|
|
|
|
|
val = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
|
|
|
return value_cast (type, val);
|
2007-12-28 14:06:17 +01:00
|
|
|
|
}
|
2007-12-28 07:13:51 +01:00
|
|
|
|
|
|
|
|
|
case BINOP_BITWISE_AND:
|
|
|
|
|
case BINOP_BITWISE_IOR:
|
|
|
|
|
case BINOP_BITWISE_XOR:
|
2007-12-28 14:06:17 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *val;
|
|
|
|
|
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
|
|
|
|
|
*pos = pc;
|
|
|
|
|
val = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
|
|
|
|
|
|
|
|
return value_cast (value_type (arg1), val);
|
|
|
|
|
}
|
2007-12-28 07:13:51 +01:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case OP_VAR_VALUE:
|
|
|
|
|
*pos -= 1;
|
2008-01-04 20:01:30 +01:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
*pos += 4;
|
|
|
|
|
goto nosideret;
|
|
|
|
|
}
|
|
|
|
|
else if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
/* Only encountered when an unresolved symbol occurs in a
|
|
|
|
|
context other than a function call, in which case, it is
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
invalid. */
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Unexpected unresolved symbol, %s, during evaluation"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2008-09-10 22:14:30 +02:00
|
|
|
|
type = static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol));
|
2010-02-09 14:15:10 +01:00
|
|
|
|
/* Check to see if this is a tagged type. We also need to handle
|
|
|
|
|
the case where the type is a reference to a tagged type, but
|
|
|
|
|
we have to be careful to exclude pointers to tagged types.
|
|
|
|
|
The latter should be shown as usual (as a pointer), whereas
|
|
|
|
|
a reference should mostly be transparent to the user. */
|
|
|
|
|
if (ada_is_tagged_type (type, 0)
|
|
|
|
|
|| (TYPE_CODE(type) == TYPE_CODE_REF
|
|
|
|
|
&& ada_is_tagged_type (TYPE_TARGET_TYPE (type), 0)))
|
2008-09-10 22:14:30 +02:00
|
|
|
|
{
|
|
|
|
|
/* Tagged types are a little special in the fact that the real
|
|
|
|
|
type is dynamic and can only be determined by inspecting the
|
|
|
|
|
object's tag. This means that we need to get the object's
|
|
|
|
|
value first (EVAL_NORMAL) and then extract the actual object
|
|
|
|
|
type from its tag.
|
|
|
|
|
|
|
|
|
|
Note that we cannot skip the final step where we extract
|
|
|
|
|
the object type from its tag, because the EVAL_NORMAL phase
|
|
|
|
|
results in dynamic components being resolved into fixed ones.
|
|
|
|
|
This can cause problems when trying to print the type
|
|
|
|
|
description of tagged types whose parent has a dynamic size:
|
|
|
|
|
We use the type name of the "_parent" component in order
|
|
|
|
|
to print the name of the ancestor type in the type description.
|
|
|
|
|
If that component had a dynamic size, the resolution into
|
|
|
|
|
a fixed type would result in the loss of that type name,
|
|
|
|
|
thus preventing us from printing the name of the ancestor
|
|
|
|
|
type in the type description. */
|
2009-03-13 01:57:52 +01:00
|
|
|
|
struct type *actual_type;
|
|
|
|
|
|
2008-09-10 22:14:30 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_NORMAL);
|
2009-03-13 01:57:52 +01:00
|
|
|
|
actual_type = type_from_tag (ada_value_tag (arg1));
|
|
|
|
|
if (actual_type == NULL)
|
|
|
|
|
/* If, for some reason, we were unable to determine
|
|
|
|
|
the actual type from the tag, then use the static
|
|
|
|
|
approximation that we just computed as a fallback.
|
|
|
|
|
This can happen if the debugging information is
|
|
|
|
|
incomplete, for instance. */
|
|
|
|
|
actual_type = type;
|
|
|
|
|
|
|
|
|
|
return value_zero (actual_type, not_lval);
|
2008-09-10 22:14:30 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*pos += 4;
|
|
|
|
|
return value_zero
|
|
|
|
|
(to_static_fixed_type
|
|
|
|
|
(static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol))),
|
|
|
|
|
not_lval);
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2009-06-23 18:43:24 +02:00
|
|
|
|
arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
|
|
|
arg1 = unwrap_value (arg1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_to_fixed_value (arg1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OP_FUNCALL:
|
|
|
|
|
(*pos) += 2;
|
|
|
|
|
|
|
|
|
|
/* Allocate arg vector, including space for the function to be
|
|
|
|
|
called in argvec[0] and a terminating NULL. */
|
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
|
argvec =
|
|
|
|
|
(struct value **) alloca (sizeof (struct value *) * (nargs + 2));
|
|
|
|
|
|
|
|
|
|
if (exp->elts[*pos].opcode == OP_VAR_VALUE
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& SYMBOL_DOMAIN (exp->elts[pc + 5].symbol) == UNDEF_DOMAIN)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Unexpected unresolved symbol, %s, during evaluation"),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
SYMBOL_PRINT_NAME (exp->elts[pc + 5].symbol));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (tem = 0; tem <= nargs; tem += 1)
|
|
|
|
|
argvec[tem] = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
argvec[tem] = 0;
|
|
|
|
|
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type
|
|
|
|
|
(desc_base_type (value_type (argvec[0]))))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
argvec[0] = ada_coerce_to_simple_array (argvec[0]);
|
2009-06-23 18:43:24 +02:00
|
|
|
|
else if (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_ARRAY
|
|
|
|
|
&& TYPE_FIELD_BITSIZE (value_type (argvec[0]), 0) != 0)
|
|
|
|
|
/* This is a packed array that has already been fixed, and
|
|
|
|
|
therefore already coerced to a simple array. Nothing further
|
|
|
|
|
to do. */
|
|
|
|
|
;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
else if (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_REF
|
|
|
|
|
|| (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_ARRAY
|
2004-06-27 21:06:23 +02:00
|
|
|
|
&& VALUE_LVAL (argvec[0]) == lval_memory))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
argvec[0] = value_addr (argvec[0]);
|
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
type = ada_check_typedef (value_type (argvec[0]));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
2004-10-08 11:40:12 +02:00
|
|
|
|
switch (TYPE_CODE (ada_check_typedef (TYPE_TARGET_TYPE (type))))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_FUNC:
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (TYPE_TARGET_TYPE (type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
break;
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
if (noside != EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
argvec[0] = ada_value_ind (argvec[0]);
|
2004-10-08 11:40:12 +02:00
|
|
|
|
type = ada_check_typedef (TYPE_TARGET_TYPE (type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("cannot subscript or call something of type `%s'"),
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
ada_type_name (value_type (argvec[0])));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_FUNC:
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
return allocate_value (TYPE_TARGET_TYPE (type));
|
|
|
|
|
return call_function_by_hand (argvec[0], nargs, argvec + 1);
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
{
|
|
|
|
|
int arity;
|
|
|
|
|
|
|
|
|
|
arity = ada_array_arity (type);
|
|
|
|
|
type = ada_array_element_type (type, nargs);
|
|
|
|
|
if (type == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("cannot subscript or call a record"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (arity != nargs)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("wrong number of subscripts; expecting %d"), arity);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2008-01-02 13:03:06 +01:00
|
|
|
|
return value_zero (ada_aligned_type (type), lval_memory);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return
|
|
|
|
|
unwrap_value (ada_value_subscript
|
|
|
|
|
(argvec[0], nargs, argvec + 1));
|
|
|
|
|
}
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
{
|
|
|
|
|
type = ada_array_element_type (type, nargs);
|
|
|
|
|
if (type == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("element type of array unknown"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2008-01-02 13:03:06 +01:00
|
|
|
|
return value_zero (ada_aligned_type (type), lval_memory);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
return
|
|
|
|
|
unwrap_value (ada_value_subscript
|
|
|
|
|
(ada_coerce_to_simple_array (argvec[0]),
|
|
|
|
|
nargs, argvec + 1));
|
|
|
|
|
case TYPE_CODE_PTR: /* Pointer to array */
|
|
|
|
|
type = to_fixed_array_type (TYPE_TARGET_TYPE (type), NULL, 1);
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
{
|
|
|
|
|
type = ada_array_element_type (type, nargs);
|
|
|
|
|
if (type == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("element type of array unknown"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2008-01-02 13:03:06 +01:00
|
|
|
|
return value_zero (ada_aligned_type (type), lval_memory);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
return
|
|
|
|
|
unwrap_value (ada_value_ptr_subscript (argvec[0], type,
|
|
|
|
|
nargs, argvec + 1));
|
|
|
|
|
|
|
|
|
|
default:
|
2006-01-08 08:19:40 +01:00
|
|
|
|
error (_("Attempt to index or call something other than an "
|
|
|
|
|
"array or function"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
|
{
|
|
|
|
|
struct value *array = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
struct value *low_bound_val =
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2004-10-15 11:12:24 +02:00
|
|
|
|
struct value *high_bound_val =
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
LONGEST low_bound;
|
|
|
|
|
LONGEST high_bound;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-11-10 Andrew Cagney <cagney@gnu.org>
* value.h (COERCE_REF, COERCE_ARRAY, COERCE_NUMBER, COERCE_ENUM)
(coerce_ref, coerce_array, coerce_number, coerce_enum): Replace
macros with function declarations.
* value.c (coerce_ref, coerce_array, coerce_number)
(coerce_enum): New functions.
(value_as_long, value_as_address): Update.
* ada-lang.c (ada_coerce_ref, ada_value_binop)
(ada_evaluate_subexp, ada_value_assign, ada_value_struct_elt): Update.
* jv-lang.c (evaluate_subexp_java): Update.
* valarith.c (value_less, value_neg, value_complement)
(value_binop, value_add, value_subscript, value_x_binop)
(value_logical_not, value_sub): Update.
* valops.c (check_field, value_struct_elt, value_ind)
(value_find_oload_method_list, value_cast, value_assign): Update.
* eval.c (evaluate_subexp_standard): Update.
2004-11-10 19:52:25 +01:00
|
|
|
|
low_bound_val = coerce_ref (low_bound_val);
|
|
|
|
|
high_bound_val = coerce_ref (high_bound_val);
|
2004-10-15 11:12:24 +02:00
|
|
|
|
low_bound = pos_atr (low_bound_val);
|
|
|
|
|
high_bound = pos_atr (high_bound_val);
|
2004-10-01 12:23:09 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
|
|
|
|
|
/* If this is a reference to an aligner type, then remove all
|
|
|
|
|
the aligners. */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (array)) == TYPE_CODE_REF
|
|
|
|
|
&& ada_is_aligner_type (TYPE_TARGET_TYPE (value_type (array))))
|
|
|
|
|
TYPE_TARGET_TYPE (value_type (array)) =
|
|
|
|
|
ada_aligned_type (TYPE_TARGET_TYPE (value_type (array)));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (value_type (array)))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("cannot slice a packed array"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
/* If this is a reference to an array or an array lvalue,
|
|
|
|
|
convert to a pointer. */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (array)) == TYPE_CODE_REF
|
|
|
|
|
|| (TYPE_CODE (value_type (array)) == TYPE_CODE_ARRAY
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& VALUE_LVAL (array) == lval_memory))
|
|
|
|
|
array = value_addr (array);
|
|
|
|
|
|
2004-06-27 21:28:20 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS
|
2004-10-08 11:40:12 +02:00
|
|
|
|
&& ada_is_array_descriptor_type (ada_check_typedef
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
(value_type (array))))
|
2004-07-01 12:30:57 +02:00
|
|
|
|
return empty_array (ada_type_of_array (array, 0), low_bound);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
array = ada_coerce_to_simple_array_ptr (array);
|
|
|
|
|
|
2004-10-15 11:12:24 +02:00
|
|
|
|
/* If we have more than one level of pointer indirection,
|
|
|
|
|
dereference the value until we get only one level. */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
while (TYPE_CODE (value_type (array)) == TYPE_CODE_PTR
|
|
|
|
|
&& (TYPE_CODE (TYPE_TARGET_TYPE (value_type (array)))
|
2004-10-15 11:12:24 +02:00
|
|
|
|
== TYPE_CODE_PTR))
|
|
|
|
|
array = value_ind (array);
|
|
|
|
|
|
|
|
|
|
/* Make sure we really do have an array type before going further,
|
|
|
|
|
to avoid a SEGV when trying to get the index type or the target
|
|
|
|
|
type later down the road if the debug info generated by
|
|
|
|
|
the compiler is incorrect or incomplete. */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (!ada_is_simple_array_type (value_type (array)))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("cannot take slice of non-array"));
|
2004-10-15 11:12:24 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (array)) == TYPE_CODE_PTR)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-07-01 12:30:57 +02:00
|
|
|
|
if (high_bound < low_bound || noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return empty_array (TYPE_TARGET_TYPE (value_type (array)),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
low_bound);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct type *arr_type0 =
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
to_fixed_array_type (TYPE_TARGET_TYPE (value_type (array)),
|
2004-06-02 11:55:36 +02:00
|
|
|
|
NULL, 1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-12-15 11:40:28 +01:00
|
|
|
|
return ada_value_slice_from_ptr (array, arr_type0,
|
|
|
|
|
longest_to_int (low_bound),
|
|
|
|
|
longest_to_int (high_bound));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
return array;
|
|
|
|
|
else if (high_bound < low_bound)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return empty_array (value_type (array), low_bound);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2006-01-02 10:39:21 +01:00
|
|
|
|
return ada_value_slice (array, longest_to_int (low_bound),
|
|
|
|
|
longest_to_int (high_bound));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_IN_RANGE:
|
|
|
|
|
(*pos) += 2;
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2009-03-24 03:04:19 +01:00
|
|
|
|
type = check_typedef (exp->elts[pc + 1].type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
default:
|
2006-01-08 08:19:40 +01:00
|
|
|
|
lim_warning (_("Membership test incompletely implemented; "
|
|
|
|
|
"always returns true"));
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
|
|
|
return value_from_longest (type, (LONGEST) 1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case TYPE_CODE_RANGE:
|
2008-09-10 11:47:39 +02:00
|
|
|
|
arg2 = value_from_longest (type, TYPE_LOW_BOUND (type));
|
|
|
|
|
arg3 = value_from_longest (type, TYPE_HIGH_BOUND (type));
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3);
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
|
|
|
return
|
|
|
|
|
value_from_longest (type,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(value_less (arg1, arg3)
|
|
|
|
|
|| value_equal (arg1, arg3))
|
|
|
|
|
&& (value_less (arg2, arg1)
|
|
|
|
|
|| value_equal (arg2, arg1)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case BINOP_IN_BOUNDS:
|
2002-06-04 17:28:49 +02:00
|
|
|
|
(*pos) += 2;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2008-09-11 16:11:40 +02:00
|
|
|
|
{
|
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
|
|
|
|
return value_zero (type, not_lval);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
tem = longest_to_int (exp->elts[pc + 1].longconst);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
type = ada_index_type (value_type (arg2), tem, "range");
|
|
|
|
|
if (!type)
|
|
|
|
|
type = value_type (arg1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
arg3 = value_from_longest (type, ada_array_bound (arg2, tem, 1));
|
|
|
|
|
arg2 = value_from_longest (type, ada_array_bound (arg2, tem, 0));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3);
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return
|
2008-09-11 16:11:40 +02:00
|
|
|
|
value_from_longest (type,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(value_less (arg1, arg3)
|
|
|
|
|
|| value_equal (arg1, arg3))
|
|
|
|
|
&& (value_less (arg2, arg1)
|
|
|
|
|
|| value_equal (arg2, arg1)));
|
|
|
|
|
|
|
|
|
|
case TERNOP_IN_RANGE:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg3 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
|
2008-09-11 16:15:01 +02:00
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3);
|
2008-09-11 16:11:40 +02:00
|
|
|
|
type = language_bool_type (exp->language_defn, exp->gdbarch);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return
|
2008-09-11 16:11:40 +02:00
|
|
|
|
value_from_longest (type,
|
2004-06-02 11:55:36 +02:00
|
|
|
|
(value_less (arg1, arg3)
|
|
|
|
|
|| value_equal (arg1, arg3))
|
|
|
|
|
&& (value_less (arg2, arg1)
|
|
|
|
|
|| value_equal (arg2, arg1)));
|
|
|
|
|
|
|
|
|
|
case OP_ATR_FIRST:
|
|
|
|
|
case OP_ATR_LAST:
|
|
|
|
|
case OP_ATR_LENGTH:
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
struct type *type_arg;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (exp->elts[*pos].opcode == OP_TYPE)
|
|
|
|
|
{
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
|
|
|
|
|
arg1 = NULL;
|
2009-03-24 02:58:22 +01:00
|
|
|
|
type_arg = check_typedef (exp->elts[pc + 2].type);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
type_arg = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (exp->elts[*pos].opcode != OP_LONG)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Invalid operand to '%s"), ada_attribute_name (op));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
tem = longest_to_int (exp->elts[*pos + 2].longconst);
|
|
|
|
|
*pos += 4;
|
|
|
|
|
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
|
|
|
|
|
if (type_arg == NULL)
|
|
|
|
|
{
|
|
|
|
|
arg1 = ada_coerce_ref (arg1);
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (value_type (arg1)))
|
2004-06-27 21:06:23 +02:00
|
|
|
|
arg1 = ada_coerce_to_simple_array (arg1);
|
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
type = ada_index_type (value_type (arg1), tem,
|
|
|
|
|
ada_attribute_name (op));
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
type = builtin_type (exp->gdbarch)->builtin_int;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return allocate_value (type);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default: /* Should never happen. */
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("unexpected attribute encountered"));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_FIRST:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return value_from_longest
|
|
|
|
|
(type, ada_array_bound (arg1, tem, 0));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_LAST:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return value_from_longest
|
|
|
|
|
(type, ada_array_bound (arg1, tem, 1));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_LENGTH:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
return value_from_longest
|
|
|
|
|
(type, ada_array_length (arg1, tem));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (discrete_type_p (type_arg))
|
|
|
|
|
{
|
|
|
|
|
struct type *range_type;
|
|
|
|
|
char *name = ada_type_name (type_arg);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
range_type = NULL;
|
|
|
|
|
if (name != NULL && TYPE_CODE (type_arg) != TYPE_CODE_ENUM)
|
2010-05-17 18:55:31 +02:00
|
|
|
|
range_type = to_fixed_range_type (type_arg, NULL);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (range_type == NULL)
|
|
|
|
|
range_type = type_arg;
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("unexpected attribute encountered"));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_FIRST:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return value_from_longest
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
(range_type, ada_discrete_type_low_bound (range_type));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_LAST:
|
2008-08-19 12:10:39 +02:00
|
|
|
|
return value_from_longest
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
(range_type, ada_discrete_type_high_bound (range_type));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_LENGTH:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("the 'length attribute applies only to array types"));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (type_arg) == TYPE_CODE_FLT)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("unimplemented type attribute"));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
LONGEST low, high;
|
|
|
|
|
|
* ada-lang.c (packed_array_type): Rename to...
(constrained_packed_array_type): ...and update comment.
(decode_packed_array, decode_constrained_packed_array): Ditto.
(decode_packed_array_type, decode_constrained_packed_array_type):
Ditto.
(ada_is_constrained_packed_array_type): New function.
(ada_is_unconstrained_packed_array_type): New function.
(decode_packed_array_bitsize): New function, extracted from
decode_packed_array_type.
(ada_type_of_array): Add support for unconstrained packed arrays.
(ada_coerce_to_simple_array_ptr, ada_coerce_to_simple_array)
(ada_array_bound_from_type, ada_array_bound, ada_array_length)
(ada_prefer_type, to_fixed_array_type, ada_evaluate_subexp): Resync.
* ada-lang.h (ada_is_packed_array_type,
ada_is_constrained_packed_array_type): Renaming.
* ada-valprint.c (ada_val_print_1): Resync.
* ada-typeprint.c (print_array_type, ada_print_type): Resync.
2009-11-19 23:42:48 +01:00
|
|
|
|
if (ada_is_constrained_packed_array_type (type_arg))
|
|
|
|
|
type_arg = decode_constrained_packed_array_type (type_arg);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2009-06-29 19:22:10 +02:00
|
|
|
|
type = ada_index_type (type_arg, tem, ada_attribute_name (op));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (type == NULL)
|
2009-06-29 19:22:10 +02:00
|
|
|
|
type = builtin_type (exp->gdbarch)->builtin_int;
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
return allocate_value (type);
|
|
|
|
|
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("unexpected attribute encountered"));
|
2004-06-27 21:06:23 +02:00
|
|
|
|
case OP_ATR_FIRST:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
low = ada_array_bound_from_type (type_arg, tem, 0);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_from_longest (type, low);
|
|
|
|
|
case OP_ATR_LAST:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
high = ada_array_bound_from_type (type_arg, tem, 1);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_from_longest (type, high);
|
|
|
|
|
case OP_ATR_LENGTH:
|
2009-06-29 19:22:10 +02:00
|
|
|
|
low = ada_array_bound_from_type (type_arg, tem, 0);
|
|
|
|
|
high = ada_array_bound_from_type (type_arg, tem, 1);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_from_longest (type, high - low + 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_ATR_TAG:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_zero (ada_tag_type (arg1), not_lval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
return ada_value_tag (arg1);
|
|
|
|
|
|
|
|
|
|
case OP_ATR_MIN:
|
|
|
|
|
case OP_ATR_MAX:
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return value_zero (value_type (arg1), not_lval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2008-09-11 16:15:01 +02:00
|
|
|
|
{
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
return value_binop (arg1, arg2,
|
|
|
|
|
op == OP_ATR_MIN ? BINOP_MIN : BINOP_MAX);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_ATR_MODULUS:
|
|
|
|
|
{
|
2009-03-24 03:00:51 +01:00
|
|
|
|
struct type *type_arg = check_typedef (exp->elts[pc + 2].type);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2010-05-18 21:23:37 +02:00
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (!ada_is_modular_type (type_arg))
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("'modulus must be applied to modular type"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_from_longest (TYPE_TARGET_TYPE (type_arg),
|
|
|
|
|
ada_modulus (type_arg));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case OP_ATR_POS:
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2008-09-11 16:19:09 +02:00
|
|
|
|
type = builtin_type (exp->gdbarch)->builtin_int;
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
|
return value_zero (type, not_lval);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2008-09-11 16:19:09 +02:00
|
|
|
|
return value_pos_atr (type, arg1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_ATR_SIZE:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2008-10-07 16:07:10 +02:00
|
|
|
|
type = value_type (arg1);
|
|
|
|
|
|
|
|
|
|
/* If the argument is a reference, then dereference its type, since
|
|
|
|
|
the user is really asking for the size of the actual object,
|
|
|
|
|
not the size of the pointer. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2009-07-02 14:20:18 +02:00
|
|
|
|
return value_zero (builtin_type (exp->gdbarch)->builtin_int, not_lval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2009-07-02 14:20:18 +02:00
|
|
|
|
return value_from_longest (builtin_type (exp->gdbarch)->builtin_int,
|
2008-10-07 16:07:10 +02:00
|
|
|
|
TARGET_CHAR_BIT * TYPE_LENGTH (type));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case OP_ATR_VAL:
|
|
|
|
|
evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type = exp->elts[pc + 2].type;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
goto nosideret;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_zero (type, not_lval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2004-06-27 21:06:23 +02:00
|
|
|
|
return value_val_atr (type, arg1);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case BINOP_EXP:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
return value_zero (value_type (arg1), not_lval);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2008-09-11 16:15:01 +02:00
|
|
|
|
{
|
|
|
|
|
/* For integer exponentiation operations,
|
|
|
|
|
only promote the first argument. */
|
|
|
|
|
if (is_integral_type (value_type (arg2)))
|
|
|
|
|
unop_promote (exp->language_defn, exp->gdbarch, &arg1);
|
|
|
|
|
else
|
|
|
|
|
binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
|
|
|
|
|
|
|
|
|
|
return value_binop (arg1, arg2, op);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case UNOP_PLUS:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
|
|
|
|
else
|
|
|
|
|
return arg1;
|
|
|
|
|
|
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
|
goto nosideret;
|
2008-09-11 16:15:01 +02:00
|
|
|
|
unop_promote (exp->language_defn, exp->gdbarch, &arg1);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (value_less (arg1, value_zero (value_type (arg1), not_lval)))
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return value_neg (arg1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return arg1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case UNOP_IND:
|
2008-09-30 20:46:37 +02:00
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
type = ada_check_typedef (value_type (arg1));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (ada_is_array_descriptor_type (type))
|
|
|
|
|
/* GDB allows dereferencing GNAT array descriptors. */
|
|
|
|
|
{
|
|
|
|
|
struct type *arrType = ada_type_of_array (arg1, 0);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (arrType == NULL)
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Attempt to dereference null array pointer."));
|
2004-11-09 Andrew Cagney <cagney@gnu.org>
* value.h (struct value): Delete field bfd_section.
(VALUE_BFD_SECTION): Delete macro.
(COERCE_REF): Update.
(value_at, value_at_lazy): Delete asection parameter.
* printcmd.c (print_formatted, x_command): Update.
(do_examine): Delete asection parameter.
(next_section): Delete variable.
* valops.c (value_cast, value_at, value_at_lazy)
(value_coerce_function, value_addr, value_ind, value_string)
(find_rt_vbase_offset, value_full_object): Update.
* hpacc-abi.c (hpacc_virtual_fn_field)
(hpacc_value_rtti_type): Update.
* gnu-v3-abi.c (gnuv3_rtti_type, gnuv3_virtual_fn_field)
(gnuv3_baseclass_offset): Update.
* f-valprint.c (f_val_print): Update.
* c-valprint.c (c_val_print): Update.
* p-valprint.c (pascal_val_print): Update.
* jv-valprint.c (java_value_print): Update.
* jv-lang.c (java_class_from_object, evaluate_subexp_java): Update.
* ada-lang.c (ada_value_primitive_packed_val)
(ada_evaluate_subexp): Update.
* dwarf2loc.c (dwarf2_evaluate_loc_desc): Update.
* expprint.c (print_subexp_standard): Update.
* infcall.c (call_function_by_hand): Update.
* valarith.c (value_add): Update.
* eval.c (evaluate_subexp_standard): Update.
* values.c (allocate_value, value_copy, value_static_field): Update.
* findvar.c (read_var_value, locate_var_value): Update.
2004-11-09 15:43:27 +01:00
|
|
|
|
return value_at_lazy (arrType, 0);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_REF
|
|
|
|
|
/* In C you can dereference an array to get the 1st elt. */
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
2004-10-15 11:12:24 +02:00
|
|
|
|
{
|
|
|
|
|
type = to_static_fixed_type
|
|
|
|
|
(ada_aligned_type
|
|
|
|
|
(ada_check_typedef (TYPE_TARGET_TYPE (type))));
|
|
|
|
|
check_size (type);
|
|
|
|
|
return value_zero (type, lval_memory);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_INT)
|
2008-09-30 20:46:37 +02:00
|
|
|
|
{
|
|
|
|
|
/* GDB allows dereferencing an int. */
|
|
|
|
|
if (expect_type == NULL)
|
|
|
|
|
return value_zero (builtin_type (exp->gdbarch)->builtin_int,
|
|
|
|
|
lval_memory);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
expect_type =
|
|
|
|
|
to_static_fixed_type (ada_aligned_type (expect_type));
|
|
|
|
|
return value_zero (expect_type, lval_memory);
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Attempt to take contents of a non-pointer value."));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
2004-06-27 21:06:23 +02:00
|
|
|
|
arg1 = ada_coerce_ref (arg1); /* FIXME: What is this for?? */
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
type = ada_check_typedef (value_type (arg1));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2008-11-15 19:27:27 +01:00
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_INT)
|
|
|
|
|
/* GDB allows dereferencing an int. If we were given
|
|
|
|
|
the expect_type, then use that as the target type.
|
|
|
|
|
Otherwise, assume that the target type is an int. */
|
|
|
|
|
{
|
|
|
|
|
if (expect_type != NULL)
|
|
|
|
|
return ada_value_ind (value_cast (lookup_pointer_type (expect_type),
|
|
|
|
|
arg1));
|
|
|
|
|
else
|
|
|
|
|
return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int,
|
|
|
|
|
(CORE_ADDR) value_as_address (arg1));
|
|
|
|
|
}
|
2008-09-30 20:46:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (ada_is_array_descriptor_type (type))
|
|
|
|
|
/* GDB allows dereferencing GNAT array descriptors. */
|
|
|
|
|
return ada_coerce_to_simple_array (arg1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return ada_value_ind (arg1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
|
tem = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
|
|
|
|
|
arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
struct type *type1 = value_type (arg1);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
if (ada_is_tagged_type (type1, 1))
|
|
|
|
|
{
|
|
|
|
|
type = ada_lookup_struct_elt_type (type1,
|
|
|
|
|
&exp->elts[pc + 2].string,
|
|
|
|
|
1, 1, NULL);
|
|
|
|
|
if (type == NULL)
|
|
|
|
|
/* In this case, we assume that the field COULD exist
|
|
|
|
|
in some extension of the type. Return an object of
|
|
|
|
|
"type" void, which will match any formal
|
|
|
|
|
(see ada_type_match). */
|
2009-06-29 19:31:24 +02:00
|
|
|
|
return value_zero (builtin_type (exp->gdbarch)->builtin_void,
|
|
|
|
|
lval_memory);
|
2004-06-27 21:06:23 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
type =
|
|
|
|
|
ada_lookup_struct_elt_type (type1, &exp->elts[pc + 2].string, 1,
|
|
|
|
|
0, NULL);
|
|
|
|
|
|
|
|
|
|
return value_zero (ada_aligned_type (type), lval_memory);
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2009-06-23 18:43:24 +02:00
|
|
|
|
arg1 = ada_value_struct_elt (arg1, &exp->elts[pc + 2].string, 0);
|
|
|
|
|
arg1 = unwrap_value (arg1);
|
|
|
|
|
return ada_to_fixed_value (arg1);
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
case OP_TYPE:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The value is not supposed to be used. This is here to make it
|
|
|
|
|
easier to accommodate expressions that contain types. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
(*pos) += 2;
|
|
|
|
|
if (noside == EVAL_SKIP)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
goto nosideret;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
2007-01-04 07:31:52 +01:00
|
|
|
|
return allocate_value (exp->elts[pc + 1].type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2004-12-12 18:06:26 +01:00
|
|
|
|
error (_("Attempt to use a type name as an expression"));
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
case OP_OTHERS:
|
|
|
|
|
case OP_DISCRETE_RANGE:
|
|
|
|
|
case OP_POSITIONAL:
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
if (noside == EVAL_NORMAL)
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
error (_("Undefined name, ambiguous name, or renaming used in "
|
2006-01-08 08:19:40 +01:00
|
|
|
|
"component association: %s."), &exp->elts[pc+2].string);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
error (_("Aggregates only allowed on the right of an assignment"));
|
|
|
|
|
default:
|
2006-01-08 08:19:40 +01:00
|
|
|
|
internal_error (__FILE__, __LINE__, _("aggregate apparently mangled"));
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ada_forward_operator_length (exp, pc, &oplen, &nargs);
|
|
|
|
|
*pos += oplen - 1;
|
|
|
|
|
for (tem = 0; tem < nargs; tem += 1)
|
|
|
|
|
ada_evaluate_subexp (NULL, exp, pos, noside);
|
|
|
|
|
goto nosideret;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nosideret:
|
2009-07-02 14:20:18 +02:00
|
|
|
|
return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Fixed point */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* If TYPE encodes an Ada fixed-point type, return the suffix of the
|
|
|
|
|
type name that encodes the 'small and 'delta information.
|
2004-06-02 11:55:36 +02:00
|
|
|
|
Otherwise, return NULL. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static const char *
|
2002-07-25 03:14:26 +02:00
|
|
|
|
fixed_type_info (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
const char *name = ada_type_name (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
enum type_code code = (type == NULL) ? TYPE_CODE_UNDEF : TYPE_CODE (type);
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if ((code == TYPE_CODE_INT || code == TYPE_CODE_RANGE) && name != NULL)
|
|
|
|
|
{
|
2002-06-04 17:28:49 +02:00
|
|
|
|
const char *tail = strstr (name, "___XF_");
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (tail == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return NULL;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return tail + 5;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
else if (code == TYPE_CODE_RANGE && TYPE_TARGET_TYPE (type) != type)
|
|
|
|
|
return fixed_type_info (TYPE_TARGET_TYPE (type));
|
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Returns non-zero iff TYPE represents an Ada fixed-point type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_is_fixed_point_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return fixed_type_info (type) != NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Return non-zero iff TYPE represents a System.Address type. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ada_is_system_address_type (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
return (TYPE_NAME (type)
|
|
|
|
|
&& strcmp (TYPE_NAME (type), "system__address") == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Assuming that TYPE is the representation of an Ada fixed-point
|
|
|
|
|
type, return its delta, or -1 if the type is malformed and the
|
2004-06-02 11:55:36 +02:00
|
|
|
|
delta cannot be determined. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
DOUBLEST
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_delta (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
const char *encoding = fixed_type_info (type);
|
2009-03-13 02:28:05 +01:00
|
|
|
|
DOUBLEST num, den;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2009-03-13 02:28:05 +01:00
|
|
|
|
/* Strictly speaking, num and den are encoded as integer. However,
|
|
|
|
|
they may not fit into a long, and they will have to be converted
|
|
|
|
|
to DOUBLEST anyway. So scan them as DOUBLEST. */
|
|
|
|
|
if (sscanf (encoding, "_%" DOUBLEST_SCAN_FORMAT "_%" DOUBLEST_SCAN_FORMAT,
|
|
|
|
|
&num, &den) < 2)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return -1.0;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2009-03-13 02:28:05 +01:00
|
|
|
|
return num / den;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that ada_is_fixed_point_type (TYPE), return the scaling
|
2004-06-02 11:55:36 +02:00
|
|
|
|
factor ('SMALL value) associated with the type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static DOUBLEST
|
2002-07-25 03:14:26 +02:00
|
|
|
|
scaling_factor (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
const char *encoding = fixed_type_info (type);
|
2009-03-13 02:28:05 +01:00
|
|
|
|
DOUBLEST num0, den0, num1, den1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int n;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2009-03-13 02:28:05 +01:00
|
|
|
|
/* Strictly speaking, num's and den's are encoded as integer. However,
|
|
|
|
|
they may not fit into a long, and they will have to be converted
|
|
|
|
|
to DOUBLEST anyway. So scan them as DOUBLEST. */
|
|
|
|
|
n = sscanf (encoding,
|
|
|
|
|
"_%" DOUBLEST_SCAN_FORMAT "_%" DOUBLEST_SCAN_FORMAT
|
|
|
|
|
"_%" DOUBLEST_SCAN_FORMAT "_%" DOUBLEST_SCAN_FORMAT,
|
|
|
|
|
&num0, &den0, &num1, &den1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (n < 2)
|
|
|
|
|
return 1.0;
|
|
|
|
|
else if (n == 4)
|
2009-03-13 02:28:05 +01:00
|
|
|
|
return num1 / den1;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2009-03-13 02:28:05 +01:00
|
|
|
|
return num0 / den0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Assuming that X is the representation of a value of fixed-point
|
2004-06-02 11:55:36 +02:00
|
|
|
|
type TYPE, return its floating-point equivalent. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
DOUBLEST
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_fixed_to_float (struct type *type, LONGEST x)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
return (DOUBLEST) x *scaling_factor (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* The representation of a fixed-point value of type TYPE
|
|
|
|
|
corresponding to the value X. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
LONGEST
|
2002-07-25 03:14:26 +02:00
|
|
|
|
ada_float_to_fixed (struct type *type, DOUBLEST x)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return (LONGEST) (x / scaling_factor (type) + 0.5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Range types */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Scan STR beginning at position K for a discriminant name, and
|
|
|
|
|
return the value of that discriminant field of DVAL in *PX. If
|
|
|
|
|
PNEW_K is not null, put the position of the character beyond the
|
|
|
|
|
name scanned in *PNEW_K. Return 1 if successful; return 0 and do
|
2004-06-02 11:55:36 +02:00
|
|
|
|
not alter *PX and *PNEW_K if unsuccessful. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
static int
|
2003-06-17 23:20:41 +02:00
|
|
|
|
scan_discrim_bound (char *str, int k, struct value *dval, LONGEST * px,
|
2004-06-27 21:06:23 +02:00
|
|
|
|
int *pnew_k)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
static char *bound_buffer = NULL;
|
|
|
|
|
static size_t bound_buffer_len = 0;
|
|
|
|
|
char *bound;
|
|
|
|
|
char *pend;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
struct value *bound_val;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (dval == NULL || str == NULL || str[k] == '\0')
|
|
|
|
|
return 0;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
pend = strstr (str + k, "__");
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (pend == NULL)
|
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
bound = str + k;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
k += strlen (bound);
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2002-08-18 20:11:12 +02:00
|
|
|
|
GROW_VECT (bound_buffer, bound_buffer_len, pend - (str + k) + 1);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
bound = bound_buffer;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
strncpy (bound_buffer, str + k, pend - (str + k));
|
|
|
|
|
bound[pend - (str + k)] = '\0';
|
|
|
|
|
k = pend - str;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
bound_val = ada_search_struct_field (bound, dval, 0, value_type (dval));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (bound_val == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*px = value_as_long (bound_val);
|
|
|
|
|
if (pnew_k != NULL)
|
|
|
|
|
*pnew_k = k;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Value of variable named NAME in the current environment. If
|
|
|
|
|
no such variable found, then if ERR_MSG is null, returns 0, and
|
2004-06-02 11:55:36 +02:00
|
|
|
|
otherwise causes an error with message ERR_MSG. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct value *
|
|
|
|
|
get_var_value (char *name, char *err_msg)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct ada_symbol_info *syms;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int nsyms;
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
nsyms = ada_lookup_symbol_list (name, get_selected_block (0), VAR_DOMAIN,
|
|
|
|
|
&syms);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
if (nsyms != 1)
|
|
|
|
|
{
|
|
|
|
|
if (err_msg == NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (("%s"), err_msg);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return value_of_variable (syms[0].sym, syms[0].block);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
/* Value of integer variable named NAME in the current environment. If
|
2004-06-02 11:55:36 +02:00
|
|
|
|
no such variable found, returns 0, and sets *FLAG to 0. If
|
|
|
|
|
successful, sets *FLAG to 1. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
LONGEST
|
2004-06-02 11:55:36 +02:00
|
|
|
|
get_int_var_value (char *name, int *flag)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct value *var_val = get_var_value (name, 0);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
if (var_val == 0)
|
|
|
|
|
{
|
|
|
|
|
if (flag != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*flag = 0;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (flag != NULL)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
*flag = 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return value_as_long (var_val);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Return a range type whose base type is that of the range type named
|
|
|
|
|
NAME in the current environment, and whose bounds are calculated
|
2004-06-02 11:55:36 +02:00
|
|
|
|
from NAME according to the GNAT range encoding conventions.
|
2009-06-29 19:28:59 +02:00
|
|
|
|
Extract discriminant values, if needed, from DVAL. ORIG_TYPE is the
|
|
|
|
|
corresponding range type from debug information; fall back to using it
|
|
|
|
|
if symbol lookup fails. If a new type must be created, allocate it
|
|
|
|
|
like ORIG_TYPE was. The bounds information, in general, is encoded
|
|
|
|
|
in NAME, the base type given in the named range type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static struct type *
|
2010-05-17 18:55:31 +02:00
|
|
|
|
to_fixed_range_type (struct type *raw_type, struct value *dval)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2010-05-17 18:55:31 +02:00
|
|
|
|
char *name;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
struct type *base_type;
|
2002-08-18 20:11:12 +02:00
|
|
|
|
char *subtype_info;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-05-17 18:55:31 +02:00
|
|
|
|
gdb_assert (raw_type != NULL);
|
|
|
|
|
gdb_assert (TYPE_NAME (raw_type) != NULL);
|
2009-05-18 16:00:08 +02:00
|
|
|
|
|
2009-06-29 19:28:59 +02:00
|
|
|
|
if (TYPE_CODE (raw_type) == TYPE_CODE_RANGE)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
base_type = TYPE_TARGET_TYPE (raw_type);
|
|
|
|
|
else
|
|
|
|
|
base_type = raw_type;
|
|
|
|
|
|
2010-05-17 18:55:31 +02:00
|
|
|
|
name = TYPE_NAME (raw_type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
subtype_info = strstr (name, "___XD");
|
|
|
|
|
if (subtype_info == NULL)
|
2008-08-19 12:10:39 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
LONGEST L = ada_discrete_type_low_bound (raw_type);
|
|
|
|
|
LONGEST U = ada_discrete_type_high_bound (raw_type);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2008-08-19 12:10:39 +02:00
|
|
|
|
if (L < INT_MIN || U > INT_MAX)
|
|
|
|
|
return raw_type;
|
|
|
|
|
else
|
2010-05-17 18:55:31 +02:00
|
|
|
|
return create_range_type (alloc_type_copy (raw_type), raw_type,
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
ada_discrete_type_low_bound (raw_type),
|
|
|
|
|
ada_discrete_type_high_bound (raw_type));
|
2008-08-19 12:10:39 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
static char *name_buf = NULL;
|
|
|
|
|
static size_t name_len = 0;
|
|
|
|
|
int prefix_len = subtype_info - name;
|
|
|
|
|
LONGEST L, U;
|
|
|
|
|
struct type *type;
|
|
|
|
|
char *bounds_str;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
GROW_VECT (name_buf, name_len, prefix_len + 5);
|
|
|
|
|
strncpy (name_buf, name, prefix_len);
|
|
|
|
|
name_buf[prefix_len] = '\0';
|
|
|
|
|
|
|
|
|
|
subtype_info += 5;
|
|
|
|
|
bounds_str = strchr (subtype_info, '_');
|
|
|
|
|
n = 1;
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (*subtype_info == 'L')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (!ada_scan_number (bounds_str, n, &L, &n)
|
|
|
|
|
&& !scan_discrim_bound (bounds_str, n, dval, &L, &n))
|
|
|
|
|
return raw_type;
|
|
|
|
|
if (bounds_str[n] == '_')
|
|
|
|
|
n += 2;
|
|
|
|
|
else if (bounds_str[n] == '.') /* FIXME? SGI Workshop kludge. */
|
|
|
|
|
n += 1;
|
|
|
|
|
subtype_info += 1;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int ok;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
strcpy (name_buf + prefix_len, "___L");
|
|
|
|
|
L = get_int_var_value (name_buf, &ok);
|
|
|
|
|
if (!ok)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("Unknown lower bound, using 1."));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
L = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
if (*subtype_info == 'U')
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (!ada_scan_number (bounds_str, n, &U, &n)
|
|
|
|
|
&& !scan_discrim_bound (bounds_str, n, dval, &U, &n))
|
|
|
|
|
return raw_type;
|
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
else
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
int ok;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
strcpy (name_buf + prefix_len, "___U");
|
|
|
|
|
U = get_int_var_value (name_buf, &ok);
|
|
|
|
|
if (!ok)
|
|
|
|
|
{
|
2004-12-12 18:06:26 +01:00
|
|
|
|
lim_warning (_("Unknown upper bound, using %ld."), (long) L);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
U = L;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2010-05-17 18:55:31 +02:00
|
|
|
|
type = create_range_type (alloc_type_copy (raw_type), base_type, L, U);
|
2002-08-18 20:11:12 +02:00
|
|
|
|
TYPE_NAME (type) = name;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* True iff NAME is the name of a range type. */
|
|
|
|
|
|
2002-06-04 17:28:49 +02:00
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_is_range_type_name (const char *name)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
|
|
|
|
return (name != NULL && strstr (name, "___XD"));
|
2002-08-18 20:11:12 +02:00
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Modular types */
|
|
|
|
|
|
|
|
|
|
/* True iff TYPE is an Ada modular type. */
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
int
|
2002-08-18 20:11:12 +02:00
|
|
|
|
ada_is_modular_type (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-06-02 11:55:36 +02:00
|
|
|
|
struct type *subranged_type = base_type (type);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
return (subranged_type != NULL && TYPE_CODE (type) == TYPE_CODE_RANGE
|
2008-08-19 12:10:39 +02:00
|
|
|
|
&& TYPE_CODE (subranged_type) == TYPE_CODE_INT
|
2004-06-02 11:55:36 +02:00
|
|
|
|
&& TYPE_UNSIGNED (subranged_type));
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-03-13 00:41:16 +01:00
|
|
|
|
/* Try to determine the lower and upper bounds of the given modular type
|
|
|
|
|
using the type name only. Return non-zero and set L and U as the lower
|
|
|
|
|
and upper bounds (respectively) if successful. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ada_modulus_from_name (struct type *type, ULONGEST *modulus)
|
|
|
|
|
{
|
|
|
|
|
char *name = ada_type_name (type);
|
|
|
|
|
char *suffix;
|
|
|
|
|
int k;
|
|
|
|
|
LONGEST U;
|
|
|
|
|
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Discrete type bounds are encoded using an __XD suffix. In our case,
|
|
|
|
|
we are looking for static bounds, which means an __XDLU suffix.
|
|
|
|
|
Moreover, we know that the lower bound of modular types is always
|
|
|
|
|
zero, so the actual suffix should start with "__XDLU_0__", and
|
|
|
|
|
then be followed by the upper bound value. */
|
|
|
|
|
suffix = strstr (name, "__XDLU_0__");
|
|
|
|
|
if (suffix == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
k = 10;
|
|
|
|
|
if (!ada_scan_number (suffix, k, &U, NULL))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*modulus = (ULONGEST) U + 1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Assuming ada_is_modular_type (TYPE), the modulus of TYPE. */
|
|
|
|
|
|
2004-10-08 11:40:12 +02:00
|
|
|
|
ULONGEST
|
2009-03-13 00:41:16 +01:00
|
|
|
|
ada_modulus (struct type *type)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
return (ULONGEST) TYPE_HIGH_BOUND (type) + 1;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|
2002-08-18 20:11:12 +02:00
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
|
|
|
|
/* Ada exception catchpoint support:
|
|
|
|
|
---------------------------------
|
|
|
|
|
|
|
|
|
|
We support 3 kinds of exception catchpoints:
|
|
|
|
|
. catchpoints on Ada exceptions
|
|
|
|
|
. catchpoints on unhandled Ada exceptions
|
|
|
|
|
. catchpoints on failed assertions
|
|
|
|
|
|
|
|
|
|
Exceptions raised during failed assertions, or unhandled exceptions
|
|
|
|
|
could perfectly be caught with the general catchpoint on Ada exceptions.
|
|
|
|
|
However, we can easily differentiate these two special cases, and having
|
|
|
|
|
the option to distinguish these two cases from the rest can be useful
|
|
|
|
|
to zero-in on certain situations.
|
|
|
|
|
|
|
|
|
|
Exception catchpoints are a specialized form of breakpoint,
|
|
|
|
|
since they rely on inserting breakpoints inside known routines
|
|
|
|
|
of the GNAT runtime. The implementation therefore uses a standard
|
|
|
|
|
breakpoint structure of the BP_BREAKPOINT type, but with its own set
|
|
|
|
|
of breakpoint_ops.
|
|
|
|
|
|
2007-03-29 23:57:02 +02:00
|
|
|
|
Support in the runtime for exception catchpoints have been changed
|
|
|
|
|
a few times already, and these changes affect the implementation
|
|
|
|
|
of these catchpoints. In order to be able to support several
|
|
|
|
|
variants of the runtime, we use a sniffer that will determine
|
|
|
|
|
the runtime variant used by the program being debugged.
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
At this time, we do not support the use of conditions on Ada exception
|
|
|
|
|
catchpoints. The COND and COND_STRING fields are therefore set
|
|
|
|
|
to NULL (most of the time, see below).
|
|
|
|
|
|
|
|
|
|
Conditions where EXP_STRING, COND, and COND_STRING are used:
|
|
|
|
|
|
|
|
|
|
When a user specifies the name of a specific exception in the case
|
|
|
|
|
of catchpoints on Ada exceptions, we store the name of that exception
|
|
|
|
|
in the EXP_STRING. We then translate this request into an actual
|
|
|
|
|
condition stored in COND_STRING, and then parse it into an expression
|
|
|
|
|
stored in COND. */
|
|
|
|
|
|
|
|
|
|
/* The different types of catchpoints that we introduced for catching
|
|
|
|
|
Ada exceptions. */
|
|
|
|
|
|
|
|
|
|
enum exception_catchpoint_kind
|
|
|
|
|
{
|
|
|
|
|
ex_catch_exception,
|
|
|
|
|
ex_catch_exception_unhandled,
|
|
|
|
|
ex_catch_assert
|
|
|
|
|
};
|
|
|
|
|
|
2008-09-30 22:42:21 +02:00
|
|
|
|
/* Ada's standard exceptions. */
|
|
|
|
|
|
|
|
|
|
static char *standard_exc[] = {
|
|
|
|
|
"constraint_error",
|
|
|
|
|
"program_error",
|
|
|
|
|
"storage_error",
|
|
|
|
|
"tasking_error"
|
|
|
|
|
};
|
|
|
|
|
|
2007-03-29 23:57:02 +02:00
|
|
|
|
typedef CORE_ADDR (ada_unhandled_exception_name_addr_ftype) (void);
|
|
|
|
|
|
|
|
|
|
/* A structure that describes how to support exception catchpoints
|
|
|
|
|
for a given executable. */
|
|
|
|
|
|
|
|
|
|
struct exception_support_info
|
|
|
|
|
{
|
|
|
|
|
/* The name of the symbol to break on in order to insert
|
|
|
|
|
a catchpoint on exceptions. */
|
|
|
|
|
const char *catch_exception_sym;
|
|
|
|
|
|
|
|
|
|
/* The name of the symbol to break on in order to insert
|
|
|
|
|
a catchpoint on unhandled exceptions. */
|
|
|
|
|
const char *catch_exception_unhandled_sym;
|
|
|
|
|
|
|
|
|
|
/* The name of the symbol to break on in order to insert
|
|
|
|
|
a catchpoint on failed assertions. */
|
|
|
|
|
const char *catch_assert_sym;
|
|
|
|
|
|
|
|
|
|
/* Assuming that the inferior just triggered an unhandled exception
|
|
|
|
|
catchpoint, this function is responsible for returning the address
|
|
|
|
|
in inferior memory where the name of that exception is stored.
|
|
|
|
|
Return zero if the address could not be computed. */
|
|
|
|
|
ada_unhandled_exception_name_addr_ftype *unhandled_exception_name_addr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR ada_unhandled_exception_name_addr (void);
|
|
|
|
|
static CORE_ADDR ada_unhandled_exception_name_addr_from_raise (void);
|
|
|
|
|
|
|
|
|
|
/* The following exception support info structure describes how to
|
|
|
|
|
implement exception catchpoints with the latest version of the
|
|
|
|
|
Ada runtime (as of 2007-03-06). */
|
|
|
|
|
|
|
|
|
|
static const struct exception_support_info default_exception_support_info =
|
|
|
|
|
{
|
|
|
|
|
"__gnat_debug_raise_exception", /* catch_exception_sym */
|
|
|
|
|
"__gnat_unhandled_exception", /* catch_exception_unhandled_sym */
|
|
|
|
|
"__gnat_debug_raise_assert_failure", /* catch_assert_sym */
|
|
|
|
|
ada_unhandled_exception_name_addr
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The following exception support info structure describes how to
|
|
|
|
|
implement exception catchpoints with a slightly older version
|
|
|
|
|
of the Ada runtime. */
|
|
|
|
|
|
|
|
|
|
static const struct exception_support_info exception_support_info_fallback =
|
|
|
|
|
{
|
|
|
|
|
"__gnat_raise_nodefer_with_msg", /* catch_exception_sym */
|
|
|
|
|
"__gnat_unhandled_exception", /* catch_exception_unhandled_sym */
|
|
|
|
|
"system__assertions__raise_assert_failure", /* catch_assert_sym */
|
|
|
|
|
ada_unhandled_exception_name_addr_from_raise
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* For each executable, we sniff which exception info structure to use
|
|
|
|
|
and cache it in the following global variable. */
|
|
|
|
|
|
|
|
|
|
static const struct exception_support_info *exception_info = NULL;
|
|
|
|
|
|
|
|
|
|
/* Inspect the Ada runtime and determine which exception info structure
|
|
|
|
|
should be used to provide support for exception catchpoints.
|
|
|
|
|
|
|
|
|
|
This function will always set exception_info, or raise an error. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ada_exception_support_info_sniffer (void)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
/* If the exception info is already known, then no need to recompute it. */
|
|
|
|
|
if (exception_info != NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Check the latest (default) exception support info. */
|
|
|
|
|
sym = standard_lookup (default_exception_support_info.catch_exception_sym,
|
|
|
|
|
NULL, VAR_DOMAIN);
|
|
|
|
|
if (sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
exception_info = &default_exception_support_info;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try our fallback exception suport info. */
|
|
|
|
|
sym = standard_lookup (exception_support_info_fallback.catch_exception_sym,
|
|
|
|
|
NULL, VAR_DOMAIN);
|
|
|
|
|
if (sym != NULL)
|
|
|
|
|
{
|
|
|
|
|
exception_info = &exception_support_info_fallback;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sometimes, it is normal for us to not be able to find the routine
|
|
|
|
|
we are looking for. This happens when the program is linked with
|
|
|
|
|
the shared version of the GNAT runtime, and the program has not been
|
|
|
|
|
started yet. Inform the user of these two possible causes if
|
|
|
|
|
applicable. */
|
|
|
|
|
|
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
2010-03-10 19:20:08 +01:00
|
|
|
|
if (ada_update_initial_language (language_unknown) != language_ada)
|
2007-03-29 23:57:02 +02:00
|
|
|
|
error (_("Unable to insert catchpoint. Is this an Ada main program?"));
|
|
|
|
|
|
|
|
|
|
/* If the symbol does not exist, then check that the program is
|
|
|
|
|
already started, to make sure that shared libraries have been
|
|
|
|
|
loaded. If it is not started, this may mean that the symbol is
|
|
|
|
|
in a shared library. */
|
|
|
|
|
|
|
|
|
|
if (ptid_get_pid (inferior_ptid) == 0)
|
|
|
|
|
error (_("Unable to insert catchpoint. Try to start the program first."));
|
|
|
|
|
|
|
|
|
|
/* At this point, we know that we are debugging an Ada program and
|
|
|
|
|
that the inferior has been started, but we still are not able to
|
|
|
|
|
find the run-time symbols. That can mean that we are in
|
|
|
|
|
configurable run time mode, or that a-except as been optimized
|
|
|
|
|
out by the linker... In any case, at this point it is not worth
|
|
|
|
|
supporting this feature. */
|
|
|
|
|
|
|
|
|
|
error (_("Cannot insert catchpoints in this configuration."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An observer of "executable_changed" events.
|
|
|
|
|
Its role is to clear certain cached values that need to be recomputed
|
|
|
|
|
each time a new executable is loaded by GDB. */
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-21 18:47:11 +02:00
|
|
|
|
ada_executable_changed_observer (void)
|
2007-03-29 23:57:02 +02:00
|
|
|
|
{
|
|
|
|
|
/* If the executable changed, then it is possible that the Ada runtime
|
|
|
|
|
is different. So we need to invalidate the exception support info
|
|
|
|
|
cache. */
|
|
|
|
|
exception_info = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
/* True iff FRAME is very likely to be that of a function that is
|
|
|
|
|
part of the runtime system. This is all very heuristic, but is
|
|
|
|
|
intended to be used as advice as to what frames are uninteresting
|
|
|
|
|
to most users. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_known_support_routine (struct frame_info *frame)
|
|
|
|
|
{
|
2007-01-08 05:37:52 +01:00
|
|
|
|
struct symtab_and_line sal;
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
char *func_name;
|
2010-01-20 04:34:25 +01:00
|
|
|
|
enum language func_lang;
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
int i;
|
|
|
|
|
|
2007-01-08 05:37:52 +01:00
|
|
|
|
/* If this code does not have any debugging information (no symtab),
|
|
|
|
|
This cannot be any user code. */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
2007-01-08 05:37:52 +01:00
|
|
|
|
find_frame_sal (frame, &sal);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
if (sal.symtab == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
2007-01-08 05:37:52 +01:00
|
|
|
|
/* If there is a symtab, but the associated source file cannot be
|
|
|
|
|
located, then assume this is not user code: Selecting a frame
|
|
|
|
|
for which we cannot display the code would not be very helpful
|
|
|
|
|
for the user. This should also take care of case such as VxWorks
|
|
|
|
|
where the kernel has some debugging info provided for a few units. */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
2007-01-08 04:14:19 +01:00
|
|
|
|
if (symtab_to_fullname (sal.symtab) == NULL)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
return 1;
|
|
|
|
|
|
2007-01-08 05:37:52 +01:00
|
|
|
|
/* Check the unit filename againt the Ada runtime file naming.
|
|
|
|
|
We also check the name of the objfile against the name of some
|
|
|
|
|
known system libraries that sometimes come with debugging info
|
|
|
|
|
too. */
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
for (i = 0; known_runtime_file_name_patterns[i] != NULL; i += 1)
|
|
|
|
|
{
|
|
|
|
|
re_comp (known_runtime_file_name_patterns[i]);
|
|
|
|
|
if (re_exec (sal.symtab->filename))
|
|
|
|
|
return 1;
|
2007-01-08 05:37:52 +01:00
|
|
|
|
if (sal.symtab->objfile != NULL
|
|
|
|
|
&& re_exec (sal.symtab->objfile->name))
|
|
|
|
|
return 1;
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-08 05:37:52 +01:00
|
|
|
|
/* Check whether the function is a GNAT-generated entity. */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
2010-09-30 12:29:00 +02:00
|
|
|
|
find_frame_funname (frame, &func_name, &func_lang, NULL);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
if (func_name == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
for (i = 0; known_auxiliary_function_name_patterns[i] != NULL; i += 1)
|
|
|
|
|
{
|
|
|
|
|
re_comp (known_auxiliary_function_name_patterns[i]);
|
|
|
|
|
if (re_exec (func_name))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find the first frame that contains debugging information and that is not
|
|
|
|
|
part of the Ada run-time, starting from FI and moving upward. */
|
|
|
|
|
|
2008-10-22 21:45:05 +02:00
|
|
|
|
void
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
ada_find_printable_frame (struct frame_info *fi)
|
|
|
|
|
{
|
|
|
|
|
for (; fi != NULL; fi = get_prev_frame (fi))
|
|
|
|
|
{
|
|
|
|
|
if (!is_known_support_routine (fi))
|
|
|
|
|
{
|
|
|
|
|
select_frame (fi);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming that the inferior just triggered an unhandled exception
|
|
|
|
|
catchpoint, return the address in inferior memory where the name
|
|
|
|
|
of the exception is stored.
|
|
|
|
|
|
|
|
|
|
Return zero if the address could not be computed. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
ada_unhandled_exception_name_addr (void)
|
2007-03-29 23:57:02 +02:00
|
|
|
|
{
|
|
|
|
|
return parse_and_eval_address ("e.full_name");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Same as ada_unhandled_exception_name_addr, except that this function
|
|
|
|
|
should be used when the inferior uses an older version of the runtime,
|
|
|
|
|
where the exception name needs to be extracted from a specific frame
|
|
|
|
|
several frames up in the callstack. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
ada_unhandled_exception_name_addr_from_raise (void)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
|
|
|
|
int frame_level;
|
|
|
|
|
struct frame_info *fi;
|
|
|
|
|
|
|
|
|
|
/* To determine the name of this exception, we need to select
|
|
|
|
|
the frame corresponding to RAISE_SYM_NAME. This frame is
|
|
|
|
|
at least 3 levels up, so we simply skip the first 3 frames
|
|
|
|
|
without checking the name of their associated function. */
|
|
|
|
|
fi = get_current_frame ();
|
|
|
|
|
for (frame_level = 0; frame_level < 3; frame_level += 1)
|
|
|
|
|
if (fi != NULL)
|
|
|
|
|
fi = get_prev_frame (fi);
|
|
|
|
|
|
|
|
|
|
while (fi != NULL)
|
|
|
|
|
{
|
2010-01-20 04:34:25 +01:00
|
|
|
|
char *func_name;
|
|
|
|
|
enum language func_lang;
|
|
|
|
|
|
2010-09-30 12:29:00 +02:00
|
|
|
|
find_frame_funname (fi, &func_name, &func_lang, NULL);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
if (func_name != NULL
|
2007-03-29 23:57:02 +02:00
|
|
|
|
&& strcmp (func_name, exception_info->catch_exception_sym) == 0)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
break; /* We found the frame we were looking for... */
|
|
|
|
|
fi = get_prev_frame (fi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fi == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
select_frame (fi);
|
|
|
|
|
return parse_and_eval_address ("id.full_name");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assuming the inferior just triggered an Ada exception catchpoint
|
|
|
|
|
(of any type), return the address in inferior memory where the name
|
|
|
|
|
of the exception is stored, if applicable.
|
|
|
|
|
|
|
|
|
|
Return zero if the address could not be computed, or if not relevant. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
ada_exception_name_addr_1 (enum exception_catchpoint_kind ex,
|
|
|
|
|
struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
return (parse_and_eval_address ("e.full_name"));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_exception_unhandled:
|
2007-03-29 23:57:02 +02:00
|
|
|
|
return exception_info->unhandled_exception_name_addr ();
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
return 0; /* Exception name is not relevant in this case. */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0; /* Should never be reached. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Same as ada_exception_name_addr_1, except that it intercepts and contains
|
|
|
|
|
any error that ada_exception_name_addr_1 might cause to be thrown.
|
|
|
|
|
When an error is intercepted, a warning with the error message is printed,
|
|
|
|
|
and zero is returned. */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
ada_exception_name_addr (enum exception_catchpoint_kind ex,
|
|
|
|
|
struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
struct gdb_exception e;
|
|
|
|
|
CORE_ADDR result = 0;
|
|
|
|
|
|
|
|
|
|
TRY_CATCH (e, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
result = ada_exception_name_addr_1 (ex, b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (e.reason < 0)
|
|
|
|
|
{
|
|
|
|
|
warning (_("failed to get exception name: %s"), e.message);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implement the PRINT_IT method in the breakpoint_ops structure
|
|
|
|
|
for all exception catchpoint kinds. */
|
|
|
|
|
|
|
|
|
|
static enum print_stop_action
|
|
|
|
|
print_it_exception (enum exception_catchpoint_kind ex, struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
const CORE_ADDR addr = ada_exception_name_addr (ex, b);
|
|
|
|
|
char exception_name[256];
|
|
|
|
|
|
|
|
|
|
if (addr != 0)
|
|
|
|
|
{
|
|
|
|
|
read_memory (addr, exception_name, sizeof (exception_name) - 1);
|
|
|
|
|
exception_name [sizeof (exception_name) - 1] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ada_find_printable_frame (get_current_frame ());
|
|
|
|
|
|
|
|
|
|
annotate_catchpoint (b->number);
|
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
if (addr != 0)
|
|
|
|
|
printf_filtered (_("\nCatchpoint %d, %s at "),
|
|
|
|
|
b->number, exception_name);
|
|
|
|
|
else
|
|
|
|
|
printf_filtered (_("\nCatchpoint %d, exception at "), b->number);
|
|
|
|
|
break;
|
|
|
|
|
case ex_catch_exception_unhandled:
|
|
|
|
|
if (addr != 0)
|
|
|
|
|
printf_filtered (_("\nCatchpoint %d, unhandled %s at "),
|
|
|
|
|
b->number, exception_name);
|
|
|
|
|
else
|
|
|
|
|
printf_filtered (_("\nCatchpoint %d, unhandled exception at "),
|
|
|
|
|
b->number);
|
|
|
|
|
break;
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
printf_filtered (_("\nCatchpoint %d, failed assertion at "),
|
|
|
|
|
b->number);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return PRINT_SRC_AND_LOC;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implement the PRINT_ONE method in the breakpoint_ops structure
|
|
|
|
|
for all exception catchpoint kinds. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_one_exception (enum exception_catchpoint_kind ex,
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
struct breakpoint *b, struct bp_location **last_loc)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
struct value_print_options opts;
|
|
|
|
|
|
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
|
if (opts.addressprint)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
|
|
|
|
annotate_field (4);
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-02 19:21:10 +02:00
|
|
|
|
ui_out_field_core_addr (uiout, "addr", b->loc->gdbarch, b->loc->address);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
annotate_field (5);
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
*last_loc = b->loc;
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
if (b->exp_string != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *msg = xstrprintf (_("`%s' Ada exception"), b->exp_string);
|
|
|
|
|
|
|
|
|
|
ui_out_field_string (uiout, "what", msg);
|
|
|
|
|
xfree (msg);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ui_out_field_string (uiout, "what", "all Ada exceptions");
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_exception_unhandled:
|
|
|
|
|
ui_out_field_string (uiout, "what", "unhandled Ada exceptions");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
ui_out_field_string (uiout, "what", "failed Ada assertions");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implement the PRINT_MENTION method in the breakpoint_ops structure
|
|
|
|
|
for all exception catchpoint kinds. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_mention_exception (enum exception_catchpoint_kind ex,
|
|
|
|
|
struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
if (b->exp_string != NULL)
|
|
|
|
|
printf_filtered (_("Catchpoint %d: `%s' Ada exception"),
|
|
|
|
|
b->number, b->exp_string);
|
|
|
|
|
else
|
|
|
|
|
printf_filtered (_("Catchpoint %d: all Ada exceptions"), b->number);
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_exception_unhandled:
|
|
|
|
|
printf_filtered (_("Catchpoint %d: unhandled Ada exceptions"),
|
|
|
|
|
b->number);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
printf_filtered (_("Catchpoint %d: failed Ada assertions"), b->number);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-19 02:48:44 +02:00
|
|
|
|
/* Implement the PRINT_RECREATE method in the breakpoint_ops structure
|
|
|
|
|
for all exception catchpoint kinds. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_recreate_exception (enum exception_catchpoint_kind ex,
|
|
|
|
|
struct breakpoint *b, struct ui_file *fp)
|
|
|
|
|
{
|
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
fprintf_filtered (fp, "catch exception");
|
|
|
|
|
if (b->exp_string != NULL)
|
|
|
|
|
fprintf_filtered (fp, " %s", b->exp_string);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_exception_unhandled:
|
2010-04-19 19:06:11 +02:00
|
|
|
|
fprintf_filtered (fp, "catch exception unhandled");
|
2010-04-19 02:48:44 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
fprintf_filtered (fp, "catch assert");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__, _("unexpected catchpoint type"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
/* Virtual table for "catch exception" breakpoints. */
|
|
|
|
|
|
|
|
|
|
static enum print_stop_action
|
|
|
|
|
print_it_catch_exception (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
return print_it_exception (ex_catch_exception, b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_catch_exception (struct breakpoint *b, struct bp_location **last_loc)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_exception (ex_catch_exception, b, last_loc);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_mention_catch_exception (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
print_mention_exception (ex_catch_exception, b);
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-19 02:48:44 +02:00
|
|
|
|
static void
|
|
|
|
|
print_recreate_catch_exception (struct breakpoint *b, struct ui_file *fp)
|
|
|
|
|
{
|
|
|
|
|
print_recreate_exception (ex_catch_exception, b, fp);
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
static struct breakpoint_ops catch_exception_breakpoint_ops =
|
|
|
|
|
{
|
* breakpoint.h (enum bptype): New enum bp_catchpoint.
Delete bp_catch_fork and bp_catch_vfork.
(struct breakpoint_ops): Add new methods "insert", "remove"
and "breakpoint_hit".
* breakpoint.c (create_fork_vfork_event_catchpoint)
(create_fork_event_catchpoint, create_vfork_event_catchpoint): Remove.
(insert_catchpoint): Remove handling of bp_catch_fork and
bp_catch_vfork catchpoints, and handle them as bp_catchpoint
catchpoints instead.
(insert_bp_location, update_breakpoints_after_exec)
(remove_breakpoint, bpstat_check_location, bpstat_what)
(allocate_bp_location): Likewise.
(print_it_typical, print_one_breakpoint_location, mention): Remove
handling of bp_catch_fork and bp_catch_vfork breakpoints.
(ep_is_catchpoint, user_settable_breakpoint)
(breakpoint_address_is_meaningful, adjust_breakpoint_address)
(breakpoint_re_set_one, disable_command, enable_command):
Remove use of bp_catch_fork and bp_catch_vfork. Add handling of
bp_catchpoint breakpoints.
(insert_catch_fork, remove_catch_fork, breakpoint_hit_catch_fork)
(print_it_catch_fork, print_one_catch_fork, print_mention_catch_fork):
New functions.
(catch_fork_breakpoint_ops): New static constant.
(insert_catch_vfork, remove_catch_vfork, breakpoint_hit_catch_vfork)
(print_it_catch_vfork, print_one_catch_vfork)
(print_mention_catch_vfork): New functions.
(catch_vfork_breakpoint_ops): New static constant.
(create_catchpoint, create_fork_vfork_event_catchpoint): New functions.
(catch_fork_command_1): Use create_fork_vfork_event_catchpoint
to create the fork and vfork catchpoints.
(gnu_v3_exception_catchpoint_ops): Set new breakpoint_ops fields.
* ada-lang.c (catch_exception_breakpoint_ops): Set new breakpoint_ops
fields.
(catch_exception_unhandled_breakpoint_ops): Likewise.
(catch_assert_breakpoint_ops): Likewise.
2008-10-16 18:25:04 +02:00
|
|
|
|
NULL, /* insert */
|
|
|
|
|
NULL, /* remove */
|
|
|
|
|
NULL, /* breakpoint_hit */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
print_it_catch_exception,
|
|
|
|
|
print_one_catch_exception,
|
2010-04-19 02:48:44 +02:00
|
|
|
|
print_mention_catch_exception,
|
|
|
|
|
print_recreate_catch_exception
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Virtual table for "catch exception unhandled" breakpoints. */
|
|
|
|
|
|
|
|
|
|
static enum print_stop_action
|
|
|
|
|
print_it_catch_exception_unhandled (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
return print_it_exception (ex_catch_exception_unhandled, b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_catch_exception_unhandled (struct breakpoint *b,
|
|
|
|
|
struct bp_location **last_loc)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_exception (ex_catch_exception_unhandled, b, last_loc);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_mention_catch_exception_unhandled (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
print_mention_exception (ex_catch_exception_unhandled, b);
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-19 02:48:44 +02:00
|
|
|
|
static void
|
|
|
|
|
print_recreate_catch_exception_unhandled (struct breakpoint *b,
|
|
|
|
|
struct ui_file *fp)
|
|
|
|
|
{
|
|
|
|
|
print_recreate_exception (ex_catch_exception_unhandled, b, fp);
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
static struct breakpoint_ops catch_exception_unhandled_breakpoint_ops = {
|
* breakpoint.h (enum bptype): New enum bp_catchpoint.
Delete bp_catch_fork and bp_catch_vfork.
(struct breakpoint_ops): Add new methods "insert", "remove"
and "breakpoint_hit".
* breakpoint.c (create_fork_vfork_event_catchpoint)
(create_fork_event_catchpoint, create_vfork_event_catchpoint): Remove.
(insert_catchpoint): Remove handling of bp_catch_fork and
bp_catch_vfork catchpoints, and handle them as bp_catchpoint
catchpoints instead.
(insert_bp_location, update_breakpoints_after_exec)
(remove_breakpoint, bpstat_check_location, bpstat_what)
(allocate_bp_location): Likewise.
(print_it_typical, print_one_breakpoint_location, mention): Remove
handling of bp_catch_fork and bp_catch_vfork breakpoints.
(ep_is_catchpoint, user_settable_breakpoint)
(breakpoint_address_is_meaningful, adjust_breakpoint_address)
(breakpoint_re_set_one, disable_command, enable_command):
Remove use of bp_catch_fork and bp_catch_vfork. Add handling of
bp_catchpoint breakpoints.
(insert_catch_fork, remove_catch_fork, breakpoint_hit_catch_fork)
(print_it_catch_fork, print_one_catch_fork, print_mention_catch_fork):
New functions.
(catch_fork_breakpoint_ops): New static constant.
(insert_catch_vfork, remove_catch_vfork, breakpoint_hit_catch_vfork)
(print_it_catch_vfork, print_one_catch_vfork)
(print_mention_catch_vfork): New functions.
(catch_vfork_breakpoint_ops): New static constant.
(create_catchpoint, create_fork_vfork_event_catchpoint): New functions.
(catch_fork_command_1): Use create_fork_vfork_event_catchpoint
to create the fork and vfork catchpoints.
(gnu_v3_exception_catchpoint_ops): Set new breakpoint_ops fields.
* ada-lang.c (catch_exception_breakpoint_ops): Set new breakpoint_ops
fields.
(catch_exception_unhandled_breakpoint_ops): Likewise.
(catch_assert_breakpoint_ops): Likewise.
2008-10-16 18:25:04 +02:00
|
|
|
|
NULL, /* insert */
|
|
|
|
|
NULL, /* remove */
|
|
|
|
|
NULL, /* breakpoint_hit */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
print_it_catch_exception_unhandled,
|
|
|
|
|
print_one_catch_exception_unhandled,
|
2010-04-19 02:48:44 +02:00
|
|
|
|
print_mention_catch_exception_unhandled,
|
|
|
|
|
print_recreate_catch_exception_unhandled
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Virtual table for "catch assert" breakpoints. */
|
|
|
|
|
|
|
|
|
|
static enum print_stop_action
|
|
|
|
|
print_it_catch_assert (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
return print_it_exception (ex_catch_assert, b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_catch_assert (struct breakpoint *b, struct bp_location **last_loc)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
* breakpoint.h (struct breakpoint): New member GDBARCH.
* breakpoint.c: Include "arch-utils.h".
(set_raw_breakpoint_without_location): Add GDBARCH parameter.
Use it to set breakpoint architecture.
(set_raw_breakpoint): Add GDBARCH parameter.
(create_internal_breakpoint): Likewise.
(create_catchpoint): Likewise.
(create_fork_vfork_event_catchpoint): Likewise.
(create_breakpoint): Likewise.
(create_breakpoints): Likewise.
(break_command_really): Likewise.
(create_ada_exception_breakpoint): Likewise.
Update local callers to pass architecture:
(create_internal_breakpoint): Update.
(create_overlay_event_breakpoint): Update.
(create_longjmp_master_breakpoint): Update.
(create_thread_event_breakpoint): Update.
(create_solib_event_breakpoint): Update.
(create_catchpoint): Update.
(create_fork_vfork_event_catchpoint): Update.
(set_momentary_breakpoint): Update.
(clone_momentary_breakpoint): Update.
(create_breakpoint): Update.
(create_breakpoints): Update.
(break_command_really): Update.
(break_command_1): Update.
(set_breakpoint): Update.
(watch_command_1): Update.
(catch_fork_command_1): Update.
(catch_exec_commnd_1): Update.
(handle_gnu_v3_exceptions): Update.
(create_ada_exception_breakpoint): Update.
(catch_ada_exception_command): Update.
(catch_assert_command): Update.
(trace_command): Update.
* breakpoint.h (struct bp_location): New member GDBARCH.
* breakpoint.c (get_sal_arch): New function.
(set_raw_breakpoint): Set location architecture.
(add_location_to_breakpoint): Likewise.
(clone_momentary_breakpoint): Likewise.
(watch_command_1): Likewise.
(update_watchpoint): Likewise.
(bp_loc_is_permanent): Use location architecture instead of
current_gdbarch.
(adjust_breakpoint_address): Add GDBARCH parameter; use it
instead of current_gdbarch.
Update callers of adjust_breakpoint_address to pass
breakpoint location architecture:
(set_raw_breakpoint): Update.
(watch_command_1): Update.
* tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead
of current_gdbarch.
(add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol.
(encode_actions): Pass tracepoint architecture to add_local_symbols
(encode_actions): Use tracepoint architecture instead of
current_gdbarch. Pass it to add_local_symbols and collect_symbol.
* breakpoint.h (struct breakpoint_ops): Replace last_addr parameter
of print_one callback with last_loc.
* breakpoint.c (print_one_breakpoint_location): Replace last_addr
parameter with last_loc.
(print_one_breakpoint): Likewise.
(do_captured_breakpoint_query): Update call.
(breakpoint_1): Pass last_loc instead of last_addr to
print_one_breakpoint. Pass last location architecture instead of
current_gdbarch to set_next_address.
Update all implementations of the print_one callback:
* breakpoint.c (print_one_catch_fork): Update.
(print_one_catch_vfork): Update.
(print_one_catch_exec): Update.
(print_one_exception_catchpoint): Update.
* ada-lang.c (print_one_exception): Update.
(print_one_catch_exception): Update.
(print_one_catch_exception_unhandled): Update.
(print_one_catch_assert): Update.
* breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS
parameter. Use it instead of gdbarch_addr_bit (current_gdbarch).
(print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it
to print_one_breakpoint_location.
(breakpoint_address_bits): New function.
(do_captured_breakpoint_query): Compute number of address bits to print
and pass it to print_one_breakpoint.
(breakpoint_1): Likewise. Use it instead of current_gdbarch.
* breakpoint.h (create_thread_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_thread_event_breakpoint): Likewise.
Update callers to create_thread_event_breakpoint:
* aix-thread.c (pd_enable): Update.
* linux-thread-db.c (enable_thread_event): Update.
* breakpoint.h (create_solib_event_breakpoint): Add GDBARCH.
* breakpoint.c (create_solib_event_breakpoint): Likewise.
Update callers to create_solib_event_breakpoint:
* solib-frv.c (enable_break, enable_break2): Update.
* solib-pa64.c (pa64_solib_create_inferior_hook): Update.
* solib-som.c (som_solib_create_inferior_hook): Update.
* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
* solib-svr4.c (enable_break): Update.
* breakpoint.h (insert_single_step_breakpoint): Add GDBARCH.
* breakpoint.c (insert_single_step_breakpoint): Likewise.
Update callers to insert_single_step_breakpoint:
* alpha-tdep.c (alpha_software_single_step): Update.
* arm-linux-tdep.c (arm_linux_software_single_step): Update.
* arm-tdep.c (arm_software_single_step): Update.
* cris-tdep.c (cris_software_single_step): Update.
* rs6000-aix-tdep.c (rs6000_software_single_step): Update.
* rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update.
* sparc-tdep.c (sparc_software_single_step): Update.
* spu-tdep.c (spu_software_single_step): Update.
* mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter.
Pass it to insert_single_step_breakpoint.
(mips_software_single_step): Pass architecture to
deal_with_atomic_sequence and insert_single_step_breakpoint.
* breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
* breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH.
(deprecated_remove_raw_breakpoint): Likewise.
Update callers to deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint:
* breakpoint.c (single_step_gdbarch): New static variable.
(insert_single_step_breakpoint): Pass GDBARCH parameter to
deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch.
(remove_single_step_breakpoints): Pass architecture stored in
single_step_gdbarch to deprecated_remove_raw_breakpoint.
* rs6000-nat.c (exec_one_dummy_insn): Update.
* solib-irix.c (enable_break, disable_break): Update.
* procfs.c (procfs_mourn_inferior): Update.
(remove_dbx_link_breakpoint): Update.
* breakpoint.h (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
* breakpoint.c (set_breakpoint): Add GDBARCH parameter.
(set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise.
Update callers to set_breakpoint, set_momentary_breakpoint and
set_momentary_breakpoint_at_pc:
* breakpoint.c (set_momentary_breakpoint_at_pc): Update.
(until_break_command): Update.
* infcall.c (call_function_by_hand): Update.
* infcmd.c (finish_backward, finish_forward): Update.
* infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH
parameter. Pass it to set_momentary_breakpoint.
(insert_longjmp_resume_breakpoint): Add GDBARCH parameter.
Pass it to set_momentary_breakpoint_at_pc.
(handle_inferior_event): Update.
(insert_step_resume_breakpoint_at_frame): Update.
(insert_step_resume_breakpoint_at_caller): Update..
* mi/mi-cmd-break.c: Include "arch-utils.h".
(mi_cmd_break_insert): Update.
* target.h (struct target_ops): Add GDBARCH parameter to
to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint,
and to_remove_hw_breakpoint members.
(target_insert_breakpoint, target_remove_breakpoint,
target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH
parameter, pass to target routine.
(memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH
parameter.
* target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint,
debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add
GDBARCH parameter, pass to target routine.
(update_current_target): Update function signature.
* breakpoint.c (insert_bp_location, remove_breakpoint,
deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint):
Pass architecture to target_ routines.
Update all implementations of the target breakpoint routines to take
GDBARCH parameter and use it instead of GDBARCH as appropriate:
* corelow.c (ignore): Update.
* exec.c (ignore): Update.
* mem-break.c (memory_insert_breakpoint): Update.
(memory_remove_breakpoint): Update.
* monitor.c (monitor_insert_breakpoint): Update.
(monitor_remove_breakpoint): Update.
* record.c (record_insert_breakpoint): Update.
(record_beneath_to_insert_breakpoint): Update.
(record_remove_breakpoint): Update.
(record_beneath_to_remove_breakpoint): Update.
* remote.c (remote_insert_breakpoint): Update.
(remote_remove_breakpoint): Update.
(remote_insert_hw_breakpoint): Update.
(remote_remove_hw_breakpoint): Update.
* remote-m32r-sdi.c (m32r_insert_breakpoint): Update.
(m32r_remove_breakpoint): Update.
* remote-mips.c (mips_insert_breakpoint): Update.
(mips_remove_breakpoint): Update.
* i386-nat.c (i386_insert_hw_breakpoint): Update.
(i386_remove_hw_breakpoint): Update.
* nto-procfs.c (procfs_insert_breakpoint): Update.
(procfs_remove_breakpoint): Update.
(procfs_insert_hw_breakpoint): Update.
(procfs_remove_hw_breakpoint): Update.
doc/ChangeLog:
* gdbint.texi (Examples of Use of @code{ui_out} functions):
Update example code extrated from breakpoint.c.
2009-07-02 19:12:28 +02:00
|
|
|
|
print_one_exception (ex_catch_assert, b, last_loc);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_mention_catch_assert (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
print_mention_exception (ex_catch_assert, b);
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-19 02:48:44 +02:00
|
|
|
|
static void
|
|
|
|
|
print_recreate_catch_assert (struct breakpoint *b, struct ui_file *fp)
|
|
|
|
|
{
|
|
|
|
|
print_recreate_exception (ex_catch_assert, b, fp);
|
|
|
|
|
}
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
static struct breakpoint_ops catch_assert_breakpoint_ops = {
|
* breakpoint.h (enum bptype): New enum bp_catchpoint.
Delete bp_catch_fork and bp_catch_vfork.
(struct breakpoint_ops): Add new methods "insert", "remove"
and "breakpoint_hit".
* breakpoint.c (create_fork_vfork_event_catchpoint)
(create_fork_event_catchpoint, create_vfork_event_catchpoint): Remove.
(insert_catchpoint): Remove handling of bp_catch_fork and
bp_catch_vfork catchpoints, and handle them as bp_catchpoint
catchpoints instead.
(insert_bp_location, update_breakpoints_after_exec)
(remove_breakpoint, bpstat_check_location, bpstat_what)
(allocate_bp_location): Likewise.
(print_it_typical, print_one_breakpoint_location, mention): Remove
handling of bp_catch_fork and bp_catch_vfork breakpoints.
(ep_is_catchpoint, user_settable_breakpoint)
(breakpoint_address_is_meaningful, adjust_breakpoint_address)
(breakpoint_re_set_one, disable_command, enable_command):
Remove use of bp_catch_fork and bp_catch_vfork. Add handling of
bp_catchpoint breakpoints.
(insert_catch_fork, remove_catch_fork, breakpoint_hit_catch_fork)
(print_it_catch_fork, print_one_catch_fork, print_mention_catch_fork):
New functions.
(catch_fork_breakpoint_ops): New static constant.
(insert_catch_vfork, remove_catch_vfork, breakpoint_hit_catch_vfork)
(print_it_catch_vfork, print_one_catch_vfork)
(print_mention_catch_vfork): New functions.
(catch_vfork_breakpoint_ops): New static constant.
(create_catchpoint, create_fork_vfork_event_catchpoint): New functions.
(catch_fork_command_1): Use create_fork_vfork_event_catchpoint
to create the fork and vfork catchpoints.
(gnu_v3_exception_catchpoint_ops): Set new breakpoint_ops fields.
* ada-lang.c (catch_exception_breakpoint_ops): Set new breakpoint_ops
fields.
(catch_exception_unhandled_breakpoint_ops): Likewise.
(catch_assert_breakpoint_ops): Likewise.
2008-10-16 18:25:04 +02:00
|
|
|
|
NULL, /* insert */
|
|
|
|
|
NULL, /* remove */
|
|
|
|
|
NULL, /* breakpoint_hit */
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
print_it_catch_assert,
|
|
|
|
|
print_one_catch_assert,
|
2010-04-19 02:48:44 +02:00
|
|
|
|
print_mention_catch_assert,
|
|
|
|
|
print_recreate_catch_assert
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Return non-zero if B is an Ada exception catchpoint. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ada_exception_catchpoint_p (struct breakpoint *b)
|
|
|
|
|
{
|
|
|
|
|
return (b->ops == &catch_exception_breakpoint_ops
|
|
|
|
|
|| b->ops == &catch_exception_unhandled_breakpoint_ops
|
|
|
|
|
|| b->ops == &catch_assert_breakpoint_ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a newly allocated copy of the first space-separated token
|
|
|
|
|
in ARGSP, and then adjust ARGSP to point immediately after that
|
|
|
|
|
token.
|
|
|
|
|
|
|
|
|
|
Return NULL if ARGPS does not contain any more tokens. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
ada_get_next_arg (char **argsp)
|
|
|
|
|
{
|
|
|
|
|
char *args = *argsp;
|
|
|
|
|
char *end;
|
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
|
|
/* Skip any leading white space. */
|
|
|
|
|
|
|
|
|
|
while (isspace (*args))
|
|
|
|
|
args++;
|
|
|
|
|
|
|
|
|
|
if (args[0] == '\0')
|
|
|
|
|
return NULL; /* No more arguments. */
|
|
|
|
|
|
|
|
|
|
/* Find the end of the current argument. */
|
|
|
|
|
|
|
|
|
|
end = args;
|
|
|
|
|
while (*end != '\0' && !isspace (*end))
|
|
|
|
|
end++;
|
|
|
|
|
|
|
|
|
|
/* Adjust ARGSP to point to the start of the next argument. */
|
|
|
|
|
|
|
|
|
|
*argsp = end;
|
|
|
|
|
|
|
|
|
|
/* Make a copy of the current argument and return it. */
|
|
|
|
|
|
|
|
|
|
result = xmalloc (end - args + 1);
|
|
|
|
|
strncpy (result, args, end - args);
|
|
|
|
|
result[end - args] = '\0';
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Split the arguments specified in a "catch exception" command.
|
|
|
|
|
Set EX to the appropriate catchpoint type.
|
|
|
|
|
Set EXP_STRING to the name of the specific exception if
|
|
|
|
|
specified by the user. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
catch_ada_exception_command_split (char *args,
|
|
|
|
|
enum exception_catchpoint_kind *ex,
|
|
|
|
|
char **exp_string)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
|
|
|
|
char *exception_name;
|
|
|
|
|
|
|
|
|
|
exception_name = ada_get_next_arg (&args);
|
|
|
|
|
make_cleanup (xfree, exception_name);
|
|
|
|
|
|
|
|
|
|
/* Check that we do not have any more arguments. Anything else
|
|
|
|
|
is unexpected. */
|
|
|
|
|
|
|
|
|
|
while (isspace (*args))
|
|
|
|
|
args++;
|
|
|
|
|
|
|
|
|
|
if (args[0] != '\0')
|
|
|
|
|
error (_("Junk at end of expression"));
|
|
|
|
|
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
|
|
|
|
|
if (exception_name == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Catch all exceptions. */
|
|
|
|
|
*ex = ex_catch_exception;
|
|
|
|
|
*exp_string = NULL;
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (exception_name, "unhandled") == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Catch unhandled exceptions. */
|
|
|
|
|
*ex = ex_catch_exception_unhandled;
|
|
|
|
|
*exp_string = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Catch a specific exception. */
|
|
|
|
|
*ex = ex_catch_exception;
|
|
|
|
|
*exp_string = exception_name;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the name of the symbol on which we should break in order to
|
|
|
|
|
implement a catchpoint of the EX kind. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
ada_exception_sym_name (enum exception_catchpoint_kind ex)
|
|
|
|
|
{
|
2007-03-29 23:57:02 +02:00
|
|
|
|
gdb_assert (exception_info != NULL);
|
|
|
|
|
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
2007-03-29 23:57:02 +02:00
|
|
|
|
return (exception_info->catch_exception_sym);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
break;
|
|
|
|
|
case ex_catch_exception_unhandled:
|
2007-03-29 23:57:02 +02:00
|
|
|
|
return (exception_info->catch_exception_unhandled_sym);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
break;
|
|
|
|
|
case ex_catch_assert:
|
2007-03-29 23:57:02 +02:00
|
|
|
|
return (exception_info->catch_assert_sym);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
_("unexpected catchpoint kind (%d)"), ex);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the breakpoint ops "virtual table" used for catchpoints
|
|
|
|
|
of the EX kind. */
|
|
|
|
|
|
|
|
|
|
static struct breakpoint_ops *
|
2007-01-26 22:31:06 +01:00
|
|
|
|
ada_exception_breakpoint_ops (enum exception_catchpoint_kind ex)
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
{
|
|
|
|
|
switch (ex)
|
|
|
|
|
{
|
|
|
|
|
case ex_catch_exception:
|
|
|
|
|
return (&catch_exception_breakpoint_ops);
|
|
|
|
|
break;
|
|
|
|
|
case ex_catch_exception_unhandled:
|
|
|
|
|
return (&catch_exception_unhandled_breakpoint_ops);
|
|
|
|
|
break;
|
|
|
|
|
case ex_catch_assert:
|
|
|
|
|
return (&catch_assert_breakpoint_ops);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
_("unexpected catchpoint kind (%d)"), ex);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the condition that will be used to match the current exception
|
|
|
|
|
being raised with the exception that the user wants to catch. This
|
|
|
|
|
assumes that this condition is used when the inferior just triggered
|
|
|
|
|
an exception catchpoint.
|
|
|
|
|
|
|
|
|
|
The string returned is a newly allocated string that needs to be
|
|
|
|
|
deallocated later. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
ada_exception_catchpoint_cond_string (const char *exp_string)
|
|
|
|
|
{
|
2008-09-30 22:42:21 +02:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* The standard exceptions are a special case. They are defined in
|
|
|
|
|
runtime units that have been compiled without debugging info; if
|
|
|
|
|
EXP_STRING is the not-fully-qualified name of a standard
|
|
|
|
|
exception (e.g. "constraint_error") then, during the evaluation
|
|
|
|
|
of the condition expression, the symbol lookup on this name would
|
|
|
|
|
*not* return this standard exception. The catchpoint condition
|
|
|
|
|
may then be set only on user-defined exceptions which have the
|
|
|
|
|
same not-fully-qualified name (e.g. my_package.constraint_error).
|
|
|
|
|
|
|
|
|
|
To avoid this unexcepted behavior, these standard exceptions are
|
|
|
|
|
systematically prefixed by "standard". This means that "catch
|
|
|
|
|
exception constraint_error" is rewritten into "catch exception
|
|
|
|
|
standard.constraint_error".
|
|
|
|
|
|
|
|
|
|
If an exception named contraint_error is defined in another package of
|
|
|
|
|
the inferior program, then the only way to specify this exception as a
|
|
|
|
|
breakpoint condition is to use its fully-qualified named:
|
|
|
|
|
e.g. my_package.constraint_error. */
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < sizeof (standard_exc) / sizeof (char *); i++)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (standard_exc [i], exp_string) == 0)
|
|
|
|
|
{
|
|
|
|
|
return xstrprintf ("long_integer (e) = long_integer (&standard.%s)",
|
|
|
|
|
exp_string);
|
|
|
|
|
}
|
|
|
|
|
}
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
return xstrprintf ("long_integer (e) = long_integer (&%s)", exp_string);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the expression corresponding to COND_STRING evaluated at SAL. */
|
|
|
|
|
|
|
|
|
|
static struct expression *
|
|
|
|
|
ada_parse_catchpoint_condition (char *cond_string,
|
|
|
|
|
struct symtab_and_line sal)
|
|
|
|
|
{
|
|
|
|
|
return (parse_exp_1 (&cond_string, block_for_pc (sal.pc), 0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the symtab_and_line that should be used to insert an exception
|
|
|
|
|
catchpoint of the TYPE kind.
|
|
|
|
|
|
|
|
|
|
EX_STRING should contain the name of a specific exception
|
|
|
|
|
that the catchpoint should catch, or NULL otherwise.
|
|
|
|
|
|
|
|
|
|
The idea behind all the remaining parameters is that their names match
|
|
|
|
|
the name of certain fields in the breakpoint structure that are used to
|
|
|
|
|
handle exception catchpoints. This function returns the value to which
|
|
|
|
|
these fields should be set, depending on the type of catchpoint we need
|
|
|
|
|
to create.
|
|
|
|
|
|
|
|
|
|
If COND and COND_STRING are both non-NULL, any value they might
|
|
|
|
|
hold will be free'ed, and then replaced by newly allocated ones.
|
|
|
|
|
These parameters are left untouched otherwise. */
|
|
|
|
|
|
|
|
|
|
static struct symtab_and_line
|
|
|
|
|
ada_exception_sal (enum exception_catchpoint_kind ex, char *exp_string,
|
|
|
|
|
char **addr_string, char **cond_string,
|
|
|
|
|
struct expression **cond, struct breakpoint_ops **ops)
|
|
|
|
|
{
|
|
|
|
|
const char *sym_name;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
|
2007-03-29 23:57:02 +02:00
|
|
|
|
/* First, find out which exception support info to use. */
|
|
|
|
|
ada_exception_support_info_sniffer ();
|
|
|
|
|
|
|
|
|
|
/* Then lookup the function on which we will break in order to catch
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
the Ada exceptions requested by the user. */
|
|
|
|
|
|
|
|
|
|
sym_name = ada_exception_sym_name (ex);
|
|
|
|
|
sym = standard_lookup (sym_name, NULL, VAR_DOMAIN);
|
|
|
|
|
|
|
|
|
|
/* The symbol we're looking up is provided by a unit in the GNAT runtime
|
|
|
|
|
that should be compiled with debugging information. As a result, we
|
|
|
|
|
expect to find that symbol in the symtabs. If we don't find it, then
|
|
|
|
|
the target most likely does not support Ada exceptions, or we cannot
|
|
|
|
|
insert exception breakpoints yet, because the GNAT runtime hasn't been
|
|
|
|
|
loaded yet. */
|
|
|
|
|
|
|
|
|
|
/* brobecker/2006-12-26: It is conceivable that the runtime was compiled
|
|
|
|
|
in such a way that no debugging information is produced for the symbol
|
|
|
|
|
we are looking for. In this case, we could search the minimal symbols
|
|
|
|
|
as a fall-back mechanism. This would still be operating in degraded
|
|
|
|
|
mode, however, as we would still be missing the debugging information
|
|
|
|
|
that is needed in order to extract the name of the exception being
|
|
|
|
|
raised (this name is printed in the catchpoint message, and is also
|
|
|
|
|
used when trying to catch a specific exception). We do not handle
|
|
|
|
|
this case for now. */
|
|
|
|
|
|
|
|
|
|
if (sym == NULL)
|
2007-03-29 23:57:02 +02:00
|
|
|
|
error (_("Unable to break on '%s' in this configuration."), sym_name);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
|
|
|
|
/* Make sure that the symbol we found corresponds to a function. */
|
|
|
|
|
if (SYMBOL_CLASS (sym) != LOC_BLOCK)
|
|
|
|
|
error (_("Symbol \"%s\" is not a function (class = %d)"),
|
|
|
|
|
sym_name, SYMBOL_CLASS (sym));
|
|
|
|
|
|
|
|
|
|
sal = find_function_start_sal (sym, 1);
|
|
|
|
|
|
|
|
|
|
/* Set ADDR_STRING. */
|
|
|
|
|
|
|
|
|
|
*addr_string = xstrdup (sym_name);
|
|
|
|
|
|
|
|
|
|
/* Set the COND and COND_STRING (if not NULL). */
|
|
|
|
|
|
|
|
|
|
if (cond_string != NULL && cond != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (*cond_string != NULL)
|
|
|
|
|
{
|
|
|
|
|
xfree (*cond_string);
|
|
|
|
|
*cond_string = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (*cond != NULL)
|
|
|
|
|
{
|
|
|
|
|
xfree (*cond);
|
|
|
|
|
*cond = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (exp_string != NULL)
|
|
|
|
|
{
|
|
|
|
|
*cond_string = ada_exception_catchpoint_cond_string (exp_string);
|
|
|
|
|
*cond = ada_parse_catchpoint_condition (*cond_string, sal);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set OPS. */
|
2007-01-26 22:31:06 +01:00
|
|
|
|
*ops = ada_exception_breakpoint_ops (ex);
|
* ada-lang.h (ada_find_printable_frame): Remove.
(ada_exception_catchpoint_p, ada_decode_exception_location)
(ada_decode_assert_location): Add declaration.
* ada-lang.c: Add include of annotate.h and valprint.h.
(exception_catchpoint_kind): New enum.
(function_name_from_pc, is_known_support_routine)
(ada_find_printable_frame, ada_unhandled_exception_name_addr)
(ada_exception_name_addr_1, ada_exception_name_addr)
(print_it_exception, print_one_exception, print_mention_exception)
(print_it_catch_exception, print_one_catch_exception)
(print_mention_catch_exception, catch_exception_breakpoint_ops)
(print_it_catch_exception_unhandled)
(print_one_catch_exception_unhandled)
(print_mention_catch_exception_unhandled, print_it_catch_assert)
(print_one_catch_assert, print_mention_catch_assert)
(ada_exception_catchpoint_p, error_breakpoint_runtime_sym_not_found)
(ada_get_next_arg, catch_ada_exception_command_split)
(ada_exception_sym_name, ada_exception_sym_name)
(ada_exception_breakption_ops, ada_exception_catchpoint_cond_string)
(ada_parse_catchpoint_condition, ada_exception_sal)
(ada_decode_exception_location)
(ada_decode_assert_location): New function.
(catch_exception_unhandled_breakpoint_ops): New global variable.
(catch_assert_breakpoint_ops): New global variable.
* breakpoint.c: Add include of ada-lang.h.
(print_one_breakpoint): Do not print the condition for Ada
exception catchpoints.
(create_ada_exception_breakpoint): New function.
(catch_ada_exception_command, catch_assert_command): New function.
(catch_command_1): Add support for the new "catch exception" and
"catch assert" commands.
(_initialize_breakpoint): Add help description for the new catch
commands.
* Makefile.in (ada-lang.o): Add dependency on annotate.h and
valprint.h.
(breakpoint.o): Add dependency on ada-lang.h.
2007-01-04 06:27:31 +01:00
|
|
|
|
|
|
|
|
|
return sal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the arguments (ARGS) of the "catch exception" command.
|
|
|
|
|
|
|
|
|
|
Set TYPE to the appropriate exception catchpoint type.
|
|
|
|
|
If the user asked the catchpoint to catch only a specific
|
|
|
|
|
exception, then save the exception name in ADDR_STRING.
|
|
|
|
|
|
|
|
|
|
See ada_exception_sal for a description of all the remaining
|
|
|
|
|
function arguments of this function. */
|
|
|
|
|
|
|
|
|
|
struct symtab_and_line
|
|
|
|
|
ada_decode_exception_location (char *args, char **addr_string,
|
|
|
|
|
char **exp_string, char **cond_string,
|
|
|
|
|
struct expression **cond,
|
|
|
|
|
struct breakpoint_ops **ops)
|
|
|
|
|
{
|
|
|
|
|
enum exception_catchpoint_kind ex;
|
|
|
|
|
|
|
|
|
|
catch_ada_exception_command_split (args, &ex, exp_string);
|
|
|
|
|
return ada_exception_sal (ex, *exp_string, addr_string, cond_string,
|
|
|
|
|
cond, ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct symtab_and_line
|
|
|
|
|
ada_decode_assert_location (char *args, char **addr_string,
|
|
|
|
|
struct breakpoint_ops **ops)
|
|
|
|
|
{
|
|
|
|
|
/* Check that no argument where provided at the end of the command. */
|
|
|
|
|
|
|
|
|
|
if (args != NULL)
|
|
|
|
|
{
|
|
|
|
|
while (isspace (*args))
|
|
|
|
|
args++;
|
|
|
|
|
if (*args != '\0')
|
|
|
|
|
error (_("Junk at end of arguments."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ada_exception_sal (ex_catch_assert, NULL, addr_string, NULL, NULL,
|
|
|
|
|
ops);
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
/* Operators */
|
|
|
|
|
/* Information about operators given special treatment in functions
|
|
|
|
|
below. */
|
|
|
|
|
/* Format: OP_DEFN (<operator>, <operator length>, <# args>, <binop>). */
|
|
|
|
|
|
|
|
|
|
#define ADA_OPERATORS \
|
|
|
|
|
OP_DEFN (OP_VAR_VALUE, 4, 0, 0) \
|
|
|
|
|
OP_DEFN (BINOP_IN_BOUNDS, 3, 2, 0) \
|
|
|
|
|
OP_DEFN (TERNOP_IN_RANGE, 1, 3, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_FIRST, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_LAST, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_LENGTH, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_IMAGE, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_MAX, 1, 3, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_MIN, 1, 3, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_MODULUS, 1, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_POS, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_SIZE, 1, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_TAG, 1, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_ATR_VAL, 1, 2, 0) \
|
|
|
|
|
OP_DEFN (UNOP_QUAL, 3, 1, 0) \
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
OP_DEFN (UNOP_IN_RANGE, 3, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_OTHERS, 1, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_POSITIONAL, 3, 1, 0) \
|
|
|
|
|
OP_DEFN (OP_DISCRETE_RANGE, 1, 2, 0)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2010-06-04 23:39:47 +02:00
|
|
|
|
ada_operator_length (const struct expression *exp, int pc, int *oplenp,
|
|
|
|
|
int *argsp)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
switch (exp->elts[pc - 1].opcode)
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
default:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
operator_length_standard (exp, pc, oplenp, argsp);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
#define OP_DEFN(op, len, args, binop) \
|
|
|
|
|
case op: *oplenp = len; *argsp = args; break;
|
|
|
|
|
ADA_OPERATORS;
|
|
|
|
|
#undef OP_DEFN
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
*oplenp = 3;
|
|
|
|
|
*argsp = longest_to_int (exp->elts[pc - 2].longconst);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
*oplenp = 3;
|
|
|
|
|
*argsp = longest_to_int (exp->elts[pc - 2].longconst) + 1;
|
|
|
|
|
break;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-23 01:15:43 +02:00
|
|
|
|
/* Implementation of the exp_descriptor method operator_check. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_operator_check (struct expression *exp, int pos,
|
|
|
|
|
int (*objfile_func) (struct objfile *objfile, void *data),
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
const union exp_element *const elts = exp->elts;
|
|
|
|
|
struct type *type = NULL;
|
|
|
|
|
|
|
|
|
|
switch (elts[pos].opcode)
|
|
|
|
|
{
|
|
|
|
|
case UNOP_IN_RANGE:
|
|
|
|
|
case UNOP_QUAL:
|
|
|
|
|
type = elts[pos + 1].type;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return operator_check_standard (exp, pos, objfile_func, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Invoke callbacks for TYPE and OBJFILE if they were set as non-NULL. */
|
|
|
|
|
|
|
|
|
|
if (type && TYPE_OBJFILE (type)
|
|
|
|
|
&& (*objfile_func) (TYPE_OBJFILE (type), data))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
static char *
|
|
|
|
|
ada_op_name (enum exp_opcode opcode)
|
|
|
|
|
{
|
|
|
|
|
switch (opcode)
|
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
default:
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return op_name_standard (opcode);
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#define OP_DEFN(op, len, args, binop) case op: return #op;
|
|
|
|
|
ADA_OPERATORS;
|
|
|
|
|
#undef OP_DEFN
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
return "OP_AGGREGATE";
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
return "OP_CHOICES";
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
return "OP_NAME";
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* As for operator_length, but assumes PC is pointing at the first
|
|
|
|
|
element of the operator, and gives meaningful results only for the
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
Ada-specific operators, returning 0 for *OPLENP and *ARGSP otherwise. */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2004-06-27 21:06:23 +02:00
|
|
|
|
ada_forward_operator_length (struct expression *exp, int pc,
|
|
|
|
|
int *oplenp, int *argsp)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
switch (exp->elts[pc].opcode)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
*oplenp = *argsp = 0;
|
|
|
|
|
break;
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
#define OP_DEFN(op, len, args, binop) \
|
|
|
|
|
case op: *oplenp = len; *argsp = args; break;
|
|
|
|
|
ADA_OPERATORS;
|
|
|
|
|
#undef OP_DEFN
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
*oplenp = 3;
|
|
|
|
|
*argsp = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
*oplenp = 3;
|
|
|
|
|
*argsp = longest_to_int (exp->elts[pc + 1].longconst) + 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_STRING:
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
{
|
|
|
|
|
int len = longest_to_int (exp->elts[pc + 1].longconst);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
*oplenp = 4 + BYTES_TO_EXP_ELEM (len + 1);
|
|
|
|
|
*argsp = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_dump_subexp_body (struct expression *exp, struct ui_file *stream, int elt)
|
|
|
|
|
{
|
|
|
|
|
enum exp_opcode op = exp->elts[elt].opcode;
|
|
|
|
|
int oplen, nargs;
|
|
|
|
|
int pc = elt;
|
|
|
|
|
int i;
|
2004-06-27 21:06:23 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
ada_forward_operator_length (exp, elt, &oplen, &nargs);
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
switch (op)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
2004-06-27 21:06:23 +02:00
|
|
|
|
/* Ada attributes ('Foo). */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case OP_ATR_FIRST:
|
|
|
|
|
case OP_ATR_LAST:
|
|
|
|
|
case OP_ATR_LENGTH:
|
|
|
|
|
case OP_ATR_IMAGE:
|
|
|
|
|
case OP_ATR_MAX:
|
|
|
|
|
case OP_ATR_MIN:
|
|
|
|
|
case OP_ATR_MODULUS:
|
|
|
|
|
case OP_ATR_POS:
|
|
|
|
|
case OP_ATR_SIZE:
|
|
|
|
|
case OP_ATR_TAG:
|
|
|
|
|
case OP_ATR_VAL:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_IN_RANGE:
|
|
|
|
|
case UNOP_QUAL:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
/* XXX: gdb_sprint_host_address, type_sprint */
|
|
|
|
|
fprintf_filtered (stream, _("Type @"));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
gdb_print_host_address (exp->elts[pc + 1].type, stream);
|
|
|
|
|
fprintf_filtered (stream, " (");
|
|
|
|
|
type_print (exp->elts[pc + 1].type, NULL, stream, 0);
|
|
|
|
|
fprintf_filtered (stream, ")");
|
|
|
|
|
break;
|
|
|
|
|
case BINOP_IN_BOUNDS:
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
fprintf_filtered (stream, " (%d)",
|
|
|
|
|
longest_to_int (exp->elts[pc + 2].longconst));
|
2004-06-02 11:55:36 +02:00
|
|
|
|
break;
|
|
|
|
|
case TERNOP_IN_RANGE:
|
|
|
|
|
break;
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
case OP_OTHERS:
|
|
|
|
|
case OP_DISCRETE_RANGE:
|
|
|
|
|
case OP_POSITIONAL:
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_NAME:
|
|
|
|
|
case OP_STRING:
|
|
|
|
|
{
|
|
|
|
|
char *name = &exp->elts[elt + 2].string;
|
|
|
|
|
int len = longest_to_int (exp->elts[elt + 1].longconst);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
fprintf_filtered (stream, "Text: `%.*s'", len, name);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
default:
|
|
|
|
|
return dump_subexp_body_standard (exp, stream, elt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
elt += oplen;
|
|
|
|
|
for (i = 0; i < nargs; i += 1)
|
|
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
|
|
|
|
|
|
return elt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The Ada extension of print_subexp (q.v.). */
|
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
static void
|
|
|
|
|
ada_print_subexp (struct expression *exp, int *pos,
|
|
|
|
|
struct ui_file *stream, enum precedence prec)
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
int oplen, nargs, i;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
int pc = *pos;
|
|
|
|
|
enum exp_opcode op = exp->elts[pc].opcode;
|
|
|
|
|
|
|
|
|
|
ada_forward_operator_length (exp, pc, &oplen, &nargs);
|
|
|
|
|
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
*pos += oplen;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
default:
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
*pos -= oplen;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp_standard (exp, pos, stream, prec);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case OP_VAR_VALUE:
|
|
|
|
|
fputs_filtered (SYMBOL_NATURAL_NAME (exp->elts[pc + 2].symbol), stream);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case BINOP_IN_BOUNDS:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
/* XXX: sprint_subexp */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
2004-12-21 11:03:55 +01:00
|
|
|
|
fputs_filtered (" in ", stream);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
2004-12-21 11:03:55 +01:00
|
|
|
|
fputs_filtered ("'range", stream);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
if (exp->elts[pc + 1].longconst > 1)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
fprintf_filtered (stream, "(%ld)",
|
|
|
|
|
(long) exp->elts[pc + 1].longconst);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case TERNOP_IN_RANGE:
|
|
|
|
|
if (prec >= PREC_EQUAL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
fputs_filtered ("(", stream);
|
2004-12-12 18:06:26 +01:00
|
|
|
|
/* XXX: sprint_subexp */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
2004-12-21 11:03:55 +01:00
|
|
|
|
fputs_filtered (" in ", stream);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_EQUAL);
|
|
|
|
|
fputs_filtered (" .. ", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_EQUAL);
|
|
|
|
|
if (prec >= PREC_EQUAL)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
|
return;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
|
|
|
|
|
case OP_ATR_FIRST:
|
|
|
|
|
case OP_ATR_LAST:
|
|
|
|
|
case OP_ATR_LENGTH:
|
|
|
|
|
case OP_ATR_IMAGE:
|
|
|
|
|
case OP_ATR_MAX:
|
|
|
|
|
case OP_ATR_MIN:
|
|
|
|
|
case OP_ATR_MODULUS:
|
|
|
|
|
case OP_ATR_POS:
|
|
|
|
|
case OP_ATR_SIZE:
|
|
|
|
|
case OP_ATR_TAG:
|
|
|
|
|
case OP_ATR_VAL:
|
|
|
|
|
if (exp->elts[*pos].opcode == OP_TYPE)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (exp->elts[*pos + 1].type) != TYPE_CODE_VOID)
|
|
|
|
|
LA_PRINT_TYPE (exp->elts[*pos + 1].type, "", stream, 0, 0);
|
|
|
|
|
*pos += 3;
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
else
|
2004-06-27 21:06:23 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
fprintf_filtered (stream, "'%s", ada_attribute_name (op));
|
|
|
|
|
if (nargs > 1)
|
2004-06-27 21:06:23 +02:00
|
|
|
|
{
|
|
|
|
|
int tem;
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
2004-06-27 21:06:23 +02:00
|
|
|
|
for (tem = 1; tem < nargs; tem += 1)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ((tem == 1) ? " (" : ", ", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
|
}
|
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
|
}
|
2004-06-02 11:55:36 +02:00
|
|
|
|
return;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_QUAL:
|
|
|
|
|
type_print (exp->elts[pc + 1].type, "", stream, 0);
|
|
|
|
|
fputs_filtered ("'(", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
|
return;
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
2004-06-02 11:55:36 +02:00
|
|
|
|
case UNOP_IN_RANGE:
|
2004-12-12 18:06:26 +01:00
|
|
|
|
/* XXX: sprint_subexp */
|
2004-06-02 11:55:36 +02:00
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
2004-12-21 11:03:55 +01:00
|
|
|
|
fputs_filtered (" in ", stream);
|
2004-06-02 11:55:36 +02:00
|
|
|
|
LA_PRINT_TYPE (exp->elts[pc + 1].type, "", stream, 1, 0);
|
|
|
|
|
return;
|
* ada-exp.y: Considerable reorganization to move functionality
from ada-lex.l to here, where it is logically more appropriate.
The original reason, however, was to prevent premature name
lookups for selector names in record aggregates.
(BLOCKNAME, TYPENAME, OBJECT_RENAMING): Remove; lexer now returns
NAME for all of these.
(VAR): New artificial token to clarify precedence rules.
(OTHERS): New lexeme.
(empty_stoken): New symbol.
(%union): Remove ssym, voidval.
(%type): Remove <voidval> type declarations.
(syntax definitions): Add aggregates.
Remove distinction between NAME, TYPENAME, BLOCKNAME, OBJECT_RENAMING.
Rename some non-terminals to be closer to reference manual usage.
Tighten up expression syntax to disallow certain non-Ada
constructions such as X and then Y or else Z.
(ada_parse): Remove initialization of left_block_context.
(write_var_from_name): Remove.
(write_var_or_type): New function, containing previous code from
defunct write_var_from_name and name_lookup.
(block_lookup): New function, moved from ada-lex.l
(select_possible_type_sym): New function, factored out of
name_lookup, which used to be in ada-lex.l.
(find_primitive_type): Ditto.
(chop_selector): Ditto.
(write_ambiguous_var): New function, factored out of defunct
write_var_from_name.
(write_selectors): New function.
(write_name_assoc): New function.
(write_exp_op_with_string): New function.
* ada-lex.l (processId): Change interface to return stoken.
(tempbuf, resize_tempbuf, tempbuf_size, tempbuf_len): Remove.
(block_lookup, name_lookup): Remove. Functionality moved to
ada-exp.y.
(state IN_STRING): Remove.
(rules): Handle string escapes in processString.
Add 'others' token.
Return all NAMEs, BLOCKNAMEs, OBJECT_RENAMINGs, TYPENAMEs in
yylval.sval (as simple strings).
All name look-ups now handled in ada-exp.y.
Introduce "::" (COLONCOLON) token and return as separate token.
(processId): Change return convention. Comment.
Leave leading "'" in place.
(processString): New function.
(find_dot_all): Add note to comment.
Fix problem that allowed match only at the end.
* ada-lang.c: Introduce aggregates.
(find_struct_field): Add new parameter to count fields skipped, and
allow other output parameters to be NULL.
(value_tag_from_contents_and_address, ada_value_struct_elt): Use
new find_struct_field.
(ada_index_struct_field, assign_aggregate, ada_is_array_type)
(num_visible_fields, ada_index_struct_field_1, ada_index_struct_field)
(num_component_specs, assign_component, assign_aggregate):
(aggregate_assign_from_choices,aggregate_assign_positional)
(aggregate_assign_others,add_component_interval):
New functions.
(ada_evaluate_subexp): Declare.
Add aggregate-related operators.
(ada_forward_operator_length): Declare.
(resolve_subexp): Add cases for new aggregate operators and OP_NAME.
Consolidate Ada operators, using ada_forward_operator_length.
(ada_search_struct_field): Search in forward order.
(ADA_OPERATORS): Add new aggregate operators.
(ada_operator_length, ada_op_name, ada_forward_operator_length)
(ada_dump_subexp_body, ada_print_subexp): Handle new aggregate
operators and OP_NAME.
(ada_type_of_array): Use longest_to_int.
(value_assign_to_component): New function.
(ada_forward_operator_length, ada_op_name, ada_dump_subexp_body):
Add OP_NAME case.
(ada_forward_operator_length, ada_dump_subexp_body):
Add OP_STRING case.
* ada-lang.h (enum ada_operator): Add OP_AGGREGATE, OP_OTHERS,
OP_CHOICES, OP_DISCRETE_RANGE, OP_POSITIONAL.
2006-01-02 10:46:34 +01:00
|
|
|
|
|
|
|
|
|
case OP_DISCRETE_RANGE:
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
fputs_filtered ("..", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case OP_OTHERS:
|
|
|
|
|
fputs_filtered ("others => ", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case OP_CHOICES:
|
|
|
|
|
for (i = 0; i < nargs-1; i += 1)
|
|
|
|
|
{
|
|
|
|
|
if (i > 0)
|
|
|
|
|
fputs_filtered ("|", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
}
|
|
|
|
|
fputs_filtered (" => ", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case OP_POSITIONAL:
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
case OP_AGGREGATE:
|
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
|
for (i = 0; i < nargs; i += 1)
|
|
|
|
|
{
|
|
|
|
|
if (i > 0)
|
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
|
}
|
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
|
return;
|
2004-06-02 11:55:36 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
|
|
|
|
|
/* Table mapping opcodes into strings for printing operators
|
|
|
|
|
and precedences of the operators. */
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
static const struct op_print ada_op_print_tab[] = {
|
|
|
|
|
{":=", BINOP_ASSIGN, PREC_ASSIGN, 1},
|
|
|
|
|
{"or else", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0},
|
|
|
|
|
{"and then", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0},
|
|
|
|
|
{"or", BINOP_BITWISE_IOR, PREC_BITWISE_IOR, 0},
|
|
|
|
|
{"xor", BINOP_BITWISE_XOR, PREC_BITWISE_XOR, 0},
|
|
|
|
|
{"and", BINOP_BITWISE_AND, PREC_BITWISE_AND, 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},
|
|
|
|
|
{">>", BINOP_RSH, PREC_SHIFT, 0},
|
|
|
|
|
{"<<", BINOP_LSH, PREC_SHIFT, 0},
|
|
|
|
|
{"+", BINOP_ADD, PREC_ADD, 0},
|
|
|
|
|
{"-", BINOP_SUB, PREC_ADD, 0},
|
|
|
|
|
{"&", BINOP_CONCAT, PREC_ADD, 0},
|
|
|
|
|
{"*", BINOP_MUL, PREC_MUL, 0},
|
|
|
|
|
{"/", BINOP_DIV, PREC_MUL, 0},
|
|
|
|
|
{"rem", BINOP_REM, PREC_MUL, 0},
|
|
|
|
|
{"mod", BINOP_MOD, PREC_MUL, 0},
|
|
|
|
|
{"**", BINOP_EXP, PREC_REPEAT, 0},
|
|
|
|
|
{"@", BINOP_REPEAT, PREC_REPEAT, 0},
|
|
|
|
|
{"-", UNOP_NEG, PREC_PREFIX, 0},
|
|
|
|
|
{"+", UNOP_PLUS, PREC_PREFIX, 0},
|
|
|
|
|
{"not ", UNOP_LOGICAL_NOT, PREC_PREFIX, 0},
|
|
|
|
|
{"not ", UNOP_COMPLEMENT, PREC_PREFIX, 0},
|
|
|
|
|
{"abs ", UNOP_ABS, PREC_PREFIX, 0},
|
2004-06-02 11:55:36 +02:00
|
|
|
|
{".all", UNOP_IND, PREC_SUFFIX, 1},
|
|
|
|
|
{"'access", UNOP_ADDR, PREC_SUFFIX, 1},
|
|
|
|
|
{"'size", OP_ATR_SIZE, PREC_SUFFIX, 1},
|
2002-08-18 20:11:12 +02:00
|
|
|
|
{NULL, 0, 0, 0}
|
2002-06-04 17:28:49 +02:00
|
|
|
|
};
|
|
|
|
|
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
enum ada_primitive_types {
|
|
|
|
|
ada_primitive_type_int,
|
|
|
|
|
ada_primitive_type_long,
|
|
|
|
|
ada_primitive_type_short,
|
|
|
|
|
ada_primitive_type_char,
|
|
|
|
|
ada_primitive_type_float,
|
|
|
|
|
ada_primitive_type_double,
|
|
|
|
|
ada_primitive_type_void,
|
|
|
|
|
ada_primitive_type_long_long,
|
|
|
|
|
ada_primitive_type_long_double,
|
|
|
|
|
ada_primitive_type_natural,
|
|
|
|
|
ada_primitive_type_positive,
|
|
|
|
|
ada_primitive_type_system_address,
|
|
|
|
|
nr_ada_primitive_types
|
|
|
|
|
};
|
2004-09-18 12:11:06 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2007-10-30 22:39:15 +01:00
|
|
|
|
ada_language_arch_info (struct gdbarch *gdbarch,
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
struct language_arch_info *lai)
|
|
|
|
|
{
|
2007-10-30 22:39:15 +01:00
|
|
|
|
const struct builtin_type *builtin = builtin_type (gdbarch);
|
2010-05-18 21:23:37 +02:00
|
|
|
|
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
lai->primitive_type_vector
|
2007-10-30 22:39:15 +01:00
|
|
|
|
= GDBARCH_OBSTACK_CALLOC (gdbarch, nr_ada_primitive_types + 1,
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
struct type *);
|
* gdbtypes.h (TYPE_OBJFILE_OWNED, TYPE_OWNER): New macros.
(TYPE_OBJFILE, TYPE_ALLOC, TYPE_ZALLOC): Reimplement.
(alloc_type_arch): Add prototype.
(alloc_type_copy): Likewise.
(get_type_arch): Likewise.
(arch_type): Likewise.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
* gdbtypes.c (alloc_type): No longer support NULL objfile.
(init_type): Likewise.
(alloc_type_arch): New function.
(alloc_type_copy): New function.
(get_type_arch): New function.
(smash_type): Preserve type ownership information.
(make_pointer_type, make_reference_type, make_function_type,
smash_to_memberptr_type, smash_to_method_type): No longer
preserve OBJFILE across smash_type calls.
(make_pointer_type, make_reference_type, make_function_type,
lookup_memberptr_type, lookup_methodptr_type, allocate_stub_method,
create_range_type, create_array_type, create_set_type, copy_type):
Use alloc_type_copy when allocating types.
(check_typedef): Use alloc_type_arch.
(copy_type_recursive): Likewise. Preserve type ownership data
after copying type.
(recursive_dump_type): Dump type ownership data.
(alloc_type_instance): Update type ownership check.
(copy_type, copy_type_recursive): Likewise.
(arch_type): New function.
(arch_integer_type): Likewise.
(arch_character_type): Likewise.
(arch_boolean_type): Likewise.
(init_float_type): Remove, replace by ...
(arch_float_type): ... this.
(init_complex_type): Remove, replace by ...
(arch_complex_type): ... this.
(init_flags_type): Remove, replace by ...
(arch_flags_type): ... this.
(append_flags_type_flag): Move down.
(init_composite_type): Remove, replace by ...
(arch_composite_type): ... this.
(append_composite_type_field_aligned,
append_composite_type_field): Move down.
* gdbarch.c (gdbtypes_post_init): Allocate all types
using per-architecture routines.
* ada-lang.c (ada_language_arch_info): Likewise.
* f-lang.c (build_fortran_types): Likewise.
* jv-lang.c (build_java_types): Likewise.
* m2-lang.c (build_m2_types): Likewise.
* scm-lang.c (build_scm_types): Likewise.
* ada-lang.c (ada_type_of_array): Use alloc_type_copy.
(packed_array_type): Likewise.
(ada_template_to_fixed_record_type_1): Likewise.
(template_to_static_fixed_type): Likewise.
(to_record_with_fixed_variant_part): Likewise.
(to_fixed_variant_branch_type): Likewise.
(to_fixed_array_type): Likewise.
(to_fixed_range_type): Likewise.
(empty_record): Use type instead of objfile argument.
Use alloc_type_copy.
(to_fixed_variant_branch_type): Update call to empty_record.
* jv-lang.c (type_from_class): Use alloc_type_arch.
* arm-tdep.c (arm_ext_type): Allocate per-architecture type.
* i386-tdep.c (i386_eflags_type, i386_mxcsr_type, i387_ext_type,
i386_mmx_type, i386_sse_type): Likewise.
* ia64-tdep.c (ia64_ext_type): Likewise.
* m32c-tdep.c (make_types): Likewise.
* m68k-tdep.c (m68k_ps_type, m68881_ext_type): Likewise.
* rs6000-tdep.c (rs6000_builtin_type_vec64,
rs6000_builtin_type_vec128): Likewise.
* sparc-tdep.c (sparc_psr_type, sparc_fsr_type): Likewise.
* sparc64-tdep.c (sparc64_pstate_type, sparc64_fsr_type,
sparc64_fprs_type): Likewise.
* spu-tdep.c (spu_builtin_type_vec128): Likewise.
* xtensa-tdep.c (xtensa_register_type): Likewise.
* linux-tdep.c (linux_get_siginfo_type): Likewise.
* target-descriptions.c (tdesc_gdb_type): Likewise.
* gnu-v3-abi.c (build_gdb_vtable_type): Likewise.
2009-07-02 14:55:30 +02:00
|
|
|
|
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_int]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
|
|
|
|
|
0, "integer");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_long]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_long_bit (gdbarch),
|
|
|
|
|
0, "long_integer");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_short]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_short_bit (gdbarch),
|
|
|
|
|
0, "short_integer");
|
|
|
|
|
lai->string_char_type
|
|
|
|
|
= lai->primitive_type_vector [ada_primitive_type_char]
|
|
|
|
|
= arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, "character");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_float]
|
|
|
|
|
= arch_float_type (gdbarch, gdbarch_float_bit (gdbarch),
|
|
|
|
|
"float", NULL);
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_double]
|
|
|
|
|
= arch_float_type (gdbarch, gdbarch_double_bit (gdbarch),
|
|
|
|
|
"long_float", NULL);
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_long_long]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_long_long_bit (gdbarch),
|
|
|
|
|
0, "long_long_integer");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_long_double]
|
|
|
|
|
= arch_float_type (gdbarch, gdbarch_double_bit (gdbarch),
|
|
|
|
|
"long_long_float", NULL);
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_natural]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
|
|
|
|
|
0, "natural");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_positive]
|
|
|
|
|
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
|
|
|
|
|
0, "positive");
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_void]
|
|
|
|
|
= builtin->builtin_void;
|
|
|
|
|
|
|
|
|
|
lai->primitive_type_vector [ada_primitive_type_system_address]
|
|
|
|
|
= lookup_pointer_type (arch_type (gdbarch, TYPE_CODE_VOID, 1, "void"));
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
TYPE_NAME (lai->primitive_type_vector [ada_primitive_type_system_address])
|
|
|
|
|
= "system__address";
|
2008-09-11 16:11:40 +02:00
|
|
|
|
|
2009-03-13 02:12:21 +01:00
|
|
|
|
lai->bool_type_symbol = NULL;
|
2008-09-11 16:11:40 +02:00
|
|
|
|
lai->bool_type_default = builtin->builtin_bool;
|
2004-09-18 12:11:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Language vector */
|
|
|
|
|
|
|
|
|
|
/* Not really used, but needed in the ada_language_defn. */
|
|
|
|
|
|
|
|
|
|
static void
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 00:04:40 +01:00
|
|
|
|
emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
|
2004-09-18 12:11:06 +02:00
|
|
|
|
{
|
gdb:
2009-03-19 Tom Tromey <tromey@redhat.com>
Julian Brown <julian@codesourcery.com>
PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103,
PR i18n/9401, PR exp/9613:
* NEWS: Update
* value.h (value_typed_string): Declare.
(val_print_string): Update.
* valprint.h (print_char_chars): Update.
* valprint.c (print_char_chars): Add type argument. Update.
(val_print_string): Likewise.
* valops.c (value_typed_string): New function.
* utils.c (host_char_to_target): New function.
(parse_escape): Use host_char_to_target, host_hex_value. Update.
Remove '^' case.
(no_control_char_error): Remove.
* typeprint.c (print_type_scalar): Update.
* scm-valprint.c (scm_scmval_print): Update.
* scm-lang.h (scm_printchar, scm_printstr): Update.
* scm-lang.c (scm_printchar): Add type argument.
(scm_printstr): Likewise.
* printcmd.c (print_formatted): Update.
(print_scalar_formatted): Update.
(printf_command) <wide_string_arg, wide_char_arg>: New constants.
Handle '%lc' and '%ls'.
* parser-defs.h (struct typed_stoken): New type.
(struct stoken_vector): Likewise.
(write_exp_string_vector): Declare.
* parse.c (write_exp_string_vector): New function.
* p-valprint.c (pascal_val_print): Update.
* p-lang.h (is_pascal_string_type, pascal_printchar,
pascal_printstr): Update.
* p-lang.c (is_pascal_string_type): Remove 'char_size' argument.
Add 'char_type' argument.
(pascal_emit_char): Add type argument.
(pascal_printchar): Likewise.
(pascal_printstr): Likewise.
* objc-lang.c (objc_emit_char): Add type argument.
(objc_printchar): Likewise.
(objc_printstr): Likewise.
* macroexp.c (get_character_constant): Handle unicode characters.
Use c_parse_escape.
(get_string_literal): Handle unicode strings. Use
c_parse_escape.
* m2-valprint.c (print_unpacked_pointer): Update.
(m2_print_array_contents): Update.
(m2_val_print): Update.
* m2-lang.c (m2_emit_char): Add type argument.
(m2_printchar): Likewise.
(m2_printstr): Likewise.
* language.h (struct language_defn) <la_printchar>: Add type
argument.
<la_printstr, la_emitchar>: Likewise.
(LA_PRINT_CHAR): Likewise.
(LA_PRINT_STRING): Likewise.
(LA_EMIT_CHAR): Likewise.
* language.c (unk_lang_emit_char): Add type argument.
(unk_lang_printchar): Likewise.
(unk_lang_printstr): Likewise.
* jv-valprint.c (java_val_print): Update.
* jv-lang.c (java_emit_char): Add type argument.
* f-valprint.c (f_val_print): Update.
* f-lang.c (f_emit_char): Add type argument.
(f_printchar): Likewise.
(f_printstr): Likewise.
* expprint.c (print_subexp_standard): Update.
* charset.h (target_wide_charset): Declare.
(c_target_char_has_backslash_escape, c_parse_backslash,
host_char_print_literally, host_char_to_target,
target_char_to_host, target_char_to_control_char): Remove.
(enum transliterations): New type.
(convert_between_encodings): Declare.
(HOST_ESCAPE_CHAR): New define.
(host_letter_to_control_character, host_hex_value): Declare.
(enum wchar_iterate_result): New enum.
(struct wchar_iterator): Declare.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): Declare.
* charset-list.h: New file.
* c-valprint.c (textual_name): New function.
(textual_element_type): Handle wide character types.
(c_val_print): Pass original type to textual_element_type. Handle
wide character types.
(c_value_print): Use textual_element_type. Pass original type of
value to val_print.
* c-lang.h (enum c_string_type): New type.
(c_printchar, c_printstr): Update.
* c-lang.c (classify_type): New function.
(print_wchar): Likewise.
(c_emit_char): Add type argument. Handle wide characters.
(c_printchar): Likewise.
(c_printstr): Add type argument. Handle wide and multibyte
character sets.
(convert_ucn): New function.
(emit_numeric_character): Likewise.
(convert_octal): Likewise.
(convert_hex): Likewise.
(ADVANCE): New macro.
(convert_escape): New function.
(parse_one_string): Likewise.
(evaluate_subexp_c): Likewise.
(exp_descriptor_c): New global.
(c_language_defn): Use exp_descriptor_c.
(cplus_language_defn): Likewise.
(asm_language_defn): Likewise.
(minimal_language_defn): Likewise.
(charset_for_string_type): New function.
* c-exp.y (%union): Add 'svec' and 'tsval'.
(CHAR): New token.
(exp): Add CHAR production.
(string_exp): Rewrite.
(exp) <string_exp>: Rewrite.
(tempbuf): Now global.
(tempbuf_init): New global.
(parse_string_or_char): New function.
(yylex) <tempbuf>: Now global.
<tokptr, tempbufindex, tempbufsize, token_string, class_prefix>:
Remove.
Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char.
(c_parse_escape): New function.
* auxv.c (fprint_target_auxv): Update.
* ada-valprint.c (ada_emit_char): Add type argument.
(ada_printchar): Likewise.
(ada_print_scalar): Update.
(printstr): Add type argument. Update calls to ada_emit_char.
(ada_printstr): Add type argument.
(ada_val_print_array): Update.
(ada_val_print_1): Likewise.
* ada-lang.c (emit_char): Add type argument.
* ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add
type arguments.
* gdb_locale.h: Include langinfo.h.
* charset.c (_initialize_charset): Set default host charset from
the locale. Don't register charsets. Add target-wide-charset
commands. Call find_charset_names.
(struct charset, struct translation): Remove.
(GDB_DEFAULT_HOST_CHARSET): Remove.
(GDB_DEFAULT_TARGET_WIDE_CHARSET): New define.
(target_wide_charset_name): New global.
(show_host_charset_name): Handle "auto".
(show_target_wide_charset_name): New function.
(host_charset_enum, target_charset_enum): Remove.
(charset_enum): New global.
(all_charsets, register_charset, lookup_charset, all_translations,
register_translation, lookup_translation): Remove.
(simple_charset, ascii_print_literally, ascii_to_control): Remove.
(iso_8859_print_literally, iso_8859_to_control,
iso_8859_family_charset): Remove.
(ebcdic_print_literally, ebcdic_to_control,
ebcdic_family_charset): Remove.
(struct cached_iconv, check_iconv_cache, cached_iconv_convert,
register_iconv_charsets): Remove.
(target_wide_charset_be_name, target_wide_charset_le_name): New
globals.
(identity_either_char_to_other): Remove.
(set_be_le_names, validate): New functions.
(backslashable, backslashed, represented): Remove.
(default_c_target_char_has_backslash_escape): Remove.
(default_c_parse_backslash, iconv_convert): Remove.
(ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table,
ascii_to_ibm1047_table, iso_8859_1_to_ascii_table,
iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table,
ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table,
ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table,
ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove.
(table_convert_char, table_translation, simple_table_translation):
Remove.
(current_host_charset, current_target_charset,
c_target_char_has_backslash_escape_func,
c_target_char_has_backslash_escape_baton): Remove.
(c_parse_backslash_func, c_parse_backslash_baton): Remove.
(host_char_to_target_func, host_char_to_target_baton): Remove.
(target_char_to_host_func, target_char_to_host_baton): Remove.
(cached_iconv_host_to_target, cached_iconv_target_to_host):
Remove.
(lookup_charset_or_error, check_valid_host_charset): Remove.
(set_host_and_target_charsets): Remove.
(set_host_charset, set_target_charset): Remove.
(set_host_charset_sfunc, set_target_charset_sfunc): Rewrite.
(set_target_wide_charset_sfunc): New function.
(show_charset): Print target wide character set.
(host_charset, target_charset): Rewrite.
(target_wide_charset): New function.
(c_target_char_has_backslash_escape): Remove.
(c_parse_backslash): Remove.
(host_letter_to_control_character): New function.
(host_char_print_literally): Remove.
(host_hex_value): New function.
(target_char_to_control_char): Remove.
(cleanup_iconv): New function.
(convert_between_encodings): New function.
(target_char_to_host): Remove.
(struct wchar_iterator): Define.
(make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator,
wchar_push_back): New functions.
(do_cleanup_iterator): New function.
(char_ptr): New typedef.
(charsets): New global.
(add_one, find_charset_names): New functions.
(default_charset_names): New global.
(auto_host_charset_name): Likewise.
* aclocal.m4, config.in, configure: Rebuild.
* configure.ac: Call AM_LANGINFO_CODESET.
(GDB_DEFAULT_HOST_CHARSET): Default to UTF-8.
(AM_ICONV): Invoke earlier.
* acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and
LIBICONV_LIBDIR. Check for libiconv in build tree.
* Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros.
(INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE.
(INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR.
* gdb_obstack.h (obstack_grow_wstr): New define.
* gdb_wchar.h: New file.
* defs.h: Include it.
gdb/testsuite:
* gdb.base/store.exp: Update for change to escape output.
* gdb.base/callfuncs.exp (fetch_all_registers): Update for change
to escape output.
* gdb.base/pointers.exp: Update for change to escape output.
* gdb.base/long_long.exp (gdb_test_long_long): Update for change
to escape output.
* gdb.base/constvars.exp (do_constvar_tests): Update for change to
escape output.
* gdb.base/call-rt-st.exp (print_struct_call): Update for change
to escape output.
* gdb.cp/ref-types.exp (gdb_start_again): Update for change to
escape output.
* gdb.base/setvar.exp: Update for change to escape output.
* lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C.
* gdb.base/printcmds.exp (test_print_all_chars): Update for change
to escape output.
(test_print_string_constants): Likewise.
* gdb.base/charset.exp (valid_host_charset): Check size of
wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode
cases. Handle "auto"-related output.
* gdb.base/charset.c (char16_t, char32_t): New typedefs.
(uvar, Uvar): New globals.
gdb/doc:
* gdb.texinfo (Character Sets): Remove obsolete text. Document
set target-wide-charset.
(Requirements): Mention iconv.
2009-03-21 00:04:40 +01:00
|
|
|
|
ada_emit_char (c, type, stream, quoter, 1);
|
2004-09-18 12:11:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
parse (void)
|
|
|
|
|
{
|
|
|
|
|
warnings_issued = 0;
|
|
|
|
|
return ada_parse ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct exp_descriptor ada_exp_descriptor = {
|
|
|
|
|
ada_print_subexp,
|
|
|
|
|
ada_operator_length,
|
2010-04-23 01:15:43 +02:00
|
|
|
|
ada_operator_check,
|
2004-09-18 12:11:06 +02:00
|
|
|
|
ada_op_name,
|
|
|
|
|
ada_dump_subexp_body,
|
|
|
|
|
ada_evaluate_subexp
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const struct language_defn ada_language_defn = {
|
|
|
|
|
"ada", /* Language name */
|
|
|
|
|
language_ada,
|
|
|
|
|
range_check_off,
|
|
|
|
|
type_check_off,
|
|
|
|
|
case_sensitive_on, /* Yes, Ada is case-insensitive, but
|
|
|
|
|
that's not quite what this means. */
|
|
|
|
|
array_row_major,
|
2008-09-30 19:21:28 +02:00
|
|
|
|
macro_expansion_no,
|
2004-09-18 12:11:06 +02:00
|
|
|
|
&ada_exp_descriptor,
|
|
|
|
|
parse,
|
|
|
|
|
ada_error,
|
|
|
|
|
resolve,
|
|
|
|
|
ada_printchar, /* Print a character constant */
|
|
|
|
|
ada_printstr, /* Function to print string constant */
|
|
|
|
|
emit_char, /* Function to print single char (not used) */
|
|
|
|
|
ada_print_type, /* Print a type using appropriate syntax */
|
2010-04-21 00:38:02 +02:00
|
|
|
|
ada_print_typedef, /* Print a typedef using appropriate syntax */
|
2004-09-18 12:11:06 +02:00
|
|
|
|
ada_val_print, /* Print a value using appropriate syntax */
|
|
|
|
|
ada_value_print, /* Print a top-level value */
|
|
|
|
|
NULL, /* Language specific skip_trampoline */
|
2008-04-06 10:56:37 +02:00
|
|
|
|
NULL, /* name_of_this */
|
2004-09-18 12:11:06 +02:00
|
|
|
|
ada_lookup_symbol_nonlocal, /* Looking up non-local symbols. */
|
|
|
|
|
basic_lookup_transparent_type, /* lookup_transparent_type */
|
|
|
|
|
ada_la_decode, /* Language specific symbol demangler */
|
|
|
|
|
NULL, /* Language specific class_name_from_physname */
|
|
|
|
|
ada_op_print_tab, /* expression operators for printing */
|
|
|
|
|
0, /* c-style arrays */
|
|
|
|
|
1, /* String lower bound */
|
|
|
|
|
ada_get_gdb_completer_word_break_characters,
|
2008-02-05 23:17:41 +01:00
|
|
|
|
ada_make_symbol_completion_list,
|
* ada-exp.y (type_int): New function to add layer of abstraction
around references to expression types.
(type_long): Ditto.
(type_long_long): Ditto.
(type_float): Ditto.
(type_double): Ditto.
(type_long_double): Ditto.
(type_char): Ditto.
(type_system_address): Ditto.
(simple_exp): Use type_* functions in place of builtin_*
variables.
(exp): Ditto.
(write_var_from_name): Ditto.
(write_object_renaming): Ditto.
* ada-lang.c (ada_create_fundamental_type): Remove redundant
declaration.
(build_ada_types): Remove, replacing with...
(ada_language_arch_info): New function to initialize primitive
type vector in language_arch_info.
(ada_array_length): Remove use of builtin_type_ada_int.
(value_pos_atr): Ditto.
(ada_evaluate_subexp): Ditto.
(builtin_type_ada_int, builtin_type_ada_short, builtin_type_ada_long,
builtin_type_ada_long_long, builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
(ada_builtin_types): Remove.
(ada_language_defn): Remove entries for la_builtin_type_vector and
string_char_type and use ada_language_arch_info.
(_initialize_ada_language): Do type-vector initialization along
the lines of c-lang.c.
(ada_create_fundamental_type): Break up line.
(ada_dump_symtab): Remove unused function.
(enum ada_primitive_types): Define.
* ada-lang.h (builtin_type_ada_int, builtin_type_ada_short,
builtin_type_ada_long,builtin_type_ada_long_long,builtin_type_ada_char,
builtin_type_ada_float, builtin_type_ada_double,
builtin_type_ada_long_double, builtin_type_ada_natural,
builtin_type_ada_positive, builtin_type_ada_system_address): Remove.
* ada-lex.l: Use type_* functions in place of builtin_* variables.
(processInt): Ditto.
(processReal): Ditto.
(name_lookup): Ditto.
* ada-typeprint.c (print_range): Use builtin_type_int, not
builtin_type_ada_int.
2004-09-19 00:23:23 +02:00
|
|
|
|
ada_language_arch_info,
|
2005-10-03 23:21:20 +02:00
|
|
|
|
ada_print_array_index,
|
2007-09-23 18:25:06 +02:00
|
|
|
|
default_pass_by_reference,
|
2009-02-05 13:16:25 +01:00
|
|
|
|
c_get_string,
|
2004-09-18 12:11:06 +02:00
|
|
|
|
LANG_MAGIC
|
|
|
|
|
};
|
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-21 17:14:50 +01:00
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
|
|
|
extern initialize_file_ftype _initialize_ada_language;
|
|
|
|
|
|
2010-01-18 11:24:26 +01:00
|
|
|
|
/* Command-list for the "set/show ada" prefix command. */
|
|
|
|
|
static struct cmd_list_element *set_ada_list;
|
|
|
|
|
static struct cmd_list_element *show_ada_list;
|
|
|
|
|
|
|
|
|
|
/* Implement the "set ada" prefix command. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_ada_command (char *arg, int from_tty)
|
|
|
|
|
{
|
|
|
|
|
printf_unfiltered (_(\
|
|
|
|
|
"\"set ada\" must be followed by the name of a setting.\n"));
|
|
|
|
|
help_list (set_ada_list, "set ada ", -1, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implement the "show ada" prefix command. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
show_ada_command (char *args, int from_tty)
|
|
|
|
|
{
|
|
|
|
|
cmd_show_list (show_ada_list, from_tty, "");
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-18 20:11:12 +02:00
|
|
|
|
void
|
2004-09-18 12:11:06 +02:00
|
|
|
|
_initialize_ada_language (void)
|
2002-06-04 17:28:49 +02:00
|
|
|
|
{
|
2004-09-18 12:11:06 +02:00
|
|
|
|
add_language (&ada_language_defn);
|
|
|
|
|
|
2010-01-18 11:24:26 +01:00
|
|
|
|
add_prefix_cmd ("ada", no_class, set_ada_command,
|
|
|
|
|
_("Prefix command for changing Ada-specfic settings"),
|
|
|
|
|
&set_ada_list, "set ada ", 0, &setlist);
|
|
|
|
|
|
|
|
|
|
add_prefix_cmd ("ada", no_class, show_ada_command,
|
|
|
|
|
_("Generic command for showing Ada-specific settings."),
|
|
|
|
|
&show_ada_list, "show ada ", 0, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_boolean_cmd ("trust-PAD-over-XVS", class_obscure,
|
|
|
|
|
&trust_pad_over_xvs, _("\
|
|
|
|
|
Enable or disable an optimization trusting PAD types over XVS types"), _("\
|
|
|
|
|
Show whether an optimization trusting PAD types over XVS types is activated"),
|
|
|
|
|
_("\
|
|
|
|
|
This is related to the encoding used by the GNAT compiler. The debugger\n\
|
|
|
|
|
should normally trust the contents of PAD types, but certain older versions\n\
|
|
|
|
|
of GNAT have a bug that sometimes causes the information in the PAD type\n\
|
|
|
|
|
to be incorrect. Turning this setting \"off\" allows the debugger to\n\
|
|
|
|
|
work around this bug. It is always safe to turn this option \"off\", but\n\
|
|
|
|
|
this incurs a slight performance penalty, so it is recommended to NOT change\n\
|
|
|
|
|
this option to \"off\" unless necessary."),
|
|
|
|
|
NULL, NULL, &set_ada_list, &show_ada_list);
|
|
|
|
|
|
2004-09-18 12:11:06 +02:00
|
|
|
|
varsize_limit = 65536;
|
|
|
|
|
|
|
|
|
|
obstack_init (&symbol_list_obstack);
|
|
|
|
|
|
|
|
|
|
decoded_names_store = htab_create_alloc
|
|
|
|
|
(256, htab_hash_string, (int (*)(const void *, const void *)) streq,
|
|
|
|
|
NULL, xcalloc, xfree);
|
2007-12-29 06:37:25 +01:00
|
|
|
|
|
|
|
|
|
observer_attach_executable_changed (ada_executable_changed_observer);
|
2010-05-28 03:32:08 +02:00
|
|
|
|
|
|
|
|
|
/* Setup per-inferior data. */
|
|
|
|
|
observer_attach_inferior_exit (ada_inferior_exit);
|
|
|
|
|
ada_inferior_data
|
|
|
|
|
= register_inferior_data_with_cleanup (ada_inferior_data_cleanup);
|
2002-06-04 17:28:49 +02:00
|
|
|
|
}
|