9a3c826307
Note: I needed to split this patch in two, otherwise it's too big for the mailing list. This patch adds explicit casts to situations where a void pointer is assigned to a pointer to the "real" type. Building in C++ mode requires those assignments to use an explicit cast. This includes, for example: - callback arguments (cleanups, comparison functions, ...) - data attached to some object (objfile, program space, etc) in the form of a void pointer - "user data" passed to some function This patch comes from the commit "(mostly) auto-generated patch to insert casts needed for C++", taken from Pedro's C++ branch. Only files built on x86 with --enable-targets=all are modified, so the native files for other arches will need to be dealt with separately. I built-tested this with --enable-targets=all and reg-tested. To my surprise, a test case (selftest.exp) had to be adjusted. Here's the ChangeLog entry. Again, this was relatively quick to make despite the length, thanks to David Malcom's script, although I don't believe it's very useful information in that particular case... gdb/ChangeLog: * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. * ada-lang.c (ada_inferior_data_cleanup): Likewise. (get_ada_inferior_data): Likewise. (get_ada_pspace_data): Likewise. (ada_pspace_data_cleanup): Likewise. (ada_complete_symbol_matcher): Likewise. (ada_exc_search_name_matches): Likewise. * ada-tasks.c (get_ada_tasks_pspace_data): Likewise. (get_ada_tasks_inferior_data): Likewise. * addrmap.c (addrmap_mutable_foreach_worker): Likewise. (splay_obstack_alloc): Likewise. (splay_obstack_free): Likewise. * alpha-linux-tdep.c (alpha_linux_supply_gregset): Likewise. (alpha_linux_collect_gregset): Likewise. (alpha_linux_supply_fpregset): Likewise. (alpha_linux_collect_fpregset): Likewise. * alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise. * alpha-tdep.c (alpha_lds): Likewise. (alpha_sts): Likewise. (alpha_sigtramp_frame_unwind_cache): Likewise. (alpha_heuristic_frame_unwind_cache): Likewise. (alpha_supply_int_regs): Likewise. (alpha_fill_int_regs): Likewise. (alpha_supply_fp_regs): Likewise. (alpha_fill_fp_regs): Likewise. * alphanbsd-tdep.c (alphanbsd_supply_fpregset): Likewise. (alphanbsd_aout_supply_gregset): Likewise. (alphanbsd_supply_gregset): Likewise. * amd64-linux-tdep.c (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-nat.c (amd64_supply_native_gregset): Likewise. (amd64_collect_native_gregset): Likewise. * amd64-tdep.c (amd64_frame_cache): Likewise. (amd64_sigtramp_frame_cache): Likewise. (amd64_epilogue_frame_cache): Likewise. (amd64_supply_fxsave): Likewise. (amd64_supply_xsave): Likewise. (amd64_collect_fxsave): Likewise. (amd64_collect_xsave): Likewise. * amd64-windows-tdep.c (amd64_windows_frame_cache): Likewise. * amd64obsd-tdep.c (amd64obsd_trapframe_cache): Likewise. * arm-linux-tdep.c (arm_linux_supply_gregset): Likewise. (arm_linux_collect_gregset): Likewise. (arm_linux_supply_nwfpe): Likewise. (arm_linux_collect_nwfpe): Likewise. (arm_linux_supply_vfp): Likewise. (arm_linux_collect_vfp): Likewise. * arm-tdep.c (arm_find_mapping_symbol): Likewise. (arm_prologue_unwind_stop_reason): Likewise. (arm_prologue_this_id): Likewise. (arm_prologue_prev_register): Likewise. (arm_exidx_data_free): Likewise. (arm_find_exidx_entry): Likewise. (arm_stub_this_id): Likewise. (arm_m_exception_this_id): Likewise. (arm_m_exception_prev_register): Likewise. (arm_normal_frame_base): Likewise. (gdb_print_insn_arm): Likewise. (arm_objfile_data_free): Likewise. (arm_record_special_symbol): Likewise. (value_of_arm_user_reg): Likewise. * armbsd-tdep.c (armbsd_supply_fpregset): Likewise. (armbsd_supply_gregset): Likewise. * auto-load.c (auto_load_pspace_data_cleanup): Likewise. (get_auto_load_pspace_data): Likewise. (hash_loaded_script_entry): Likewise. (eq_loaded_script_entry): Likewise. (clear_section_scripts): Likewise. (collect_matching_scripts): Likewise. * auxv.c (auxv_inferior_data_cleanup): Likewise. (get_auxv_inferior_data): Likewise. * avr-tdep.c (avr_frame_unwind_cache): Likewise. * ax-general.c (do_free_agent_expr_cleanup): Likewise. * bfd-target.c (target_bfd_xfer_partial): Likewise. (target_bfd_xclose): Likewise. (target_bfd_get_section_table): Likewise. * bfin-tdep.c (bfin_frame_cache): Likewise. * block.c (find_block_in_blockvector): Likewise. (call_site_for_pc): Likewise. (block_find_non_opaque_type_preferred): Likewise. * break-catch-sig.c (signal_catchpoint_insert_location): Likewise. (signal_catchpoint_remove_location): Likewise. (signal_catchpoint_breakpoint_hit): Likewise. (signal_catchpoint_print_one): Likewise. (signal_catchpoint_print_mention): Likewise. (signal_catchpoint_print_recreate): Likewise. * break-catch-syscall.c (get_catch_syscall_inferior_data): Likewise. * breakpoint.c (do_cleanup_counted_command_line): Likewise. (bp_location_compare_addrs): Likewise. (get_first_locp_gte_addr): Likewise. (check_tracepoint_command): Likewise. (do_map_commands_command): Likewise. (get_breakpoint_objfile_data): Likewise. (free_breakpoint_probes): Likewise. (do_captured_breakpoint_query): Likewise. (compare_breakpoints): Likewise. (bp_location_compare): Likewise. (bpstat_remove_breakpoint_callback): Likewise. (do_delete_breakpoint_cleanup): Likewise. * bsd-uthread.c (bsd_uthread_set_supply_uthread): Likewise. (bsd_uthread_set_collect_uthread): Likewise. (bsd_uthread_activate): Likewise. (bsd_uthread_fetch_registers): Likewise. (bsd_uthread_store_registers): Likewise. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt_raw): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. (do_btrace_data_cleanup): Likewise. * c-typeprint.c (find_typedef_for_canonicalize): Likewise. * charset.c (cleanup_iconv): Likewise. (do_cleanup_iterator): Likewise. * cli-out.c (cli_uiout_dtor): Likewise. (cli_table_begin): Likewise. (cli_table_body): Likewise. (cli_table_end): Likewise. (cli_table_header): Likewise. (cli_begin): Likewise. (cli_end): Likewise. (cli_field_int): Likewise. (cli_field_skip): Likewise. (cli_field_string): Likewise. (cli_field_fmt): Likewise. (cli_spaces): Likewise. (cli_text): Likewise. (cli_message): Likewise. (cli_wrap_hint): Likewise. (cli_flush): Likewise. (cli_redirect): Likewise. (out_field_fmt): Likewise. (field_separator): Likewise. (cli_out_set_stream): Likewise. * cli/cli-cmds.c (compare_symtabs): Likewise. * cli/cli-dump.c (call_dump_func): Likewise. (restore_section_callback): Likewise. * cli/cli-script.c (clear_hook_in_cleanup): Likewise. (do_restore_user_call_depth): Likewise. (do_free_command_lines_cleanup): Likewise. * coff-pe-read.c (get_section_vmas): Likewise. (pe_as16): Likewise. (pe_as32): Likewise. * coffread.c (coff_symfile_read): Likewise. * common/agent.c (agent_look_up_symbols): Likewise. * common/filestuff.c (do_close_cleanup): Likewise. * common/format.c (free_format_pieces_cleanup): Likewise. * common/vec.c (vec_o_reserve): Likewise. * compile/compile-c-support.c (print_one_macro): Likewise. * compile/compile-c-symbols.c (hash_symbol_error): Likewise. (eq_symbol_error): Likewise. (del_symbol_error): Likewise. (error_symbol_once): Likewise. (gcc_convert_symbol): Likewise. (gcc_symbol_address): Likewise. (hash_symname): Likewise. (eq_symname): Likewise. * compile/compile-c-types.c (hash_type_map_instance): Likewise. (eq_type_map_instance): Likewise. (insert_type): Likewise. (convert_type): Likewise. * compile/compile-object-load.c (munmap_listp_free_cleanup): Likewise. (setup_sections): Likewise. (link_hash_table_free): Likewise. (copy_sections): Likewise. * compile/compile-object-run.c (do_module_cleanup): Likewise. * compile/compile.c (compile_print_value): Likewise. (do_rmdir): Likewise. (cleanup_compile_instance): Likewise. (cleanup_unlink_file): Likewise. * completer.c (free_completion_tracker): Likewise. * corelow.c (add_to_spuid_list): Likewise. * cp-namespace.c (reset_directive_searched): Likewise. * cp-support.c (reset_directive_searched): Likewise. * cris-tdep.c (cris_sigtramp_frame_unwind_cache): Likewise. (cris_frame_unwind_cache): Likewise. * d-lang.c (builtin_d_type): Likewise. * d-namespace.c (reset_directive_searched): Likewise. * dbxread.c (dbx_free_symfile_info): Likewise. (do_free_bincl_list_cleanup): Likewise. * disasm.c (hash_dis_line_entry): Likewise. (eq_dis_line_entry): Likewise. (dis_asm_print_address): Likewise. (fprintf_disasm): Likewise. (do_ui_file_delete): Likewise. * doublest.c (convert_floatformat_to_doublest): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Likewise. (dummy_frame_prev_register): Likewise. (dummy_frame_this_id): Likewise. * dwarf2-frame-tailcall.c (cache_hash): Likewise. (cache_eq): Likewise. (cache_find): Likewise. (tailcall_frame_this_id): Likewise. (dwarf2_tailcall_prev_register_first): Likewise. (tailcall_frame_prev_register): Likewise. (tailcall_frame_dealloc_cache): Likewise. (tailcall_frame_prev_arch): Likewise. * dwarf2-frame.c (dwarf2_frame_state_free): Likewise. (dwarf2_frame_set_init_reg): Likewise. (dwarf2_frame_init_reg): Likewise. (dwarf2_frame_set_signal_frame_p): Likewise. (dwarf2_frame_signal_frame_p): Likewise. (dwarf2_frame_set_adjust_regnum): Likewise. (dwarf2_frame_adjust_regnum): Likewise. (clear_pointer_cleanup): Likewise. (dwarf2_frame_cache): Likewise. (find_cie): Likewise. (dwarf2_frame_find_fde): Likewise. * dwarf2expr.c (dwarf_expr_address_type): Likewise. (free_dwarf_expr_context_cleanup): Likewise. * dwarf2loc.c (locexpr_find_frame_base_location): Likewise. (locexpr_get_frame_base): Likewise. (loclist_find_frame_base_location): Likewise. (loclist_get_frame_base): Likewise. (dwarf_expr_dwarf_call): Likewise. (dwarf_expr_get_base_type): Likewise. (dwarf_expr_push_dwarf_reg_entry_value): Likewise. (dwarf_expr_get_obj_addr): Likewise. (entry_data_value_coerce_ref): Likewise. (entry_data_value_copy_closure): Likewise. (entry_data_value_free_closure): Likewise. (get_frame_address_in_block_wrapper): Likewise. (dwarf2_evaluate_property): Likewise. (dwarf2_compile_property_to_c): Likewise. (needs_frame_read_addr_from_reg): Likewise. (needs_frame_get_reg_value): Likewise. (needs_frame_frame_base): Likewise. (needs_frame_frame_cfa): Likewise. (needs_frame_tls_address): Likewise. (needs_frame_dwarf_call): Likewise. (needs_dwarf_reg_entry_value): Likewise. (get_ax_pc): Likewise. (locexpr_read_variable): Likewise. (locexpr_read_variable_at_entry): Likewise. (locexpr_read_needs_frame): Likewise. (locexpr_describe_location): Likewise. (locexpr_tracepoint_var_ref): Likewise. (locexpr_generate_c_location): Likewise. (loclist_read_variable): Likewise. (loclist_read_variable_at_entry): Likewise. (loclist_describe_location): Likewise. (loclist_tracepoint_var_ref): Likewise. (loclist_generate_c_location): Likewise. * dwarf2read.c (line_header_hash_voidp): Likewise. (line_header_eq_voidp): Likewise. (dwarf2_has_info): Likewise. (dwarf2_get_section_info): Likewise. (locate_dwz_sections): Likewise. (hash_file_name_entry): Likewise. (eq_file_name_entry): Likewise. (delete_file_name_entry): Likewise. (dw2_setup): Likewise. (dw2_get_file_names_reader): Likewise. (dw2_find_pc_sect_compunit_symtab): Likewise. (hash_signatured_type): Likewise. (eq_signatured_type): Likewise. (add_signatured_type_cu_to_table): Likewise. (create_debug_types_hash_table): Likewise. (lookup_dwo_signatured_type): Likewise. (lookup_dwp_signatured_type): Likewise. (lookup_signatured_type): Likewise. (hash_type_unit_group): Likewise. (eq_type_unit_group): Likewise. (get_type_unit_group): Likewise. (process_psymtab_comp_unit_reader): Likewise. (sort_tu_by_abbrev_offset): Likewise. (process_skeletonless_type_unit): Likewise. (psymtabs_addrmap_cleanup): Likewise. (dwarf2_read_symtab): Likewise. (psymtab_to_symtab_1): Likewise. (die_hash): Likewise. (die_eq): Likewise. (load_full_comp_unit_reader): Likewise. (reset_die_in_process): Likewise. (free_cu_line_header): Likewise. (handle_DW_AT_stmt_list): Likewise. (hash_dwo_file): Likewise. (eq_dwo_file): Likewise. (hash_dwo_unit): Likewise. (eq_dwo_unit): Likewise. (create_dwo_cu_reader): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (lookup_dwo_unit_in_dwp): Likewise. (dwarf2_locate_dwo_sections): Likewise. (dwarf2_locate_common_dwp_sections): Likewise. (dwarf2_locate_v2_dwp_sections): Likewise. (hash_dwp_loaded_cutus): Likewise. (eq_dwp_loaded_cutus): Likewise. (lookup_dwo_cutu): Likewise. (abbrev_table_free_cleanup): Likewise. (dwarf2_free_abbrev_table): Likewise. (find_partial_die_in_comp_unit): Likewise. (free_line_header_voidp): Likewise. (follow_die_offset): Likewise. (follow_die_sig_1): Likewise. (free_heap_comp_unit): Likewise. (free_stack_comp_unit): Likewise. (dwarf2_free_objfile): Likewise. (per_cu_offset_and_type_hash): Likewise. (per_cu_offset_and_type_eq): Likewise. (get_die_type_at_offset): Likewise. (partial_die_hash): Likewise. (partial_die_eq): Likewise. (dwarf2_per_objfile_free): Likewise. (hash_strtab_entry): Likewise. (eq_strtab_entry): Likewise. (add_string): Likewise. (hash_symtab_entry): Likewise. (eq_symtab_entry): Likewise. (delete_symtab_entry): Likewise. (cleanup_mapped_symtab): Likewise. (add_indices_to_cpool): Likewise. (hash_psymtab_cu_index): Likewise. (eq_psymtab_cu_index): Likewise. (add_address_entry_worker): Likewise. (unlink_if_set): Likewise. (write_one_signatured_type): Likewise. (save_gdb_index_command): Likewise. * elfread.c (elf_symtab_read): Likewise. (elf_gnu_ifunc_cache_hash): Likewise. (elf_gnu_ifunc_cache_eq): Likewise. (elf_gnu_ifunc_record_cache): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_get_probes): Likewise. (probe_key_free): Likewise. * f-lang.c (builtin_f_type): Likewise. * frame-base.c (frame_base_append_sniffer): Likewise. (frame_base_set_default): Likewise. (frame_base_find_by_frame): Likewise. * frame-unwind.c (frame_unwind_prepend_unwinder): Likewise. (frame_unwind_append_unwinder): Likewise. (frame_unwind_find_by_frame): Likewise. * frame.c (frame_addr_hash): Likewise. (frame_addr_hash_eq): Likewise. (frame_stash_find): Likewise. (do_frame_register_read): Likewise. (unwind_to_current_frame): Likewise. (frame_cleanup_after_sniffer): Likewise. * frv-linux-tdep.c (frv_linux_sigtramp_frame_cache): Likewise. * frv-tdep.c (frv_frame_unwind_cache): Likewise. * ft32-tdep.c (ft32_frame_cache): Likewise. * gcore.c (do_bfd_delete_cleanup): Likewise. (gcore_create_callback): Likewise. * gdb_bfd.c (hash_bfd): Likewise. (eq_bfd): Likewise. (gdb_bfd_open): Likewise. (free_one_bfd_section): Likewise. (gdb_bfd_ref): Likewise. (gdb_bfd_unref): Likewise. (get_section_descriptor): Likewise. (gdb_bfd_map_section): Likewise. (gdb_bfd_crc): Likewise. (gdb_bfd_mark_parent): Likewise. (gdb_bfd_record_inclusion): Likewise. (gdb_bfd_requires_relocations): Likewise. (print_one_bfd): Likewise. * gdbtypes.c (type_pair_hash): Likewise. (type_pair_eq): Likewise. (builtin_type): Likewise. (objfile_type): Likewise. * gnu-v3-abi.c (vtable_ptrdiff_type): Likewise. (vtable_address_point_offset): Likewise. (gnuv3_get_vtable): Likewise. (hash_value_and_voffset): Likewise. (eq_value_and_voffset): Likewise. (compare_value_and_voffset): Likewise. (compute_vtable_size): Likewise. (gnuv3_get_typeid_type): Likewise. * go-lang.c (builtin_go_type): Likewise. * guile/scm-block.c (bkscm_hash_block_smob): Likewise. (bkscm_eq_block_smob): Likewise. (bkscm_objfile_block_map): Likewise. (bkscm_del_objfile_blocks): Likewise. * guile/scm-breakpoint.c (bpscm_build_bp_list): Likewise. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Likewise. (gdbscm_disasm_print_address): Likewise. * guile/scm-frame.c (frscm_hash_frame_smob): Likewise. (frscm_eq_frame_smob): Likewise. (frscm_inferior_frame_map): Likewise. (frscm_del_inferior_frames): Likewise. * guile/scm-gsmob.c (gdbscm_add_objfile_ref): Likewise. * guile/scm-objfile.c (ofscm_handle_objfile_deleted): Likewise. (ofscm_objfile_smob_from_objfile): Likewise. * guile/scm-ports.c (ioscm_write): Likewise. (ioscm_file_port_delete): Likewise. (ioscm_file_port_rewind): Likewise. (ioscm_file_port_put): Likewise. (ioscm_file_port_write): Likewise. * guile/scm-progspace.c (psscm_handle_pspace_deleted): Likewise. (psscm_pspace_smob_from_pspace): Likewise. * guile/scm-safe-call.c (scscm_recording_pre_unwind_handler): Likewise. (scscm_recording_unwind_handler): Likewise. (gdbscm_with_catch): Likewise. (scscm_call_0_body): Likewise. (scscm_call_1_body): Likewise. (scscm_call_2_body): Likewise. (scscm_call_3_body): Likewise. (scscm_call_4_body): Likewise. (scscm_apply_1_body): Likewise. (scscm_eval_scheme_string): Likewise. (gdbscm_safe_eval_string): Likewise. (scscm_source_scheme_script): Likewise. (gdbscm_safe_source_script): Likewise. * guile/scm-string.c (gdbscm_call_scm_to_stringn): Likewise. (gdbscm_call_scm_from_stringn): Likewise. * guile/scm-symbol.c (syscm_hash_symbol_smob): Likewise. (syscm_eq_symbol_smob): Likewise. (syscm_get_symbol_map): Likewise. (syscm_del_objfile_symbols): Likewise. * guile/scm-symtab.c (stscm_hash_symtab_smob): Likewise. (stscm_eq_symtab_smob): Likewise. (stscm_objfile_symtab_map): Likewise. (stscm_del_objfile_symtabs): Likewise. * guile/scm-type.c (tyscm_hash_type_smob): Likewise. (tyscm_eq_type_smob): Likewise. (tyscm_type_map): Likewise. (tyscm_copy_type_recursive): Likewise. (save_objfile_types): Likewise. * guile/scm-utils.c (extract_arg): Likewise. * h8300-tdep.c (h8300_frame_cache): Likewise. * hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Likewise. * hppa-tdep.c (compare_unwind_entries): Likewise. (find_unwind_entry): Likewise. (hppa_frame_cache): Likewise. (hppa_stub_frame_unwind_cache): Likewise. * hppanbsd-tdep.c (hppanbsd_supply_gregset): Likewise. * hppaobsd-tdep.c (hppaobsd_supply_gregset): Likewise. (hppaobsd_supply_fpregset): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. * i386-linux-tdep.c (i386_linux_init_abi): Likewise. * i386-tdep.c (i386_frame_cache): Likewise. (i386_epilogue_frame_cache): Likewise. (i386_sigtramp_frame_cache): Likewise. (i386_supply_gregset): Likewise. (i386_collect_gregset): Likewise. (i386_gdbarch_init): Likewise. * i386obsd-tdep.c (i386obsd_aout_supply_regset): Likewise. (i386obsd_trapframe_cache): Likewise. * i387-tdep.c (i387_supply_fsave): Likewise. (i387_collect_fsave): Likewise. (i387_supply_fxsave): Likewise. (i387_collect_fxsave): Likewise. (i387_supply_xsave): Likewise. (i387_collect_xsave): Likewise. * ia64-tdep.c (ia64_frame_cache): Likewise. (ia64_sigtramp_frame_cache): Likewise. * infcmd.c (attach_command_continuation): Likewise. (attach_command_continuation_free_args): Likewise. * inferior.c (restore_inferior): Likewise. (delete_thread_of_inferior): Likewise. * inflow.c (inflow_inferior_data_cleanup): Likewise. (get_inflow_inferior_data): Likewise. (inflow_inferior_exit): Likewise. * infrun.c (displaced_step_clear_cleanup): Likewise. (restore_current_uiout_cleanup): Likewise. (release_stop_context_cleanup): Likewise. (do_restore_infcall_suspend_state_cleanup): Likewise. (do_restore_infcall_control_state_cleanup): Likewise. (restore_inferior_ptid): Likewise. * inline-frame.c (block_starting_point_at): Likewise. * iq2000-tdep.c (iq2000_frame_cache): Likewise. * jit.c (get_jit_objfile_data): Likewise. (get_jit_program_space_data): Likewise. (jit_object_close_impl): Likewise. (jit_find_objf_with_entry_addr): Likewise. (jit_breakpoint_deleted): Likewise. (jit_unwind_reg_set_impl): Likewise. (jit_unwind_reg_get_impl): Likewise. (jit_dealloc_cache): Likewise. (jit_frame_sniffer): Likewise. (jit_frame_prev_register): Likewise. (jit_prepend_unwinder): Likewise. (jit_inferior_exit_hook): Likewise. (free_objfile_data): Likewise. * jv-lang.c (jv_per_objfile_free): Likewise. (get_dynamics_objfile): Likewise. (get_java_class_symtab): Likewise. (builtin_java_type): Likewise. * language.c (language_string_char_type): Likewise. (language_bool_type): Likewise. (language_lookup_primitive_type): Likewise. (language_lookup_primitive_type_as_symbol): Likewise. * linespec.c (hash_address_entry): Likewise. (eq_address_entry): Likewise. (iterate_inline_only): Likewise. (iterate_name_matcher): Likewise. (decode_line_2_compare_items): Likewise. (collect_one_symbol): Likewise. (compare_symbols): Likewise. (compare_msymbols): Likewise. (add_symtabs_to_list): Likewise. (collect_symbols): Likewise. (compare_msyms): Likewise. (add_minsym): Likewise. (cleanup_linespec_result): Likewise. * linux-fork.c (inferior_call_waitpid_cleanup): Likewise. * linux-nat.c (delete_lwp_cleanup): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (resume_stopped_resumed_lwps): Likewise. * linux-tdep.c (get_linux_gdbarch_data): Likewise. (invalidate_linux_cache_inf): Likewise. (get_linux_inferior_data): Likewise. (linux_find_memory_regions_thunk): Likewise. (linux_make_mappings_callback): Likewise. (linux_corefile_thread_callback): Likewise. (find_mapping_size): Likewise. * linux-thread-db.c (find_new_threads_callback): Likewise. * lm32-tdep.c (lm32_frame_cache): Likewise. * m2-lang.c (builtin_m2_type): Likewise. * m32c-tdep.c (m32c_analyze_frame_prologue): Likewise. * m32r-linux-tdep.c (m32r_linux_sigtramp_frame_cache): Likewise. (m32r_linux_supply_gregset): Likewise. (m32r_linux_collect_gregset): Likewise. * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. * m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise. * m68k-tdep.c (m68k_frame_cache): Likewise. * m68kbsd-tdep.c (m68kbsd_supply_fpregset): Likewise. (m68kbsd_supply_gregset): Likewise. * m68klinux-tdep.c (m68k_linux_sigtramp_frame_cache): Likewise. * m88k-tdep.c (m88k_frame_cache): Likewise. (m88k_supply_gregset): Likewise. gdb/gdbserver/ChangeLog: * dll.c (match_dll): Add cast(s). (unloaded_dll): Likewise. * linux-low.c (second_thread_of_pid_p): Likewise. (delete_lwp_callback): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (linux_set_resume_request): Likewise. * server.c (accumulate_file_name_length): Likewise. (emit_dll_description): Likewise. (handle_qxfer_threads_worker): Likewise. (visit_actioned_threads): Likewise. * thread-db.c (any_thread_of): Likewise. * tracepoint.c (same_process_p): Likewise. (match_blocktype): Likewise. (build_traceframe_info_xml): Likewise. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (do_steps_and_nexts): Adjust expected source line.
807 lines
21 KiB
C
807 lines
21 KiB
C
/* Scheme interface to blocks.
|
||
|
||
Copyright (C) 2008-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
/* See README file in this directory for implementation notes, coding
|
||
conventions, et.al. */
|
||
|
||
#include "defs.h"
|
||
#include "block.h"
|
||
#include "dictionary.h"
|
||
#include "objfiles.h"
|
||
#include "source.h"
|
||
#include "symtab.h"
|
||
#include "guile-internal.h"
|
||
|
||
/* A smob describing a gdb block. */
|
||
|
||
typedef struct _block_smob
|
||
{
|
||
/* This always appears first.
|
||
We want blocks to be eq?-able. And we need to be able to invalidate
|
||
blocks when the associated objfile is deleted. */
|
||
eqable_gdb_smob base;
|
||
|
||
/* The GDB block structure that represents a frame's code block. */
|
||
const struct block *block;
|
||
|
||
/* The backing object file. There is no direct relationship in GDB
|
||
between a block and an object file. When a block is created also
|
||
store a pointer to the object file for later use. */
|
||
struct objfile *objfile;
|
||
} block_smob;
|
||
|
||
/* To iterate over block symbols from Scheme we need to store
|
||
struct block_iterator somewhere. This is stored in the "progress" field
|
||
of <gdb:iterator>. We store the block object in iterator_smob.object,
|
||
so we don't store it here.
|
||
|
||
Remember: While iterating over block symbols, you must continually check
|
||
whether the block is still valid. */
|
||
|
||
typedef struct
|
||
{
|
||
/* This always appears first. */
|
||
gdb_smob base;
|
||
|
||
/* The iterator for that block. */
|
||
struct block_iterator iter;
|
||
|
||
/* Has the iterator been initialized flag. */
|
||
int initialized_p;
|
||
} block_syms_progress_smob;
|
||
|
||
static const char block_smob_name[] = "gdb:block";
|
||
static const char block_syms_progress_smob_name[] = "gdb:block-symbols-iterator";
|
||
|
||
/* The tag Guile knows the block smobs by. */
|
||
static scm_t_bits block_smob_tag;
|
||
static scm_t_bits block_syms_progress_smob_tag;
|
||
|
||
/* The "next!" block syms iterator method. */
|
||
static SCM bkscm_next_symbol_x_proc;
|
||
|
||
static const struct objfile_data *bkscm_objfile_data_key;
|
||
|
||
/* Administrivia for block smobs. */
|
||
|
||
/* Helper function to hash a block_smob. */
|
||
|
||
static hashval_t
|
||
bkscm_hash_block_smob (const void *p)
|
||
{
|
||
const block_smob *b_smob = (const block_smob *) p;
|
||
|
||
return htab_hash_pointer (b_smob->block);
|
||
}
|
||
|
||
/* Helper function to compute equality of block_smobs. */
|
||
|
||
static int
|
||
bkscm_eq_block_smob (const void *ap, const void *bp)
|
||
{
|
||
const block_smob *a = (const block_smob *) ap;
|
||
const block_smob *b = (const block_smob *) bp;
|
||
|
||
return (a->block == b->block
|
||
&& a->block != NULL);
|
||
}
|
||
|
||
/* Return the struct block pointer -> SCM mapping table.
|
||
It is created if necessary. */
|
||
|
||
static htab_t
|
||
bkscm_objfile_block_map (struct objfile *objfile)
|
||
{
|
||
htab_t htab = (htab_t) objfile_data (objfile, bkscm_objfile_data_key);
|
||
|
||
if (htab == NULL)
|
||
{
|
||
htab = gdbscm_create_eqable_gsmob_ptr_map (bkscm_hash_block_smob,
|
||
bkscm_eq_block_smob);
|
||
set_objfile_data (objfile, bkscm_objfile_data_key, htab);
|
||
}
|
||
|
||
return htab;
|
||
}
|
||
|
||
/* The smob "free" function for <gdb:block>. */
|
||
|
||
static size_t
|
||
bkscm_free_block_smob (SCM self)
|
||
{
|
||
block_smob *b_smob = (block_smob *) SCM_SMOB_DATA (self);
|
||
|
||
if (b_smob->block != NULL)
|
||
{
|
||
htab_t htab = bkscm_objfile_block_map (b_smob->objfile);
|
||
|
||
gdbscm_clear_eqable_gsmob_ptr_slot (htab, &b_smob->base);
|
||
}
|
||
|
||
/* Not necessary, done to catch bugs. */
|
||
b_smob->block = NULL;
|
||
b_smob->objfile = NULL;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* The smob "print" function for <gdb:block>. */
|
||
|
||
static int
|
||
bkscm_print_block_smob (SCM self, SCM port, scm_print_state *pstate)
|
||
{
|
||
block_smob *b_smob = (block_smob *) SCM_SMOB_DATA (self);
|
||
const struct block *b = b_smob->block;
|
||
|
||
gdbscm_printf (port, "#<%s", block_smob_name);
|
||
|
||
if (BLOCK_SUPERBLOCK (b) == NULL)
|
||
gdbscm_printf (port, " global");
|
||
else if (BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (b)) == NULL)
|
||
gdbscm_printf (port, " static");
|
||
|
||
if (BLOCK_FUNCTION (b) != NULL)
|
||
gdbscm_printf (port, " %s", SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)));
|
||
|
||
gdbscm_printf (port, " %s-%s",
|
||
hex_string (BLOCK_START (b)), hex_string (BLOCK_END (b)));
|
||
|
||
scm_puts (">", port);
|
||
|
||
scm_remember_upto_here_1 (self);
|
||
|
||
/* Non-zero means success. */
|
||
return 1;
|
||
}
|
||
|
||
/* Low level routine to create a <gdb:block> object. */
|
||
|
||
static SCM
|
||
bkscm_make_block_smob (void)
|
||
{
|
||
block_smob *b_smob = (block_smob *)
|
||
scm_gc_malloc (sizeof (block_smob), block_smob_name);
|
||
SCM b_scm;
|
||
|
||
b_smob->block = NULL;
|
||
b_smob->objfile = NULL;
|
||
b_scm = scm_new_smob (block_smob_tag, (scm_t_bits) b_smob);
|
||
gdbscm_init_eqable_gsmob (&b_smob->base, b_scm);
|
||
|
||
return b_scm;
|
||
}
|
||
|
||
/* Returns non-zero if SCM is a <gdb:block> object. */
|
||
|
||
static int
|
||
bkscm_is_block (SCM scm)
|
||
{
|
||
return SCM_SMOB_PREDICATE (block_smob_tag, scm);
|
||
}
|
||
|
||
/* (block? scm) -> boolean */
|
||
|
||
static SCM
|
||
gdbscm_block_p (SCM scm)
|
||
{
|
||
return scm_from_bool (bkscm_is_block (scm));
|
||
}
|
||
|
||
/* Return the existing object that encapsulates BLOCK, or create a new
|
||
<gdb:block> object. */
|
||
|
||
SCM
|
||
bkscm_scm_from_block (const struct block *block, struct objfile *objfile)
|
||
{
|
||
htab_t htab;
|
||
eqable_gdb_smob **slot;
|
||
block_smob *b_smob, b_smob_for_lookup;
|
||
SCM b_scm;
|
||
|
||
/* If we've already created a gsmob for this block, return it.
|
||
This makes blocks eq?-able. */
|
||
htab = bkscm_objfile_block_map (objfile);
|
||
b_smob_for_lookup.block = block;
|
||
slot = gdbscm_find_eqable_gsmob_ptr_slot (htab, &b_smob_for_lookup.base);
|
||
if (*slot != NULL)
|
||
return (*slot)->containing_scm;
|
||
|
||
b_scm = bkscm_make_block_smob ();
|
||
b_smob = (block_smob *) SCM_SMOB_DATA (b_scm);
|
||
b_smob->block = block;
|
||
b_smob->objfile = objfile;
|
||
gdbscm_fill_eqable_gsmob_ptr_slot (slot, &b_smob->base);
|
||
|
||
return b_scm;
|
||
}
|
||
|
||
/* Returns the <gdb:block> object in SELF.
|
||
Throws an exception if SELF is not a <gdb:block> object. */
|
||
|
||
static SCM
|
||
bkscm_get_block_arg_unsafe (SCM self, int arg_pos, const char *func_name)
|
||
{
|
||
SCM_ASSERT_TYPE (bkscm_is_block (self), self, arg_pos, func_name,
|
||
block_smob_name);
|
||
|
||
return self;
|
||
}
|
||
|
||
/* Returns a pointer to the block smob of SELF.
|
||
Throws an exception if SELF is not a <gdb:block> object. */
|
||
|
||
static block_smob *
|
||
bkscm_get_block_smob_arg_unsafe (SCM self, int arg_pos, const char *func_name)
|
||
{
|
||
SCM b_scm = bkscm_get_block_arg_unsafe (self, arg_pos, func_name);
|
||
block_smob *b_smob = (block_smob *) SCM_SMOB_DATA (b_scm);
|
||
|
||
return b_smob;
|
||
}
|
||
|
||
/* Returns non-zero if block B_SMOB is valid. */
|
||
|
||
static int
|
||
bkscm_is_valid (block_smob *b_smob)
|
||
{
|
||
return b_smob->block != NULL;
|
||
}
|
||
|
||
/* Returns the block smob in SELF, verifying it's valid.
|
||
Throws an exception if SELF is not a <gdb:block> object or is invalid. */
|
||
|
||
static block_smob *
|
||
bkscm_get_valid_block_smob_arg_unsafe (SCM self, int arg_pos,
|
||
const char *func_name)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_block_smob_arg_unsafe (self, arg_pos, func_name);
|
||
|
||
if (!bkscm_is_valid (b_smob))
|
||
{
|
||
gdbscm_invalid_object_error (func_name, arg_pos, self,
|
||
_("<gdb:block>"));
|
||
}
|
||
|
||
return b_smob;
|
||
}
|
||
|
||
/* Returns the block smob contained in SCM or NULL if SCM is not a
|
||
<gdb:block> object.
|
||
If there is an error a <gdb:exception> object is stored in *EXCP. */
|
||
|
||
static block_smob *
|
||
bkscm_get_valid_block (SCM scm, int arg_pos, const char *func_name, SCM *excp)
|
||
{
|
||
block_smob *b_smob;
|
||
|
||
if (!bkscm_is_block (scm))
|
||
{
|
||
*excp = gdbscm_make_type_error (func_name, arg_pos, scm,
|
||
block_smob_name);
|
||
return NULL;
|
||
}
|
||
|
||
b_smob = (block_smob *) SCM_SMOB_DATA (scm);
|
||
if (!bkscm_is_valid (b_smob))
|
||
{
|
||
*excp = gdbscm_make_invalid_object_error (func_name, arg_pos, scm,
|
||
_("<gdb:block>"));
|
||
return NULL;
|
||
}
|
||
|
||
return b_smob;
|
||
}
|
||
|
||
/* Returns the struct block that is wrapped by BLOCK_SCM.
|
||
If BLOCK_SCM is not a block, or is an invalid block, then NULL is returned
|
||
and a <gdb:exception> object is stored in *EXCP. */
|
||
|
||
const struct block *
|
||
bkscm_scm_to_block (SCM block_scm, int arg_pos, const char *func_name,
|
||
SCM *excp)
|
||
{
|
||
block_smob *b_smob;
|
||
|
||
b_smob = bkscm_get_valid_block (block_scm, arg_pos, func_name, excp);
|
||
|
||
if (b_smob != NULL)
|
||
return b_smob->block;
|
||
return NULL;
|
||
}
|
||
|
||
/* Helper function for bkscm_del_objfile_blocks to mark the block
|
||
as invalid. */
|
||
|
||
static int
|
||
bkscm_mark_block_invalid (void **slot, void *info)
|
||
{
|
||
block_smob *b_smob = (block_smob *) *slot;
|
||
|
||
b_smob->block = NULL;
|
||
b_smob->objfile = NULL;
|
||
return 1;
|
||
}
|
||
|
||
/* This function is called when an objfile is about to be freed.
|
||
Invalidate the block as further actions on the block would result
|
||
in bad data. All access to b_smob->block should be gated by
|
||
checks to ensure the block is (still) valid. */
|
||
|
||
static void
|
||
bkscm_del_objfile_blocks (struct objfile *objfile, void *datum)
|
||
{
|
||
htab_t htab = (htab_t) datum;
|
||
|
||
if (htab != NULL)
|
||
{
|
||
htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL);
|
||
htab_delete (htab);
|
||
}
|
||
}
|
||
|
||
/* Block methods. */
|
||
|
||
/* (block-valid? <gdb:block>) -> boolean
|
||
Returns #t if SELF still exists in GDB. */
|
||
|
||
static SCM
|
||
gdbscm_block_valid_p (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
|
||
return scm_from_bool (bkscm_is_valid (b_smob));
|
||
}
|
||
|
||
/* (block-start <gdb:block>) -> address */
|
||
|
||
static SCM
|
||
gdbscm_block_start (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
|
||
return gdbscm_scm_from_ulongest (BLOCK_START (block));
|
||
}
|
||
|
||
/* (block-end <gdb:block>) -> address */
|
||
|
||
static SCM
|
||
gdbscm_block_end (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
|
||
return gdbscm_scm_from_ulongest (BLOCK_END (block));
|
||
}
|
||
|
||
/* (block-function <gdb:block>) -> <gdb:symbol> */
|
||
|
||
static SCM
|
||
gdbscm_block_function (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
struct symbol *sym;
|
||
|
||
sym = BLOCK_FUNCTION (block);
|
||
|
||
if (sym != NULL)
|
||
return syscm_scm_from_symbol (sym);
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
/* (block-superblock <gdb:block>) -> <gdb:block> */
|
||
|
||
static SCM
|
||
gdbscm_block_superblock (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
const struct block *super_block;
|
||
|
||
super_block = BLOCK_SUPERBLOCK (block);
|
||
|
||
if (super_block)
|
||
return bkscm_scm_from_block (super_block, b_smob->objfile);
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
/* (block-global-block <gdb:block>) -> <gdb:block>
|
||
Returns the global block associated to this block. */
|
||
|
||
static SCM
|
||
gdbscm_block_global_block (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
const struct block *global_block;
|
||
|
||
global_block = block_global_block (block);
|
||
|
||
return bkscm_scm_from_block (global_block, b_smob->objfile);
|
||
}
|
||
|
||
/* (block-static-block <gdb:block>) -> <gdb:block>
|
||
Returns the static block associated to this block.
|
||
Returns #f if we cannot get the static block (this is the global block). */
|
||
|
||
static SCM
|
||
gdbscm_block_static_block (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
const struct block *static_block;
|
||
|
||
if (BLOCK_SUPERBLOCK (block) == NULL)
|
||
return SCM_BOOL_F;
|
||
|
||
static_block = block_static_block (block);
|
||
|
||
return bkscm_scm_from_block (static_block, b_smob->objfile);
|
||
}
|
||
|
||
/* (block-global? <gdb:block>) -> boolean
|
||
Returns #t if this block object is a global block. */
|
||
|
||
static SCM
|
||
gdbscm_block_global_p (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
|
||
return scm_from_bool (BLOCK_SUPERBLOCK (block) == NULL);
|
||
}
|
||
|
||
/* (block-static? <gdb:block>) -> boolean
|
||
Returns #t if this block object is a static block. */
|
||
|
||
static SCM
|
||
gdbscm_block_static_p (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
|
||
if (BLOCK_SUPERBLOCK (block) != NULL
|
||
&& BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) == NULL)
|
||
return SCM_BOOL_T;
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
/* (block-symbols <gdb:block>) -> list of <gdb:symbol objects
|
||
Returns a list of symbols of the block. */
|
||
|
||
static SCM
|
||
gdbscm_block_symbols (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
struct block_iterator iter;
|
||
struct symbol *sym;
|
||
SCM result;
|
||
|
||
result = SCM_EOL;
|
||
|
||
sym = block_iterator_first (block, &iter);
|
||
|
||
while (sym != NULL)
|
||
{
|
||
SCM s_scm = syscm_scm_from_symbol (sym);
|
||
|
||
result = scm_cons (s_scm, result);
|
||
sym = block_iterator_next (&iter);
|
||
}
|
||
|
||
return scm_reverse_x (result, SCM_EOL);
|
||
}
|
||
|
||
/* The <gdb:block-symbols-iterator> object,
|
||
for iterating over all symbols in a block. */
|
||
|
||
/* The smob "print" function for <gdb:block-symbols-iterator>. */
|
||
|
||
static int
|
||
bkscm_print_block_syms_progress_smob (SCM self, SCM port,
|
||
scm_print_state *pstate)
|
||
{
|
||
block_syms_progress_smob *i_smob
|
||
= (block_syms_progress_smob *) SCM_SMOB_DATA (self);
|
||
|
||
gdbscm_printf (port, "#<%s", block_syms_progress_smob_name);
|
||
|
||
if (i_smob->initialized_p)
|
||
{
|
||
switch (i_smob->iter.which)
|
||
{
|
||
case GLOBAL_BLOCK:
|
||
case STATIC_BLOCK:
|
||
{
|
||
struct compunit_symtab *cust;
|
||
|
||
gdbscm_printf (port, " %s",
|
||
i_smob->iter.which == GLOBAL_BLOCK
|
||
? "global" : "static");
|
||
if (i_smob->iter.idx != -1)
|
||
gdbscm_printf (port, " @%d", i_smob->iter.idx);
|
||
cust = (i_smob->iter.idx == -1
|
||
? i_smob->iter.d.compunit_symtab
|
||
: i_smob->iter.d.compunit_symtab->includes[i_smob->iter.idx]);
|
||
gdbscm_printf (port, " %s",
|
||
symtab_to_filename_for_display
|
||
(compunit_primary_filetab (cust)));
|
||
break;
|
||
}
|
||
case FIRST_LOCAL_BLOCK:
|
||
gdbscm_printf (port, " single block");
|
||
break;
|
||
}
|
||
}
|
||
else
|
||
gdbscm_printf (port, " !initialized");
|
||
|
||
scm_puts (">", port);
|
||
|
||
scm_remember_upto_here_1 (self);
|
||
|
||
/* Non-zero means success. */
|
||
return 1;
|
||
}
|
||
|
||
/* Low level routine to create a <gdb:block-symbols-progress> object. */
|
||
|
||
static SCM
|
||
bkscm_make_block_syms_progress_smob (void)
|
||
{
|
||
block_syms_progress_smob *i_smob = (block_syms_progress_smob *)
|
||
scm_gc_malloc (sizeof (block_syms_progress_smob),
|
||
block_syms_progress_smob_name);
|
||
SCM smob;
|
||
|
||
memset (&i_smob->iter, 0, sizeof (i_smob->iter));
|
||
i_smob->initialized_p = 0;
|
||
smob = scm_new_smob (block_syms_progress_smob_tag, (scm_t_bits) i_smob);
|
||
gdbscm_init_gsmob (&i_smob->base);
|
||
|
||
return smob;
|
||
}
|
||
|
||
/* Returns non-zero if SCM is a <gdb:block-symbols-progress> object. */
|
||
|
||
static int
|
||
bkscm_is_block_syms_progress (SCM scm)
|
||
{
|
||
return SCM_SMOB_PREDICATE (block_syms_progress_smob_tag, scm);
|
||
}
|
||
|
||
/* (block-symbols-progress? scm) -> boolean */
|
||
|
||
static SCM
|
||
bkscm_block_syms_progress_p (SCM scm)
|
||
{
|
||
return scm_from_bool (bkscm_is_block_syms_progress (scm));
|
||
}
|
||
|
||
/* (make-block-symbols-iterator <gdb:block>) -> <gdb:iterator>
|
||
Return a <gdb:iterator> object for iterating over the symbols of SELF. */
|
||
|
||
static SCM
|
||
gdbscm_make_block_syms_iter (SCM self)
|
||
{
|
||
block_smob *b_smob
|
||
= bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
const struct block *block = b_smob->block;
|
||
SCM progress, iter;
|
||
|
||
progress = bkscm_make_block_syms_progress_smob ();
|
||
|
||
iter = gdbscm_make_iterator (self, progress, bkscm_next_symbol_x_proc);
|
||
|
||
return iter;
|
||
}
|
||
|
||
/* Returns the next symbol in the iteration through the block's dictionary,
|
||
or (end-of-iteration).
|
||
This is the iterator_smob.next_x method. */
|
||
|
||
static SCM
|
||
gdbscm_block_next_symbol_x (SCM self)
|
||
{
|
||
SCM progress, iter_scm, block_scm;
|
||
iterator_smob *iter_smob;
|
||
block_smob *b_smob;
|
||
const struct block *block;
|
||
block_syms_progress_smob *p_smob;
|
||
struct symbol *sym;
|
||
|
||
iter_scm = itscm_get_iterator_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
|
||
iter_smob = (iterator_smob *) SCM_SMOB_DATA (iter_scm);
|
||
|
||
block_scm = itscm_iterator_smob_object (iter_smob);
|
||
b_smob = bkscm_get_valid_block_smob_arg_unsafe (block_scm,
|
||
SCM_ARG1, FUNC_NAME);
|
||
block = b_smob->block;
|
||
|
||
progress = itscm_iterator_smob_progress (iter_smob);
|
||
|
||
SCM_ASSERT_TYPE (bkscm_is_block_syms_progress (progress),
|
||
progress, SCM_ARG1, FUNC_NAME,
|
||
block_syms_progress_smob_name);
|
||
p_smob = (block_syms_progress_smob *) SCM_SMOB_DATA (progress);
|
||
|
||
if (!p_smob->initialized_p)
|
||
{
|
||
sym = block_iterator_first (block, &p_smob->iter);
|
||
p_smob->initialized_p = 1;
|
||
}
|
||
else
|
||
sym = block_iterator_next (&p_smob->iter);
|
||
|
||
if (sym == NULL)
|
||
return gdbscm_end_of_iteration ();
|
||
|
||
return syscm_scm_from_symbol (sym);
|
||
}
|
||
|
||
/* (lookup-block address) -> <gdb:block>
|
||
Returns the innermost lexical block containing the specified pc value,
|
||
or #f if there is none. */
|
||
|
||
static SCM
|
||
gdbscm_lookup_block (SCM pc_scm)
|
||
{
|
||
CORE_ADDR pc;
|
||
const struct block *block = NULL;
|
||
struct compunit_symtab *cust = NULL;
|
||
|
||
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, NULL, "U", pc_scm, &pc);
|
||
|
||
TRY
|
||
{
|
||
cust = find_pc_compunit_symtab (pc);
|
||
|
||
if (cust != NULL && COMPUNIT_OBJFILE (cust) != NULL)
|
||
block = block_for_pc (pc);
|
||
}
|
||
CATCH (except, RETURN_MASK_ALL)
|
||
{
|
||
GDBSCM_HANDLE_GDB_EXCEPTION (except);
|
||
}
|
||
END_CATCH
|
||
|
||
if (cust == NULL || COMPUNIT_OBJFILE (cust) == NULL)
|
||
{
|
||
gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, pc_scm,
|
||
_("cannot locate object file for block"));
|
||
}
|
||
|
||
if (block != NULL)
|
||
return bkscm_scm_from_block (block, COMPUNIT_OBJFILE (cust));
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
/* Initialize the Scheme block support. */
|
||
|
||
static const scheme_function block_functions[] =
|
||
{
|
||
{ "block?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_p),
|
||
"\
|
||
Return #t if the object is a <gdb:block> object." },
|
||
|
||
{ "block-valid?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_valid_p),
|
||
"\
|
||
Return #t if the block is valid.\n\
|
||
A block becomes invalid when its objfile is freed." },
|
||
|
||
{ "block-start", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_start),
|
||
"\
|
||
Return the start address of the block." },
|
||
|
||
{ "block-end", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_end),
|
||
"\
|
||
Return the end address of the block." },
|
||
|
||
{ "block-function", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_function),
|
||
"\
|
||
Return the gdb:symbol object of the function containing the block\n\
|
||
or #f if the block does not live in any function." },
|
||
|
||
{ "block-superblock", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_superblock),
|
||
"\
|
||
Return the superblock (parent block) of the block." },
|
||
|
||
{ "block-global-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_global_block),
|
||
"\
|
||
Return the global block of the block." },
|
||
|
||
{ "block-static-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_static_block),
|
||
"\
|
||
Return the static block of the block." },
|
||
|
||
{ "block-global?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_global_p),
|
||
"\
|
||
Return #t if block is a global block." },
|
||
|
||
{ "block-static?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_static_p),
|
||
"\
|
||
Return #t if block is a static block." },
|
||
|
||
{ "block-symbols", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_symbols),
|
||
"\
|
||
Return a list of all symbols (as <gdb:symbol> objects) in the block." },
|
||
|
||
{ "make-block-symbols-iterator", 1, 0, 0,
|
||
as_a_scm_t_subr (gdbscm_make_block_syms_iter),
|
||
"\
|
||
Return a <gdb:iterator> object for iterating over all symbols in the block." },
|
||
|
||
{ "block-symbols-progress?", 1, 0, 0,
|
||
as_a_scm_t_subr (bkscm_block_syms_progress_p),
|
||
"\
|
||
Return #t if the object is a <gdb:block-symbols-progress> object." },
|
||
|
||
{ "lookup-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_lookup_block),
|
||
"\
|
||
Return the innermost GDB block containing the address or #f if none found.\n\
|
||
\n\
|
||
Arguments:\n\
|
||
address: the address to lookup" },
|
||
|
||
END_FUNCTIONS
|
||
};
|
||
|
||
void
|
||
gdbscm_initialize_blocks (void)
|
||
{
|
||
block_smob_tag
|
||
= gdbscm_make_smob_type (block_smob_name, sizeof (block_smob));
|
||
scm_set_smob_free (block_smob_tag, bkscm_free_block_smob);
|
||
scm_set_smob_print (block_smob_tag, bkscm_print_block_smob);
|
||
|
||
block_syms_progress_smob_tag
|
||
= gdbscm_make_smob_type (block_syms_progress_smob_name,
|
||
sizeof (block_syms_progress_smob));
|
||
scm_set_smob_print (block_syms_progress_smob_tag,
|
||
bkscm_print_block_syms_progress_smob);
|
||
|
||
gdbscm_define_functions (block_functions, 1);
|
||
|
||
/* This function is "private". */
|
||
bkscm_next_symbol_x_proc
|
||
= scm_c_define_gsubr ("%block-next-symbol!", 1, 0, 0,
|
||
as_a_scm_t_subr (gdbscm_block_next_symbol_x));
|
||
scm_set_procedure_property_x (bkscm_next_symbol_x_proc,
|
||
gdbscm_documentation_symbol,
|
||
gdbscm_scm_from_c_string ("\
|
||
Internal function to assist the block symbols iterator."));
|
||
|
||
/* Register an objfile "free" callback so we can properly
|
||
invalidate blocks when an object file is about to be deleted. */
|
||
bkscm_objfile_data_key
|
||
= register_objfile_data_with_cleanup (NULL, bkscm_del_objfile_blocks);
|
||
}
|