diff options
127 files changed, 1404 insertions, 701 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1baed6a9956..26266c6ba0a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,514 @@ 2015-09-25 Simon Marchi <simon.marchi@ericsson.com> + * macrocmd.c (print_macro_callback): Add cast(s). + * macrotab.c (macro_bcache_str): Likewise. + (new_macro_definition): Likewise. + * main.c (captured_main): Likewise. + * maint.c (print_bfd_section_info): Likewise. + * mdebugread.c (mdebug_build_psymtabs): Likewise. + (basic_type): Likewise. + * memattr.c (mem_region_cmp): Likewise. + * memory-map.c (memory_map_start_memory): Likewise. + (memory_map_end_memory): Likewise. + (memory_map_start_property): Likewise. + (memory_map_end_property): Likewise. + (clear_result): Likewise. + * memrange.c (compare_mem_ranges): Likewise. + * mep-tdep.c (mep_analyze_frame_prologue): Likewise. + * mi/mi-cmd-var.c (mi_cmd_var_update_iter): Likewise. + * mi/mi-console.c (mi_console_file_delete): Likewise. + (mi_console_file_fputs): Likewise. + (mi_console_raw_packet): Likewise. + (mi_console_file_flush): Likewise. + (mi_console_set_raw): Likewise. + * mi/mi-interp.c (mi_interpreter_resume): Likewise. + (mi_new_thread): Likewise. + (mi_thread_exit): Likewise. + (mi_record_changed): Likewise. + (mi_inferior_added): Likewise. + (mi_inferior_appeared): Likewise. + (mi_inferior_exit): Likewise. + (mi_inferior_removed): Likewise. + (mi_interp_data): Likewise. + (mi_on_normal_stop): Likewise. + (mi_traceframe_changed): Likewise. + (mi_tsv_created): Likewise. + (mi_tsv_deleted): Likewise. + (mi_tsv_modified): Likewise. + (mi_breakpoint_created): Likewise. + (mi_breakpoint_deleted): Likewise. + (mi_breakpoint_modified): Likewise. + (mi_output_running_pid): Likewise. + (mi_inferior_count): Likewise. + (mi_solib_loaded): Likewise. + (mi_solib_unloaded): Likewise. + (mi_command_param_changed): Likewise. + (mi_memory_changed): Likewise. + (report_initial_inferior): Likewise. + (mi_ui_out): Likewise. + (mi_set_logging): Likewise. + * mi/mi-main.c (collect_cores): Likewise. + (print_one_inferior): Likewise. + (free_vector_of_ints): Likewise. + (free_splay_tree): Likewise. + (mi_execute_command): Likewise. + * mi/mi-out.c (mi_table_body): Likewise. + (mi_table_end): Likewise. + (mi_table_header): Likewise. + (mi_begin): Likewise. + (mi_end): Likewise. + (mi_field_int): Likewise. + (mi_field_string): Likewise. + (mi_field_fmt): Likewise. + (mi_flush): Likewise. + (mi_redirect): Likewise. + (field_separator): Likewise. + (mi_open): Likewise. + (mi_close): Likewise. + (mi_out_buffered): Likewise. + (mi_out_rewind): Likewise. + (mi_out_put): Likewise. + (mi_version): Likewise. + (mi_out_data_dtor): Likewise. + * mi/mi-parse.c (mi_parse_cleanup): Likewise. + * microblaze-tdep.c (microblaze_frame_cache): Likewise. + * minidebug.c (lzma_open): Likewise. + (lzma_pread): Likewise. + (lzma_close): Likewise. + (lzma_stat): Likewise. + * mips-linux-tdep.c (mips_linux_init_abi): Likewise. + * mips-sde-tdep.c (mips_sde_frame_cache): Likewise. + (mips_sde_elf_osabi_sniff_abi_tag_sections): Likewise. + * mips-tdep.c (mips_insn16_frame_cache): Likewise. + (mips_micro_frame_cache): Likewise. + (mips_insn32_frame_cache): Likewise. + (mips_stub_frame_cache): Likewise. + (gdb_print_insn_mips): Likewise. + (value_of_mips_user_reg): Likewise. + (mips_gdbarch_init): Likewise. + * mips64obsd-tdep.c (mips64obsd_supply_gregset): Likewise. + * mipsnbsd-tdep.c (mipsnbsd_supply_fpregset): Likewise. + (mipsnbsd_supply_gregset): Likewise. + * mn10300-linux-tdep.c (am33_supply_fpregset_method): Likewise. + (am33_collect_gregset_method): Likewise. + (am33_collect_fpregset_method): Likewise. + * mn10300-tdep.c (mn10300_analyze_frame_prologue): Likewise. + * moxie-tdep.c (moxie_frame_cache): Likewise. + * msp430-tdep.c (msp430_get_opcode_byte): Likewise. + (msp430_analyze_frame_prologue): Likewise. + * mt-tdep.c (mt_frame_unwind_cache): Likewise. + * nios2-linux-tdep.c (nios2_supply_gregset): Likewise. + (nios2_collect_gregset): Likewise. + * nios2-tdep.c (nios2_frame_unwind_cache): Likewise. + (nios2_stub_frame_cache): Likewise. + * objc-lang.c (find_methods): Likewise. + * objfiles.c (objfiles_pspace_data_cleanup): Likewise. + (get_objfile_pspace_data): Likewise. + (get_objfile_bfd_data): Likewise. + (objfile_bfd_data_free): Likewise. + (add_to_objfile_sections): Likewise. + (do_free_objfile_cleanup): Likewise. + (resume_section_map_updates_cleanup): Likewise. + * opencl-lang.c (builtin_opencl_type): Likewise. + * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. + * osdata.c (osdata_start_osdata): Likewise. + (osdata_start_item): Likewise. + (osdata_start_column): Likewise. + (osdata_end_column): Likewise. + (clear_parsing_data): Likewise. + (osdata_free_cleanup): Likewise. + * parse.c (type_stack_cleanup): Likewise. + (exp_uses_objfile_iter): Likewise. + * ppc-linux-tdep.c (ppc_linux_supply_gregset): Likewise. + (ppc_linux_collect_gregset): Likewise. + (ppu2spu_prev_arch): Likewise. + (ppu2spu_this_id): Likewise. + (ppu2spu_prev_register): Likewise. + (ppu2spu_unwind_register): Likewise. + (ppu2spu_sniffer): Likewise. + (ppu2spu_dealloc_cache): Likewise. + (ppc_linux_init_abi): Likewise. + * ppcfbsd-tdep.c (ppcfbsd_sigtramp_frame_cache): Likewise. + * ppcobsd-tdep.c (ppcobsd_sigtramp_frame_cache): Likewise. + * progspace.c (restore_program_space): Likewise. + * psymtab.c (find_pc_sect_psymtab): Likewise. + (compare_psymbols): Likewise. + (psymbol_bcache_full): Likewise. + (allocate_psymtab): Likewise. + (discard_psymtabs_upto): Likewise. + * python/py-block.c (set_block): Likewise. + (del_objfile_blocks): Likewise. + * python/py-breakpoint.c (build_bp_list): Likewise. + * python/py-inferior.c (inferior_to_inferior_object): Likewise. + (build_inferior_list): Likewise. + (py_free_inferior): Likewise. + * python/py-objfile.c (py_free_objfile): Likewise. + (objfile_to_objfile_object): Likewise. + * python/py-prettyprint.c (py_restore_tstate): Likewise. + * python/py-progspace.c (py_free_pspace): Likewise. + (pspace_to_pspace_object): Likewise. + * python/py-symbol.c (set_symbol): Likewise. + (del_objfile_symbols): Likewise. + * python/py-symtab.c (set_sal): Likewise. + (set_symtab): Likewise. + (del_objfile_symtab): Likewise. + (del_objfile_sal): Likewise. + * python/py-type.c (save_objfile_types): Likewise. + (set_type): Likewise. + * python/py-unwind.c (pyuw_prev_register): Likewise. + (pyuw_on_new_gdbarch): Likewise. + * python/py-utils.c (py_decref): Likewise. + (py_xdecref): Likewise. + (gdb_py_generic_dict): Likewise. + * python/py-xmethods.c (gdbpy_free_xmethod_worker_data): Likewise. + (gdbpy_clone_xmethod_worker_data): Likewise. + (gdbpy_get_xmethod_arg_types): Likewise. + (gdbpy_get_xmethod_result_type): Likewise. + (gdbpy_invoke_xmethod): Likewise. + * python/python.c (gdbpy_apply_type_printers): Likewise. + (gdbpy_free_type_printers): Likewise. + * record-btrace.c (record_btrace_disable_callback): Likewise. + (bfcache_hash): Likewise. + (bfcache_eq): Likewise. + (btrace_get_frame_function): Likewise. + (record_btrace_frame_unwind_stop_reason): Likewise. + (record_btrace_frame_this_id): Likewise. + (record_btrace_frame_prev_register): Likewise. + (record_btrace_frame_dealloc_cache): Likewise. + * record-full.c (record_full_message_wrapper): Likewise. + (record_full_save_cleanups): Likewise. + * regcache.c (regcache_descr): Likewise. + (do_regcache_xfree): Likewise. + (do_regcache_invalidate): Likewise. + (do_cooked_read): Likewise. + (regcache_transfer_regset): Likewise. + * reggroups.c (reggroup_add): Likewise. + (reggroup_next): Likewise. + (reggroup_prev): Likewise. + * remote-fileio.c (do_remote_fileio_request): Likewise. + * remote-notif.c (remote_async_get_pending_events_handler): Likewise. + (do_notif_event_xfree): Likewise. + * remote.c (get_remote_arch_state): Likewise. + (remote_pspace_data_cleanup): Likewise. + (get_remote_exec_file): Likewise. + (set_pspace_remote_exec_file): Likewise. + (compare_pnums): Likewise. + (clear_threads_listing_context): Likewise. + (remote_newthread_step): Likewise. + (start_thread): Likewise. + (end_thread): Likewise. + (remove_child_of_pending_fork): Likewise. + (remove_stop_reply_for_inferior): Likewise. + (remove_stop_reply_of_remote_state): Likewise. + (remote_notif_remove_once_on_match): Likewise. + (stop_reply_match_ptid_and_ws): Likewise. + (kill_child_of_pending_fork): Likewise. + (register_remote_g_packet_guess): Likewise. + (remote_read_description_p): Likewise. + (remote_read_description): Likewise. + (free_actions_list_cleanup_wrapper): Likewise. + (remote_async_serial_handler): Likewise. + * rl78-tdep.c (rl78_get_opcode_byte): Likewise. + (rl78_analyze_frame_prologue): Likewise. + * rs6000-tdep.c (ppc_supply_gregset): Likewise. + (ppc_supply_fpregset): Likewise. + (ppc_supply_vsxregset): Likewise. + (ppc_supply_vrregset): Likewise. + (ppc_collect_gregset): Likewise. + (ppc_collect_fpregset): Likewise. + (ppc_collect_vsxregset): Likewise. + (ppc_collect_vrregset): Likewise. + (e500_move_ev_register): Likewise. + (do_regcache_raw_write): Likewise. + (rs6000_frame_cache): Likewise. + (rs6000_epilogue_frame_cache): Likewise. + (rs6000_gdbarch_init): Likewise. + * rx-tdep.c (rx_get_opcode_byte): Likewise. + (rx_analyze_frame_prologue): Likewise. + (rx_frame_type): Likewise. + (rx_frame_sniffer_common): Likewise. + * s390-linux-tdep.c (s390_check_for_saved): Likewise. + (s390_frame_unwind_cache): Likewise. + (s390_stub_frame_unwind_cache): Likewise. + (s390_sigtramp_frame_unwind_cache): Likewise. + * score-tdep.c (score_make_prologue_cache): Likewise. + * sentinel-frame.c (sentinel_frame_prev_register): Likewise. + (sentinel_frame_prev_arch): Likewise. + * ser-base.c (fd_event): Likewise. + (push_event): Likewise. + (ser_base_write): Likewise. + * ser-pipe.c (pipe_close): Likewise. + * serial.c (serial_write): Likewise. + * sh-tdep.c (sh_frame_cache): Likewise. + (sh_stub_this_id): Likewise. + * sh64-tdep.c (sh64_frame_cache): Likewise. + * solib-aix.c (get_solib_aix_inferior_data): Likewise. + (library_list_start_library): Likewise. + (library_list_start_list): Likewise. + (solib_aix_free_library_list): Likewise. + * solib-darwin.c (get_darwin_info): Likewise. + * solib-dsbt.c (get_dsbt_info): Likewise. + * solib-spu.c (append_ocl_sos): Likewise. + * solib-svr4.c (svr4_pspace_data_cleanup): Likewise. + (get_svr4_info): Likewise. + (library_list_start_library): Likewise. + (svr4_library_list_start_list): Likewise. + (hash_probe_and_action): Likewise. + (equal_probe_and_action): Likewise. + (svr4_update_solib_event_breakpoint): Likewise. + (set_solib_svr4_fetch_link_map_offsets): Likewise. + (svr4_fetch_link_map_offsets): Likewise. + (svr4_have_link_map_offsets): Likewise. + * solib-target.c (library_list_start_segment): Likewise. + (library_list_start_section): Likewise. + (library_list_start_library): Likewise. + (library_list_end_library): Likewise. + (library_list_start_list): Likewise. + (solib_target_free_library_list): Likewise. + * solib.c (solib_ops): Likewise. + (set_solib_ops): Likewise. + * sparc-sol2-tdep.c (sparc32_sol2_sigtramp_frame_cache): Likewise. + * sparc-tdep.c (sparc_frame_cache): Likewise. + (sparc32_frame_cache): Likewise. + (sparc32_supply_gregset): Likewise. + (sparc32_collect_gregset): Likewise. + (sparc32_supply_fpregset): Likewise. + (sparc32_collect_fpregset): Likewise. + * sparc64-sol2-tdep.c (sparc64_sol2_sigtramp_frame_cache): Likewise. + * sparc64-tdep.c (sparc64_supply_gregset): Likewise. + (sparc64_collect_gregset): Likewise. + (sparc64_supply_fpregset): Likewise. + (sparc64_collect_fpregset): Likewise. + * sparc64fbsd-tdep.c (sparc64fbsd_sigtramp_frame_cache): Likewise. + * sparc64nbsd-tdep.c (sparc64nbsd_sigcontext_frame_cache): Likewise. + * sparc64obsd-tdep.c (sparc64obsd_frame_cache): Likewise. + (sparc64obsd_trapframe_cache): Likewise. + * sparcnbsd-tdep.c (sparc32nbsd_sigcontext_frame_cache): Likewise. + * sparcobsd-tdep.c (sparc32obsd_sigtramp_frame_cache): Likewise. + * spu-multiarch.c (spu_gdbarch): Likewise. + * spu-tdep.c (spu_frame_unwind_cache): Likewise. + (spu2ppu_prev_arch): Likewise. + (spu2ppu_this_id): Likewise. + (spu2ppu_prev_register): Likewise. + (spu2ppu_dealloc_cache): Likewise. + (spu_dis_asm_print_address): Likewise. + (gdb_print_insn_spu): Likewise. + (spu_get_overlay_table): Likewise. + * stabsread.c (rs6000_builtin_type): Likewise. + * stack.c (do_print_variable_and_value): Likewise. + * stap-probe.c (get_stap_base_address_1): Likewise. + * symfile-debug.c (debug_qf_has_symbols): Likewise. + (debug_qf_find_last_source_symtab): Likewise. + (debug_qf_forget_cached_source_info): Likewise. + (debug_qf_map_symtabs_matching_filename): Likewise. + (debug_qf_lookup_symbol): Likewise. + (debug_qf_print_stats): Likewise. + (debug_qf_dump): Likewise. + (debug_qf_relocate): Likewise. + (debug_qf_expand_symtabs_for_function): Likewise. + (debug_qf_expand_all_symtabs): Likewise. + (debug_qf_expand_symtabs_with_fullname): Likewise. + (debug_qf_map_matching_symbols): Likewise. + (debug_qf_expand_symtabs_matching): Likewise. + (debug_qf_find_pc_sect_compunit_symtab): Likewise. + (debug_qf_map_symbol_filenames): Likewise. + (debug_sym_get_probes): Likewise. + (debug_sym_new_init): Likewise. + (debug_sym_init): Likewise. + (debug_sym_read): Likewise. + (debug_sym_read_psymbols): Likewise. + (debug_sym_finish): Likewise. + (debug_sym_offsets): Likewise. + (debug_sym_read_linetable): Likewise. + (debug_sym_relocate): Likewise. + (uninstall_symfile_debug_logging): Likewise. + * symfile-mem.c (symbol_file_add_from_memory_wrapper): Likewise. + * symfile.c (place_section): Likewise. + (add_section_size_callback): Likewise. + (load_progress): Likewise. + (load_section_callback): Likewise. + (clear_memory_write_data): Likewise. + (allocate_symtab): Likewise. + * symmisc.c (maintenance_expand_file_matcher): Likewise. + * symtab.c (lookup_symtab_callback): Likewise. + (hash_demangled_name_entry): Likewise. + (eq_demangled_name_entry): Likewise. + (get_symbol_cache): Likewise. + (symbol_cache_cleanup): Likewise. + (set_symbol_cache_size): Likewise. + (symbol_cache_flush): Likewise. + (maintenance_print_symbol_cache): Likewise. + (maintenance_print_symbol_cache_statistics): Likewise. + (delete_filename_seen_cache): Likewise. + (output_partial_symbol_filename): Likewise. + (search_symbols_file_matches): Likewise. + (search_symbols_name_matches): Likewise. + (do_free_completion_list): Likewise. + (maybe_add_partial_symtab_filename): Likewise. + (get_main_info): Likewise. + (main_info_cleanup): Likewise. + * target-dcache.c (target_dcache_cleanup): Likewise. + (target_dcache_init_p): Likewise. + (target_dcache_invalidate): Likewise. + (target_dcache_get): Likewise. + (target_dcache_get_or_init): Likewise. + * target-descriptions.c (target_find_description): Likewise. + (tdesc_find_type): Likewise. + (tdesc_data_cleanup): Likewise. + (tdesc_find_arch_register): Likewise. + (tdesc_register_name): Likewise. + (tdesc_register_type): Likewise. + (tdesc_register_reggroup_p): Likewise. + (set_tdesc_pseudo_register_name): Likewise. + (set_tdesc_pseudo_register_type): Likewise. + (set_tdesc_pseudo_register_reggroup_p): Likewise. + (tdesc_use_registers): Likewise. + (free_target_description): Likewise. + * target-memory.c (compare_block_starting_address): Likewise. + (cleanup_request_data): Likewise. + (cleanup_write_requests_vector): Likewise. + * target.c (open_target): Likewise. + (cleanup_restore_target_terminal): Likewise. + (free_memory_read_result_vector): Likewise. + * thread.c (disable_thread_stack_temporaries): Likewise. + (finish_thread_state_cleanup): Likewise. + (do_restore_current_thread_cleanup): Likewise. + (restore_current_thread_cleanup_dtor): Likewise. + (set_thread_refcount): Likewise. + (tp_array_compar): Likewise. + (do_captured_thread_select): Likewise. + * tic6x-tdep.c (tic6x_frame_unwind_cache): Likewise. + (tic6x_stub_this_id): Likewise. + * tilegx-tdep.c (tilegx_frame_cache): Likewise. + * top.c (do_restore_instream_cleanup): Likewise. + (gdb_readline_wrapper_cleanup): Likewise. + (kill_or_detach): Likewise. + (print_inferior_quit_action): Likewise. + * tracefile-tfile.c (match_blocktype): Likewise. + (build_traceframe_info): Likewise. + * tracefile.c (trace_file_writer_xfree): Likewise. + * tracepoint.c (memrange_cmp): Likewise. + (do_collect_symbol): Likewise. + (do_clear_collection_list): Likewise. + (do_restore_current_traceframe_cleanup): Likewise. + (restore_current_traceframe_cleanup_dtor): Likewise. + (free_current_marker): Likewise. + (traceframe_info_start_memory): Likewise. + (traceframe_info_start_tvar): Likewise. + (free_result): Likewise. + * tramp-frame.c (tramp_frame_cache): Likewise. + * tui/tui-file.c (tui_file_delete): Likewise. + (tui_fileopen): Likewise. + (tui_sfileopen): Likewise. + (tui_file_isatty): Likewise. + (tui_file_rewind): Likewise. + (tui_file_put): Likewise. + (tui_file_fputs): Likewise. + (tui_file_get_strbuf): Likewise. + (tui_file_adjust_strbuf): Likewise. + (tui_file_flush): Likewise. + * tui/tui-layout.c (make_command_window): Likewise. + (make_data_window): Likewise. + (show_source_disasm_command): Likewise. + (show_data): Likewise. + (make_source_or_disasm_window): Likewise. + (show_source_or_disasm_and_command): Likewise. + * tui/tui-out.c (tui_field_int): Likewise. + (tui_field_string): Likewise. + (tui_field_fmt): Likewise. + (tui_text): Likewise. + * typeprint.c (hash_typedef_field): Likewise. + (eq_typedef_field): Likewise. + (do_free_typedef_hash): Likewise. + (copy_typedef_hash_element): Likewise. + (do_free_global_table): Likewise. + (find_global_typedef): Likewise. + (find_typedef_in_hash): Likewise. + * ui-file.c (ui_file_write_for_put): Likewise. + (do_ui_file_xstrdup): Likewise. + (mem_file_delete): Likewise. + (mem_file_rewind): Likewise. + (mem_file_put): Likewise. + (mem_file_write): Likewise. + (stdio_file_delete): Likewise. + (stdio_file_flush): Likewise. + (stdio_file_read): Likewise. + (stdio_file_write): Likewise. + (stdio_file_write_async_safe): Likewise. + (stdio_file_fputs): Likewise. + (stdio_file_isatty): Likewise. + (stdio_file_fseek): Likewise. + (tee_file_delete): Likewise. + (tee_file_flush): Likewise. + (tee_file_write): Likewise. + (tee_file_fputs): Likewise. + (tee_file_isatty): Likewise. + * ui-out.c (do_cleanup_table_end): Likewise. + (do_cleanup_end): Likewise. + * user-regs.c (user_reg_add): Likewise. + (user_reg_map_name_to_regnum): Likewise. + (usernum_to_user_reg): Likewise. + (maintenance_print_user_registers): Likewise. + * utils.c (do_bfd_close_cleanup): Likewise. + (do_fclose_cleanup): Likewise. + (do_obstack_free): Likewise. + (do_ui_file_delete): Likewise. + (do_ui_out_redirect_pop): Likewise. + (do_free_section_addr_info): Likewise. + (restore_integer): Likewise. + (do_unpush_target): Likewise. + (do_htab_delete_cleanup): Likewise. + (do_restore_ui_file): Likewise. + (do_value_free): Likewise. + (do_free_so): Likewise. + (free_current_contents): Likewise. + (do_regfree_cleanup): Likewise. + (core_addr_hash): Likewise. + (core_addr_eq): Likewise. + (do_free_char_ptr_vec): Likewise. + * v850-tdep.c (v850_frame_cache): Likewise. + * varobj.c (do_free_variable_cleanup): Likewise. + * vax-tdep.c (vax_supply_gregset): Likewise. + (vax_frame_cache): Likewise. + * vaxobsd-tdep.c (vaxobsd_sigtramp_frame_cache): Likewise. + * xml-support.c (gdb_xml_body_text): Likewise. + (gdb_xml_values_cleanup): Likewise. + (gdb_xml_start_element): Likewise. + (gdb_xml_start_element_wrapper): Likewise. + (gdb_xml_end_element): Likewise. + (gdb_xml_end_element_wrapper): Likewise. + (gdb_xml_cleanup): Likewise. + (gdb_xml_fetch_external_entity): Likewise. + (gdb_xml_parse_attr_enum): Likewise. + (xinclude_start_include): Likewise. + (xinclude_end_include): Likewise. + (xml_xinclude_default): Likewise. + (xml_xinclude_start_doctype): Likewise. + (xml_xinclude_end_doctype): Likewise. + (xml_xinclude_cleanup): Likewise. + (xml_fetch_content_from_file): Likewise. + * xml-syscall.c (free_syscalls_info): Likewise. + (syscall_start_syscall): Likewise. + * xml-tdesc.c (tdesc_end_arch): Likewise. + (tdesc_end_osabi): Likewise. + (tdesc_end_compatible): Likewise. + (tdesc_start_target): Likewise. + (tdesc_start_feature): Likewise. + (tdesc_start_reg): Likewise. + (tdesc_start_union): Likewise. + (tdesc_start_struct): Likewise. + (tdesc_start_flags): Likewise. + (tdesc_start_field): Likewise. + (tdesc_start_vector): Likewise. + (fetch_available_features_from_target): Likewise. + * xstormy16-tdep.c (xstormy16_frame_cache): Likewise. + * xtensa-tdep.c (xtensa_supply_gregset): Likewise. + (xtensa_frame_cache): Likewise. + (xtensa_frame_prev_register): Likewise. + (xtensa_extract_return_value): Likewise. + +2015-09-25 Simon Marchi <simon.marchi@ericsson.com> + * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c index 2eb9dffd4fc..aca4fdc953d 100644 --- a/gdb/macrocmd.c +++ b/gdb/macrocmd.c @@ -196,7 +196,7 @@ print_macro_callback (const char *name, const struct macro_definition *macro, struct macro_source_file *source, int line, void *user_data) { - if (! user_data || strcmp (user_data, name) == 0) + if (! user_data || strcmp ((const char *) user_data, name) == 0) print_macro_definition (name, macro, source, line); } diff --git a/gdb/macrotab.c b/gdb/macrotab.c index 9245c7c1f96..435b3f1b2be 100644 --- a/gdb/macrotab.c +++ b/gdb/macrotab.c @@ -130,7 +130,7 @@ macro_bcache (struct macro_table *t, const void *addr, int len) static const char * macro_bcache_str (struct macro_table *t, const char *s) { - return macro_bcache (t, s, strlen (s) + 1); + return (const char *) macro_bcache (t, s, strlen (s) + 1); } @@ -575,7 +575,8 @@ new_macro_definition (struct macro_table *t, cached_argv[i] = macro_bcache_str (t, argv[i]); /* Now bcache the array of argument pointers itself. */ - d->argv = macro_bcache (t, cached_argv, cached_argv_size); + d->argv = ((const char * const *) + macro_bcache (t, cached_argv, cached_argv_size)); } /* We don't bcache the entire definition structure because it's got diff --git a/gdb/main.c b/gdb/main.c index aecd60afe6c..49c9b686bb0 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -437,7 +437,7 @@ DEF_VEC_O (cmdarg_s); static int captured_main (void *data) { - struct captured_main_args *context = data; + struct captured_main_args *context = (struct captured_main_args *) data; int argc = context->argc; char **argv = context->argv; static int quiet = 0; diff --git a/gdb/maint.c b/gdb/maint.c index 5d7fca50f1c..c95f645eb3e 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -303,7 +303,7 @@ print_bfd_section_info (bfd *abfd, { flagword flags = bfd_get_section_flags (abfd, asect); const char *name = bfd_section_name (abfd, asect); - const char *arg = datum; + const char *arg = (const char *) datum; if (arg == NULL || *arg == '\0' || match_substring (arg, name) diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 7a81592c0c1..8109ee3a867 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -359,7 +359,7 @@ mdebug_build_psymtabs (struct objfile *objfile, info->fdr = (FDR *) obstack_alloc (&objfile->objfile_obstack, (info->symbolic_header.ifdMax * sizeof (FDR))); - fdr_src = info->external_fdr; + fdr_src = (char *) info->external_fdr; fdr_end = (fdr_src + info->symbolic_header.ifdMax * swap->external_fdr_size); fdr_ptr = info->fdr; @@ -1348,7 +1348,8 @@ static struct type * basic_type (int bt, struct objfile *objfile) { struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct type **map_bt = objfile_data (objfile, basic_type_data); + struct type **map_bt + = (struct type **) objfile_data (objfile, basic_type_data); struct type *tp; if (bt >= btMax) diff --git a/gdb/memattr.c b/gdb/memattr.c index a2aac074927..40381c56a9d 100644 --- a/gdb/memattr.c +++ b/gdb/memattr.c @@ -98,8 +98,8 @@ mem_region_lessthan (const struct mem_region *lhs, int mem_region_cmp (const void *untyped_lhs, const void *untyped_rhs) { - const struct mem_region *lhs = untyped_lhs; - const struct mem_region *rhs = untyped_rhs; + const struct mem_region *lhs = (const struct mem_region *) untyped_lhs; + const struct mem_region *rhs = (const struct mem_region *) untyped_rhs; if (lhs->lo < rhs->lo) return -1; diff --git a/gdb/memory-map.c b/gdb/memory-map.c index 77eb93e781b..d56b14c861b 100644 --- a/gdb/memory-map.c +++ b/gdb/memory-map.c @@ -55,13 +55,17 @@ memory_map_start_memory (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct memory_map_parsing_data *data = user_data; + struct memory_map_parsing_data *data + = (struct memory_map_parsing_data *) user_data; struct mem_region *r = VEC_safe_push (mem_region_s, *data->memory_map, NULL); ULONGEST *start_p, *length_p, *type_p; - start_p = xml_find_attribute (attributes, "start")->value; - length_p = xml_find_attribute (attributes, "length")->value; - type_p = xml_find_attribute (attributes, "type")->value; + start_p + = (long unsigned int *) xml_find_attribute (attributes, "start")->value; + length_p + = (long unsigned int *) xml_find_attribute (attributes, "length")->value; + type_p + = (long unsigned int *) xml_find_attribute (attributes, "type")->value; mem_region_init (r); r->lo = *start_p; @@ -78,7 +82,8 @@ memory_map_end_memory (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct memory_map_parsing_data *data = user_data; + struct memory_map_parsing_data *data + = (struct memory_map_parsing_data *) user_data; struct mem_region *r = VEC_last (mem_region_s, *data->memory_map); if (r->attrib.mode == MEM_FLASH && r->attrib.blocksize == -1) @@ -93,10 +98,11 @@ memory_map_start_property (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct memory_map_parsing_data *data = user_data; + struct memory_map_parsing_data *data + = (struct memory_map_parsing_data *) user_data; char *name; - name = xml_find_attribute (attributes, "name")->value; + name = (char *) xml_find_attribute (attributes, "name")->value; snprintf (data->property_name, sizeof (data->property_name), "%s", name); } @@ -107,7 +113,8 @@ memory_map_end_property (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct memory_map_parsing_data *data = user_data; + struct memory_map_parsing_data *data + = (struct memory_map_parsing_data *) user_data; char *name = data->property_name; if (strcmp (name, "blocksize") == 0) @@ -125,7 +132,7 @@ memory_map_end_property (struct gdb_xml_parser *parser, static void clear_result (void *p) { - VEC(mem_region_s) **result = p; + VEC(mem_region_s) **result = (VEC(mem_region_s) **) p; VEC_free (mem_region_s, *result); *result = NULL; } diff --git a/gdb/memrange.c b/gdb/memrange.c index e4fbb52b55e..04db5dac5ac 100644 --- a/gdb/memrange.c +++ b/gdb/memrange.c @@ -46,8 +46,8 @@ address_in_mem_range (CORE_ADDR address, const struct mem_range *r) static int compare_mem_ranges (const void *ap, const void *bp) { - const struct mem_range *r1 = ap; - const struct mem_range *r2 = bp; + const struct mem_range *r1 = (const struct mem_range *) ap; + const struct mem_range *r2 = (const struct mem_range *) bp; if (r1->start > r2->start) return 1; diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c index d6025765ae4..b3c1f77244d 100644 --- a/gdb/mep-tdep.c +++ b/gdb/mep-tdep.c @@ -1950,10 +1950,11 @@ mep_analyze_frame_prologue (struct frame_info *this_frame, stop_addr = func_start; mep_analyze_prologue (get_frame_arch (this_frame), - func_start, stop_addr, *this_prologue_cache); + func_start, stop_addr, + (struct mep_prologue *) *this_prologue_cache); } - return *this_prologue_cache; + return (struct mep_prologue *) *this_prologue_cache; } diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index ee0bbc60a35..e316812e466 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -649,7 +649,7 @@ struct mi_cmd_var_update static void mi_cmd_var_update_iter (struct varobj *var, void *data_pointer) { - struct mi_cmd_var_update *data = data_pointer; + struct mi_cmd_var_update *data = (struct mi_cmd_var_update *) data_pointer; int thread_id, thread_stopped; thread_id = varobj_get_thread_id (var); diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c index 257f452a28f..e0947e07e44 100644 --- a/gdb/mi/mi-console.c +++ b/gdb/mi/mi-console.c @@ -67,7 +67,8 @@ mi_console_file_new (struct ui_file *raw, const char *prefix, char quote) static void mi_console_file_delete (struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -79,7 +80,8 @@ mi_console_file_delete (struct ui_file *file) static void mi_console_file_fputs (const char *buf, struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -97,7 +99,7 @@ mi_console_file_fputs (const char *buf, struct ui_file *file) static void mi_console_raw_packet (void *data, const char *buf, long length_buf) { - struct mi_console_file *mi_console = data; + struct mi_console_file *mi_console = (struct mi_console_file *) data; if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -126,7 +128,8 @@ mi_console_raw_packet (void *data, const char *buf, long length_buf) static void mi_console_file_flush (struct ui_file *file) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, @@ -144,7 +147,8 @@ mi_console_file_flush (struct ui_file *file) void mi_console_set_raw (struct ui_file *file, struct ui_file *raw) { - struct mi_console_file *mi_console = ui_file_data (file); + struct mi_console_file *mi_console + = (struct mi_console_file *) ui_file_data (file); if (mi_console->magic != &mi_console_file_magic) internal_error (__FILE__, __LINE__, diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 385b975682f..b349df2c7f5 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -173,7 +173,7 @@ mi_interpreter_init (struct interp *interp, int top_level) static int mi_interpreter_resume (void *data) { - struct mi_interp *mi = data; + struct mi_interp *mi = (struct mi_interp *) data; /* As per hack note in mi_interpreter_init, swap in the output channels... */ @@ -355,7 +355,7 @@ mi_command_loop (void *data) static void mi_new_thread (struct thread_info *t) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct inferior *inf = find_inferior_ptid (t->ptid); gdb_assert (inf); @@ -378,7 +378,7 @@ mi_thread_exit (struct thread_info *t, int silent) inf = find_inferior_ptid (t->ptid); - mi = top_level_interpreter_data (); + mi = (struct mi_interp *) top_level_interpreter_data (); old_chain = make_cleanup_restore_target_terminal (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -394,7 +394,7 @@ mi_thread_exit (struct thread_info *t, int silent) static void mi_record_changed (struct inferior *inferior, int started) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); fprintf_unfiltered (mi->event_channel, "record-%s,thread-group=\"i%d\"", started ? "started" : "stopped", inferior->num); @@ -405,7 +405,7 @@ mi_record_changed (struct inferior *inferior, int started) static void mi_inferior_added (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -417,7 +417,7 @@ mi_inferior_added (struct inferior *inf) static void mi_inferior_appeared (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -429,7 +429,7 @@ mi_inferior_appeared (struct inferior *inf) static void mi_inferior_exit (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); if (inf->has_exit_code) @@ -446,7 +446,7 @@ mi_inferior_exit (struct inferior *inf) static void mi_inferior_removed (struct inferior *inf) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -484,7 +484,7 @@ mi_interp_data (void) struct interp *interp = find_mi_interpreter (); if (interp != NULL) - return interp_data (interp); + return (struct mi_interp *) interp_data (interp); return NULL; } @@ -611,7 +611,8 @@ mi_on_normal_stop (struct bpstats *bs, int print_frame) || (tp->control.command_interp != NULL && tp->control.command_interp != top_level_interpreter ())) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi + = (struct mi_interp *) top_level_interpreter_data (); print_stop_event (mi->cli_uiout); } @@ -674,7 +675,7 @@ struct mi_suppress_notification mi_suppress_notification = static void mi_traceframe_changed (int tfnum, int tpnum) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); if (mi_suppress_notification.traceframe) return; @@ -696,7 +697,7 @@ mi_traceframe_changed (int tfnum, int tpnum) static void mi_tsv_created (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); @@ -712,7 +713,7 @@ mi_tsv_created (const struct trace_state_variable *tsv) static void mi_tsv_deleted (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); target_terminal_ours (); @@ -730,7 +731,7 @@ mi_tsv_deleted (const struct trace_state_variable *tsv) static void mi_tsv_modified (const struct trace_state_variable *tsv) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -756,7 +757,7 @@ mi_tsv_modified (const struct trace_state_variable *tsv) static void mi_breakpoint_created (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.breakpoint) @@ -795,7 +796,7 @@ mi_breakpoint_created (struct breakpoint *b) static void mi_breakpoint_deleted (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); if (mi_suppress_notification.breakpoint) return; @@ -816,7 +817,7 @@ mi_breakpoint_deleted (struct breakpoint *b) static void mi_breakpoint_modified (struct breakpoint *b) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.breakpoint) @@ -853,7 +854,7 @@ mi_breakpoint_modified (struct breakpoint *b) static int mi_output_running_pid (struct thread_info *info, void *arg) { - ptid_t *ptid = arg; + ptid_t *ptid = (ptid_t *) arg; if (ptid_get_pid (*ptid) == ptid_get_pid (info->ptid)) fprintf_unfiltered (raw_stdout, @@ -868,7 +869,7 @@ mi_inferior_count (struct inferior *inf, void *arg) { if (inf->pid != 0) { - int *count_p = arg; + int *count_p = (int *) arg; (*count_p)++; } @@ -944,7 +945,7 @@ mi_on_resume (ptid_t ptid) static void mi_solib_loaded (struct so_list *solib) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -970,7 +971,7 @@ mi_solib_loaded (struct so_list *solib) static void mi_solib_unloaded (struct so_list *solib) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *uiout = interp_ui_out (top_level_interpreter ()); target_terminal_ours (); @@ -997,7 +998,7 @@ mi_solib_unloaded (struct so_list *solib) static void mi_command_param_changed (const char *param, const char *value) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); if (mi_suppress_notification.cmd_param_changed) @@ -1024,7 +1025,7 @@ static void mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr, ssize_t len, const bfd_byte *myaddr) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); struct obj_section *sec; @@ -1066,7 +1067,7 @@ report_initial_inferior (struct inferior *inf, void *closure) mi_inferior_added assumes that inferior is fully initialized and top_level_interpreter_data is set, we cannot call it here. */ - struct mi_interp *mi = closure; + struct mi_interp *mi = (struct mi_interp *) closure; target_terminal_ours (); fprintf_unfiltered (mi->event_channel, @@ -1079,7 +1080,7 @@ report_initial_inferior (struct inferior *inf, void *closure) static struct ui_out * mi_ui_out (struct interp *interp) { - struct mi_interp *mi = interp_data (interp); + struct mi_interp *mi = (struct mi_interp *) interp_data (interp); return mi->mi_uiout; } @@ -1096,7 +1097,7 @@ static int mi_set_logging (struct interp *interp, int start_log, struct ui_file *out, struct ui_file *logfile) { - struct mi_interp *mi = interp_data (interp); + struct mi_interp *mi = (struct mi_interp *) interp_data (interp); if (!mi) return 0; diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 8712a7fc74a..3ad11bb232a 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -610,7 +610,7 @@ struct collect_cores_data static int collect_cores (struct thread_info *ti, void *xdata) { - struct collect_cores_data *data = xdata; + struct collect_cores_data *data = (struct collect_cores_data *) xdata; if (ptid_get_pid (ti->ptid) == data->pid) { @@ -643,7 +643,8 @@ struct print_one_inferior_data static int print_one_inferior (struct inferior *inferior, void *xdata) { - struct print_one_inferior_data *top_data = xdata; + struct print_one_inferior_data *top_data + = (struct print_one_inferior_data *) xdata; struct ui_out *uiout = current_uiout; if (VEC_empty (int, top_data->inferiors) @@ -728,7 +729,7 @@ output_cores (struct ui_out *uiout, const char *field_name, const char *xcores) static void free_vector_of_ints (void *xvector) { - VEC (int) **vector = xvector; + VEC (int) **vector = (VEC (int) **) xvector; VEC_free (int, *vector); } @@ -759,7 +760,7 @@ splay_tree_int_comparator (splay_tree_key xa, splay_tree_key xb) static void free_splay_tree (void *xt) { - splay_tree t = xt; + splay_tree t = (splay_tree) xt; splay_tree_delete (t); } @@ -2150,7 +2151,8 @@ mi_execute_command (const char *cmd, int from_tty) =thread-selected is supposed to indicate user's intentions. */ && strcmp (command->command, "thread-select") != 0) { - struct mi_interp *mi = top_level_interpreter_data (); + struct mi_interp *mi + = (struct mi_interp *) top_level_interpreter_data (); int report_change = 0; if (command->thread == -1) diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index ef0a2df64d8..b234bbad27e 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -120,7 +120,7 @@ mi_table_begin (struct ui_out *uiout, void mi_table_body (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -134,7 +134,7 @@ mi_table_body (struct ui_out *uiout) void mi_table_end (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); data->suppress_output = 0; mi_close (uiout, ui_out_type_list); /* body */ @@ -147,7 +147,7 @@ void mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment, const char *col_name, const char *colhdr) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -166,7 +166,7 @@ void mi_begin (struct ui_out *uiout, enum ui_out_type type, int level, const char *id) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -179,7 +179,7 @@ mi_begin (struct ui_out *uiout, enum ui_out_type type, int level, void mi_end (struct ui_out *uiout, enum ui_out_type type, int level) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -194,7 +194,7 @@ mi_field_int (struct ui_out *uiout, int fldno, int width, enum ui_align alignment, const char *fldname, int value) { char buffer[20]; /* FIXME: how many chars long a %d can become? */ - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (data->suppress_output) return; @@ -218,7 +218,7 @@ void mi_field_string (struct ui_out *uiout, int fldno, int width, enum ui_align align, const char *fldname, const char *string) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream; if (data->suppress_output) @@ -241,7 +241,7 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width, enum ui_align align, const char *fldname, const char *format, va_list args) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream; if (data->suppress_output) @@ -282,7 +282,7 @@ mi_wrap_hint (struct ui_out *uiout, char *identstring) void mi_flush (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); gdb_flush (stream); @@ -291,7 +291,7 @@ mi_flush (struct ui_out *uiout) int mi_redirect (struct ui_out *uiout, struct ui_file *outstream) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (outstream != NULL) VEC_safe_push (ui_filep, data->streams, outstream); @@ -308,7 +308,7 @@ mi_redirect (struct ui_out *uiout, struct ui_file *outstream) static void field_separator (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); if (data->suppress_field_separator) @@ -320,7 +320,7 @@ field_separator (struct ui_out *uiout) static void mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); field_separator (uiout); @@ -343,7 +343,7 @@ mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) static void mi_close (struct ui_out *uiout, enum ui_out_type type) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); switch (type) @@ -365,7 +365,7 @@ mi_close (struct ui_out *uiout, enum ui_out_type type) void mi_out_buffered (struct ui_out *uiout, char *string) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); fprintf_unfiltered (stream, "%s", string); @@ -376,7 +376,7 @@ mi_out_buffered (struct ui_out *uiout, char *string) void mi_out_rewind (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file_rewind (stream); @@ -387,7 +387,7 @@ mi_out_rewind (struct ui_out *uiout) void mi_out_put (struct ui_out *uiout, struct ui_file *stream) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); struct ui_file *outstream = VEC_last (ui_filep, data->streams); ui_file_put (outstream, ui_file_write_for_put, stream); @@ -399,7 +399,7 @@ mi_out_put (struct ui_out *uiout, struct ui_file *stream) int mi_version (struct ui_out *uiout) { - mi_out_data *data = ui_out_data (uiout); + mi_out_data *data = (mi_out_data *) ui_out_data (uiout); return data->mi_version; } @@ -424,7 +424,7 @@ mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream) static void mi_out_data_dtor (struct ui_out *ui_out) { - mi_out_data *data = ui_out_data (ui_out); + mi_out_data *data = (mi_out_data *) ui_out_data (ui_out); VEC_free (ui_filep, data->streams); xfree (data); diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index 92efe267f2b..55ac3a567ec 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -229,7 +229,7 @@ mi_parse_free (struct mi_parse *parse) static void mi_parse_cleanup (void *arg) { - mi_parse_free (arg); + mi_parse_free ((struct mi_parse *) arg); } struct mi_parse * diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c index 8cc1df22d67..02dfd2d7932 100644 --- a/gdb/microblaze-tdep.c +++ b/gdb/microblaze-tdep.c @@ -441,7 +441,7 @@ microblaze_frame_cache (struct frame_info *next_frame, void **this_cache) int rn; if (*this_cache) - return *this_cache; + return (struct microblaze_frame_cache *) *this_cache; cache = microblaze_alloc_frame_cache (); *this_cache = cache; diff --git a/gdb/minidebug.c b/gdb/minidebug.c index 8610a150807..b5cf45a4a74 100644 --- a/gdb/minidebug.c +++ b/gdb/minidebug.c @@ -76,7 +76,7 @@ struct gdb_lzma_stream static void * lzma_open (struct bfd *nbfd, void *open_closure) { - asection *section = open_closure; + asection *section = (asection *) open_closure; bfd_size_type size, offset; lzma_stream_flags options; gdb_byte footer[LZMA_STREAM_HEADER_SIZE]; @@ -133,7 +133,7 @@ static file_ptr lzma_pread (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, file_ptr offset) { - struct gdb_lzma_stream *lstream = stream; + struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; bfd_size_type chunk_size; lzma_index_iter iter; gdb_byte *compressed, *uncompressed; @@ -220,7 +220,7 @@ static int lzma_close (struct bfd *nbfd, void *stream) { - struct gdb_lzma_stream *lstream = stream; + struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; lzma_index_end (lstream->index, &gdb_lzma_allocator); xfree (lstream->data); @@ -239,7 +239,7 @@ lzma_stat (struct bfd *abfd, void *stream, struct stat *sb) { - struct gdb_lzma_stream *lstream = stream; + struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; memset (sb, 0, sizeof (struct stat)); sb->st_size = lzma_index_uncompressed_size (lstream->index); diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index fe45dcc3bdb..a8c86bb9476 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -1642,7 +1642,8 @@ mips_linux_init_abi (struct gdbarch_info info, { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum mips_abi abi = mips_abi (gdbarch); - struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info; + struct tdesc_arch_data *tdesc_data + = (struct tdesc_arch_data *) info.tdep_info; linux_init_abi (info, gdbarch); diff --git a/gdb/mips-sde-tdep.c b/gdb/mips-sde-tdep.c index 0246b27bbad..8e4690ed844 100644 --- a/gdb/mips-sde-tdep.c +++ b/gdb/mips-sde-tdep.c @@ -48,7 +48,7 @@ mips_sde_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache != NULL) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; @@ -205,7 +205,7 @@ static void mips_sde_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj) { - enum gdb_osabi *os_ident_ptr = obj; + enum gdb_osabi *os_ident_ptr = (enum gdb_osabi *) obj; const char *name; name = bfd_get_section_name (abfd, sect); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index c0f84ee51c2..388513ee83a 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -2818,7 +2818,7 @@ mips_insn16_frame_cache (struct frame_info *this_frame, void **this_cache) struct mips_frame_cache *cache; if ((*this_cache) != NULL) - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); cache = FRAME_OBSTACK_ZALLOC (struct mips_frame_cache); (*this_cache) = cache; cache->saved_regs = trad_frame_alloc_saved_regs (this_frame); @@ -2836,7 +2836,8 @@ mips_insn16_frame_cache (struct frame_info *this_frame, void **this_cache) if (start_addr == 0) return cache; - mips16_scan_prologue (gdbarch, start_addr, pc, this_frame, *this_cache); + mips16_scan_prologue (gdbarch, start_addr, pc, this_frame, + (struct mips_frame_cache *) *this_cache); } /* gdbarch_sp_regnum contains the value and not the address. */ @@ -2844,7 +2845,7 @@ mips_insn16_frame_cache (struct frame_info *this_frame, void **this_cache) gdbarch_num_regs (gdbarch) + MIPS_SP_REGNUM, cache->base); - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); } static void @@ -3263,7 +3264,7 @@ mips_micro_frame_cache (struct frame_info *this_frame, void **this_cache) struct mips_frame_cache *cache; if ((*this_cache) != NULL) - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); cache = FRAME_OBSTACK_ZALLOC (struct mips_frame_cache); (*this_cache) = cache; @@ -3282,7 +3283,8 @@ mips_micro_frame_cache (struct frame_info *this_frame, void **this_cache) if (start_addr == 0) return cache; - micromips_scan_prologue (gdbarch, start_addr, pc, this_frame, *this_cache); + micromips_scan_prologue (gdbarch, start_addr, pc, this_frame, + (struct mips_frame_cache *) *this_cache); } /* gdbarch_sp_regnum contains the value and not the address. */ @@ -3290,7 +3292,7 @@ mips_micro_frame_cache (struct frame_info *this_frame, void **this_cache) gdbarch_num_regs (gdbarch) + MIPS_SP_REGNUM, cache->base); - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); } static void @@ -3640,7 +3642,7 @@ mips_insn32_frame_cache (struct frame_info *this_frame, void **this_cache) struct mips_frame_cache *cache; if ((*this_cache) != NULL) - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); cache = FRAME_OBSTACK_ZALLOC (struct mips_frame_cache); (*this_cache) = cache; @@ -3659,7 +3661,8 @@ mips_insn32_frame_cache (struct frame_info *this_frame, void **this_cache) if (start_addr == 0) return cache; - mips32_scan_prologue (gdbarch, start_addr, pc, this_frame, *this_cache); + mips32_scan_prologue (gdbarch, start_addr, pc, this_frame, + (struct mips_frame_cache *) *this_cache); } /* gdbarch_sp_regnum contains the value and not the address. */ @@ -3667,7 +3670,7 @@ mips_insn32_frame_cache (struct frame_info *this_frame, void **this_cache) gdbarch_num_regs (gdbarch) + MIPS_SP_REGNUM, cache->base); - return (*this_cache); + return (struct mips_frame_cache *) (*this_cache); } static void @@ -3749,7 +3752,7 @@ mips_stub_frame_cache (struct frame_info *this_frame, void **this_cache) int num_regs = gdbarch_num_regs (gdbarch); if ((*this_cache) != NULL) - return (*this_cache); + return (struct trad_frame_cache *) (*this_cache); this_trad_cache = trad_frame_cache_zalloc (this_frame); (*this_cache) = this_trad_cache; @@ -7035,7 +7038,7 @@ reinit_frame_cache_sfunc (char *args, int from_tty, static int gdb_print_insn_mips (bfd_vma memaddr, struct disassemble_info *info) { - struct gdbarch *gdbarch = info->application_data; + struct gdbarch *gdbarch = (struct gdbarch *) info->application_data; /* FIXME: cagney/2003-06-26: Is this even necessary? The disassembler needs to be able to locally determine the ISA, and @@ -8186,7 +8189,7 @@ mips_register_g_packet_guesses (struct gdbarch *gdbarch) static struct value * value_of_mips_user_reg (struct frame_info *frame, const void *baton) { - const int *reg_p = baton; + const int *reg_p = (const int *) baton; return value_of_register (*reg_p, frame); } @@ -8895,7 +8898,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) mips_register_g_packet_guesses (gdbarch); /* Hook in OS ABI-specific overrides, if they have been registered. */ - info.tdep_info = (void *) tdesc_data; + info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data; gdbarch_init_osabi (info, gdbarch); /* The hook may have adjusted num_regs, fetch the final value and diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c index 3150155a929..a3921c177c7 100644 --- a/gdb/mips64obsd-tdep.c +++ b/gdb/mips64obsd-tdep.c @@ -46,7 +46,7 @@ mips64obsd_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - const char *regs = gregs; + const char *regs = (const char *) gregs; int i; for (i = 0; i < MIPS64OBSD_NUM_REGS; i++) diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c index 7cb83c0f82c..390c088facc 100644 --- a/gdb/mipsnbsd-tdep.c +++ b/gdb/mipsnbsd-tdep.c @@ -56,7 +56,7 @@ mipsnbsd_supply_fpregset (const struct regset *regset, int regnum, const void *fpregs, size_t len) { size_t regsize = mips_isa_regsize (get_regcache_arch (regcache)); - const char *regs = fpregs; + const char *regs = (const char *) fpregs; int i; gdb_assert (len >= MIPSNBSD_NUM_FPREGS * regsize); @@ -79,7 +79,7 @@ mipsnbsd_supply_gregset (const struct regset *regset, const void *gregs, size_t len) { size_t regsize = mips_isa_regsize (get_regcache_arch (regcache)); - const char *regs = gregs; + const char *regs = (const char *) gregs; int i; gdb_assert (len >= MIPSNBSD_NUM_GREGS * regsize); diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c index 9ac6c15e6d9..7a6d7793cbc 100644 --- a/gdb/mn10300-linux-tdep.c +++ b/gdb/mn10300-linux-tdep.c @@ -243,7 +243,8 @@ am33_supply_fpregset_method (const struct regset *regset, struct regcache *regcache, int regnum, const void *fpregs, size_t len) { - const mn10300_elf_fpregset_t *fpregset = fpregs; + const mn10300_elf_fpregset_t *fpregset + = (const mn10300_elf_fpregset_t *) fpregs; gdb_assert (len >= sizeof (mn10300_elf_fpregset_t)); @@ -275,7 +276,7 @@ am33_collect_gregset_method (const struct regset *regset, const struct regcache *regcache, int regnum, void *gregs, size_t len) { - mn10300_elf_gregset_t *regp = gregs; + mn10300_elf_gregset_t *regp = (gdb_byte (*)[28][4]) gregs; int i; gdb_assert (len >= sizeof (mn10300_elf_gregset_t)); @@ -423,7 +424,7 @@ am33_collect_fpregset_method (const struct regset *regset, const struct regcache *regcache, int regnum, void *fpregs, size_t len) { - mn10300_elf_fpregset_t *fpregset = fpregs; + mn10300_elf_fpregset_t *fpregset = (mn10300_elf_fpregset_t *) fpregs; gdb_assert (len >= sizeof (mn10300_elf_fpregset_t)); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index b5e1fa7baec..c6d018f9784 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1092,10 +1092,12 @@ mn10300_analyze_frame_prologue (struct frame_info *this_frame, stop_addr = func_start; mn10300_analyze_prologue (get_frame_arch (this_frame), - func_start, stop_addr, *this_prologue_cache); + func_start, stop_addr, + ((struct mn10300_prologue *) + *this_prologue_cache)); } - return *this_prologue_cache; + return (struct mn10300_prologue *) *this_prologue_cache; } /* Given the next frame and a prologue cache, return this frame's diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index 949631475c8..3236012cc1b 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -570,7 +570,7 @@ moxie_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct moxie_frame_cache *) *this_cache; cache = moxie_alloc_frame_cache (); *this_cache = cache; diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c index 56276aff298..896ee57fce4 100644 --- a/gdb/msp430-tdep.c +++ b/gdb/msp430-tdep.c @@ -306,7 +306,8 @@ struct msp430_get_opcode_byte_handle static int msp430_get_opcode_byte (void *handle) { - struct msp430_get_opcode_byte_handle *opcdata = handle; + struct msp430_get_opcode_byte_handle *opcdata + = (struct msp430_get_opcode_byte_handle *) handle; int status; gdb_byte byte; @@ -502,10 +503,11 @@ msp430_analyze_frame_prologue (struct frame_info *this_frame, stop_addr = func_start; msp430_analyze_prologue (get_frame_arch (this_frame), func_start, - stop_addr, *this_prologue_cache); + stop_addr, + (struct msp430_prologue *) *this_prologue_cache); } - return *this_prologue_cache; + return (struct msp430_prologue *) *this_prologue_cache; } /* Given a frame and a prologue cache, return this frame's base. */ diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c index 21d081da777..44983f0692a 100644 --- a/gdb/mt-tdep.c +++ b/gdb/mt-tdep.c @@ -915,7 +915,7 @@ mt_frame_unwind_cache (struct frame_info *this_frame, ULONGEST sp, fp; if ((*this_prologue_cache)) - return (*this_prologue_cache); + return (struct mt_unwind_cache *) (*this_prologue_cache); gdbarch = get_frame_arch (this_frame); info = FRAME_OBSTACK_ZALLOC (struct mt_unwind_cache); diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c index 6b483e82f42..909fecd19be 100644 --- a/gdb/nios2-linux-tdep.c +++ b/gdb/nios2-linux-tdep.c @@ -61,7 +61,7 @@ nios2_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs_buf, size_t len) { - const gdb_byte *gregs = gregs_buf; + const gdb_byte *gregs = (const gdb_byte *) gregs_buf; int regno; static const gdb_byte zero_buf[4] = {0, 0, 0, 0}; @@ -83,7 +83,7 @@ nios2_collect_gregset (const struct regset *regset, const struct regcache *regcache, int regnum, void *gregs_buf, size_t len) { - gdb_byte *gregs = gregs_buf; + gdb_byte *gregs = (gdb_byte *) gregs_buf; int regno; for (regno = NIOS2_Z_REGNUM; regno <= NIOS2_MPUACC_REGNUM; regno++) diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c index aa59528a104..3b66dbaae97 100644 --- a/gdb/nios2-tdep.c +++ b/gdb/nios2-tdep.c @@ -1920,7 +1920,7 @@ nios2_frame_unwind_cache (struct frame_info *this_frame, int i; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct nios2_unwind_cache *) *this_prologue_cache; cache = FRAME_OBSTACK_ZALLOC (struct nios2_unwind_cache); *this_prologue_cache = cache; @@ -2028,7 +2028,7 @@ nios2_stub_frame_cache (struct frame_info *this_frame, void **this_cache) int num_regs = gdbarch_num_regs (gdbarch); if (*this_cache != NULL) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; this_trad_cache = trad_frame_cache_zalloc (this_frame); *this_cache = this_trad_cache; diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 227ecc0e2c8..f190673199d 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -981,7 +981,7 @@ find_methods (char type, const char *theclass, const char *category, unsigned int objfile_csym = 0; - objc_csym = objfile_data (objfile, objc_objfile_data); + objc_csym = (unsigned int *) objfile_data (objfile, objc_objfile_data); if (objc_csym != NULL && *objc_csym == 0) /* There are no ObjC symbols in this objfile. Skip it entirely. */ continue; diff --git a/gdb/objfiles.c b/gdb/objfiles.c index fc692d19f03..d33379f58e0 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -83,7 +83,7 @@ static const struct program_space_data *objfiles_pspace_data; static void objfiles_pspace_data_cleanup (struct program_space *pspace, void *arg) { - struct objfile_pspace_info *info = arg; + struct objfile_pspace_info *info = (struct objfile_pspace_info *) arg; xfree (info->sections); xfree (info); @@ -97,7 +97,8 @@ get_objfile_pspace_data (struct program_space *pspace) { struct objfile_pspace_info *info; - info = program_space_data (pspace, objfiles_pspace_data); + info = ((struct objfile_pspace_info *) + program_space_data (pspace, objfiles_pspace_data)); if (info == NULL) { info = XCNEW (struct objfile_pspace_info); @@ -127,7 +128,8 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd) struct objfile_per_bfd_storage *storage = NULL; if (abfd != NULL) - storage = bfd_data (abfd, objfiles_bfd_data); + storage = ((struct objfile_per_bfd_storage *) + bfd_data (abfd, objfiles_bfd_data)); if (storage == NULL) { @@ -176,7 +178,7 @@ free_objfile_per_bfd_storage (struct objfile_per_bfd_storage *storage) static void objfile_bfd_data_free (struct bfd *unused, void *d) { - free_objfile_per_bfd_storage (d); + free_objfile_per_bfd_storage ((struct objfile_per_bfd_storage *) d); } /* See objfiles.h. */ @@ -320,7 +322,7 @@ static void add_to_objfile_sections (struct bfd *abfd, struct bfd_section *asect, void *objfilep) { - add_to_objfile_sections_full (abfd, asect, objfilep, 0); + add_to_objfile_sections_full (abfd, asect, (struct objfile *) objfilep, 0); } /* Builds a section table for OBJFILE. @@ -755,7 +757,7 @@ free_objfile (struct objfile *objfile) static void do_free_objfile_cleanup (void *obj) { - free_objfile (obj); + free_objfile ((struct objfile *) obj); } struct cleanup * @@ -1522,7 +1524,7 @@ resume_section_map_updates (struct program_space *pspace) void resume_section_map_updates_cleanup (void *arg) { - resume_section_map_updates (arg); + resume_section_map_updates ((struct program_space *) arg); } /* Return 1 if ADDR maps into one of the sections of OBJFILE and 0 diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 6583d158d56..3d17ce4c152 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -69,7 +69,7 @@ static struct gdbarch_data *opencl_type_data; static struct type ** builtin_opencl_type (struct gdbarch *gdbarch) { - return gdbarch_data (gdbarch, opencl_type_data); + return (struct type **) gdbarch_data (gdbarch, opencl_type_data); } /* Returns the corresponding OpenCL vector type from the given type code, diff --git a/gdb/osabi.c b/gdb/osabi.c index eb5a750c86d..5836033ff69 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -441,7 +441,7 @@ check_note (bfd *abfd, asection *sect, char *note, unsigned int *sectsize, void generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj) { - enum gdb_osabi *osabi = obj; + enum gdb_osabi *osabi = (enum gdb_osabi *) obj; const char *name; unsigned int sectsize; char *note; diff --git a/gdb/osdata.c b/gdb/osdata.c index d33026c56fa..2ac0062014a 100644 --- a/gdb/osdata.c +++ b/gdb/osdata.c @@ -58,14 +58,14 @@ osdata_start_osdata (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct osdata_parsing_data *data = user_data; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; char *type; struct osdata *osdata; if (data->osdata) gdb_xml_error (parser, _("Seen more than on osdata element")); - type = xml_find_attribute (attributes, "type")->value; + type = (char *) xml_find_attribute (attributes, "type")->value; osdata = XCNEW (struct osdata); osdata->type = xstrdup (type); data->osdata = osdata; @@ -78,7 +78,7 @@ osdata_start_item (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct osdata_parsing_data *data = user_data; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; struct osdata_item item = { NULL }; VEC_safe_push (osdata_item_s, data->osdata->items, &item); @@ -91,8 +91,9 @@ osdata_start_column (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct osdata_parsing_data *data = user_data; - const char *name = xml_find_attribute (attributes, "name")->value; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; + const char *name + = (const char *) xml_find_attribute (attributes, "name")->value; data->property_name = xstrdup (name); } @@ -104,7 +105,7 @@ osdata_end_column (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct osdata_parsing_data *data = user_data; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; struct osdata *osdata = data->osdata; struct osdata_item *item = VEC_last (osdata_item_s, osdata->items); struct osdata_column *col = VEC_safe_push (osdata_column_s, @@ -121,7 +122,7 @@ osdata_end_column (struct gdb_xml_parser *parser, static void clear_parsing_data (void *p) { - struct osdata_parsing_data *data = p; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) p; osdata_free (data->osdata); data->osdata = NULL; @@ -229,7 +230,7 @@ osdata_free (struct osdata *osdata) static void osdata_free_cleanup (void *arg) { - struct osdata *osdata = arg; + struct osdata *osdata = (struct osdata *) arg; osdata_free (osdata); } diff --git a/gdb/parse.c b/gdb/parse.c index fcd51f94364..a24c52a5fde 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -1621,7 +1621,7 @@ get_type_stack (void) void type_stack_cleanup (void *arg) { - struct type_stack *stack = arg; + struct type_stack *stack = (struct type_stack *) arg; xfree (stack->elements); xfree (stack); @@ -1898,7 +1898,7 @@ exp_iterate (struct expression *exp, static int exp_uses_objfile_iter (struct objfile *exp_objfile, void *objfile_voidp) { - struct objfile *objfile = objfile_voidp; + struct objfile *objfile = (struct objfile *) objfile_voidp; if (exp_objfile->separate_debug_objfile_backlink) exp_objfile = exp_objfile->separate_debug_objfile_backlink; diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 610e44fff70..ae5edc2845e 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -373,7 +373,8 @@ ppc_linux_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - const struct ppc_reg_offsets *offsets = regset->regmap; + const struct ppc_reg_offsets *offsets + = (const struct ppc_reg_offsets *) regset->regmap; ppc_supply_gregset (regset, regcache, regnum, gregs, len); @@ -381,13 +382,13 @@ ppc_linux_supply_gregset (const struct regset *regset, { /* "orig_r3" is stored 2 slots after "pc". */ if (regnum == -1 || regnum == PPC_ORIG_R3_REGNUM) - ppc_supply_reg (regcache, PPC_ORIG_R3_REGNUM, gregs, + ppc_supply_reg (regcache, PPC_ORIG_R3_REGNUM, (const gdb_byte *) gregs, offsets->pc_offset + 2 * offsets->gpr_size, offsets->gpr_size); /* "trap" is stored 8 slots after "pc". */ if (regnum == -1 || regnum == PPC_TRAP_REGNUM) - ppc_supply_reg (regcache, PPC_TRAP_REGNUM, gregs, + ppc_supply_reg (regcache, PPC_TRAP_REGNUM, (const gdb_byte *) gregs, offsets->pc_offset + 8 * offsets->gpr_size, offsets->gpr_size); } @@ -398,7 +399,8 @@ ppc_linux_collect_gregset (const struct regset *regset, const struct regcache *regcache, int regnum, void *gregs, size_t len) { - const struct ppc_reg_offsets *offsets = regset->regmap; + const struct ppc_reg_offsets *offsets + = (const struct ppc_reg_offsets *) regset->regmap; /* Clear areas in the linux gregset not written elsewhere. */ if (regnum == -1) @@ -410,13 +412,13 @@ ppc_linux_collect_gregset (const struct regset *regset, { /* "orig_r3" is stored 2 slots after "pc". */ if (regnum == -1 || regnum == PPC_ORIG_R3_REGNUM) - ppc_collect_reg (regcache, PPC_ORIG_R3_REGNUM, gregs, + ppc_collect_reg (regcache, PPC_ORIG_R3_REGNUM, (gdb_byte *) gregs, offsets->pc_offset + 2 * offsets->gpr_size, offsets->gpr_size); /* "trap" is stored 8 slots after "pc". */ if (regnum == -1 || regnum == PPC_TRAP_REGNUM) - ppc_collect_reg (regcache, PPC_TRAP_REGNUM, gregs, + ppc_collect_reg (regcache, PPC_TRAP_REGNUM, (gdb_byte *) gregs, offsets->pc_offset + 8 * offsets->gpr_size, offsets->gpr_size); } @@ -1257,7 +1259,7 @@ struct ppu2spu_cache static struct gdbarch * ppu2spu_prev_arch (struct frame_info *this_frame, void **this_cache) { - struct ppu2spu_cache *cache = *this_cache; + struct ppu2spu_cache *cache = (struct ppu2spu_cache *) *this_cache; return get_regcache_arch (cache->regcache); } @@ -1265,7 +1267,7 @@ static void ppu2spu_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { - struct ppu2spu_cache *cache = *this_cache; + struct ppu2spu_cache *cache = (struct ppu2spu_cache *) *this_cache; *this_id = cache->frame_id; } @@ -1273,7 +1275,7 @@ static struct value * ppu2spu_prev_register (struct frame_info *this_frame, void **this_cache, int regnum) { - struct ppu2spu_cache *cache = *this_cache; + struct ppu2spu_cache *cache = (struct ppu2spu_cache *) *this_cache; struct gdbarch *gdbarch = get_regcache_arch (cache->regcache); gdb_byte *buf; @@ -1298,7 +1300,7 @@ struct ppu2spu_data static enum register_status ppu2spu_unwind_register (void *src, int regnum, gdb_byte *buf) { - struct ppu2spu_data *data = src; + struct ppu2spu_data *data = (struct ppu2spu_data *) src; enum bfd_endian byte_order = gdbarch_byte_order (data->gdbarch); if (regnum >= 0 && regnum < SPU_NUM_GPRS) @@ -1350,7 +1352,7 @@ ppu2spu_sniffer (const struct frame_unwind *self, info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu); info.byte_order = BFD_ENDIAN_BIG; info.osabi = GDB_OSABI_LINUX; - info.tdep_info = (void *) &data.id; + info.tdep_info = (struct gdbarch_tdep_info *) &data.id; data.gdbarch = gdbarch_find_by_info (info); if (!data.gdbarch) return 0; @@ -1382,7 +1384,7 @@ ppu2spu_sniffer (const struct frame_unwind *self, static void ppu2spu_dealloc_cache (struct frame_info *self, void *this_cache) { - struct ppu2spu_cache *cache = this_cache; + struct ppu2spu_cache *cache = (struct ppu2spu_cache *) this_cache; regcache_xfree (cache->regcache); } @@ -1633,7 +1635,8 @@ ppc_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info; + struct tdesc_arch_data *tdesc_data + = (struct tdesc_arch_data *) info.tdep_info; static const char *const stap_integer_prefixes[] = { "i", NULL }; static const char *const stap_register_indirection_prefixes[] = { "(", NULL }; diff --git a/gdb/ppcfbsd-tdep.c b/gdb/ppcfbsd-tdep.c index 04fa750fd4d..b5f1046575a 100644 --- a/gdb/ppcfbsd-tdep.c +++ b/gdb/ppcfbsd-tdep.c @@ -219,7 +219,7 @@ ppcfbsd_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c index ffd91dd1df0..75257f4ec98 100644 --- a/gdb/ppcobsd-tdep.c +++ b/gdb/ppcobsd-tdep.c @@ -170,7 +170,7 @@ ppcobsd_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; diff --git a/gdb/progspace.c b/gdb/progspace.c index ea2f8ec5920..3d7e4759772 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -215,7 +215,7 @@ set_current_program_space (struct program_space *pspace) static void restore_program_space (void *arg) { - struct program_space *saved_pspace = arg; + struct program_space *saved_pspace = (struct program_space *) arg; set_current_program_space (saved_pspace); } diff --git a/gdb/psymtab.c b/gdb/psymtab.c index f9fafc751dc..d565c67a5d1 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -315,7 +315,8 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, if (objfile->psymtabs_addrmap != NULL) { - pst = addrmap_find (objfile->psymtabs_addrmap, pc); + pst = ((struct partial_symtab *) + addrmap_find (objfile->psymtabs_addrmap, pc)); if (pst != NULL) { /* FIXME: addrmaps currently do not handle overlayed sections, @@ -1489,8 +1490,8 @@ const struct quick_symbol_functions psym_functions = static int compare_psymbols (const void *s1p, const void *s2p) { - struct partial_symbol *const *s1 = s1p; - struct partial_symbol *const *s2 = s2p; + struct partial_symbol *const *s1 = (struct partial_symbol * const*) s1p; + struct partial_symbol *const *s2 = (struct partial_symbol * const*) s2p; return strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*s1), SYMBOL_SEARCH_NAME (*s2)); @@ -1624,10 +1625,9 @@ psymbol_bcache_full (struct partial_symbol *sym, struct psymbol_bcache *bcache, int *added) { - return bcache_full (sym, - sizeof (struct partial_symbol), - bcache->bcache, - added); + return ((const struct partial_symbol *) + bcache_full (sym, sizeof (struct partial_symbol), bcache->bcache, + added)); } /* Helper function, initialises partial symbol structure and stashes @@ -1784,8 +1784,9 @@ allocate_psymtab (const char *filename, struct objfile *objfile) sizeof (struct partial_symtab)); memset (psymtab, 0, sizeof (struct partial_symtab)); - psymtab->filename = bcache (filename, strlen (filename) + 1, - objfile->per_bfd->filename_cache); + psymtab->filename + = (const char *) bcache (filename, strlen (filename) + 1, + objfile->per_bfd->filename_cache); psymtab->compunit_symtab = NULL; /* Prepend it to the psymtab list for the objfile it belongs to. @@ -1861,7 +1862,7 @@ struct psymtab_state static void discard_psymtabs_upto (void *arg) { - struct psymtab_state *state = arg; + struct psymtab_state *state = (struct psymtab_state *) arg; while (state->objfile->psymtabs != state->save) discard_psymtab (state->objfile, state->objfile->psymtabs); diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index 6c0f5cbc215..91a3d8ef0a5 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -256,7 +256,8 @@ set_block (block_object *obj, const struct block *block, if (objfile) { obj->objfile = objfile; - obj->next = objfile_data (objfile, blpy_objfile_data_key); + obj->next = ((struct blpy_block_object *) + objfile_data (objfile, blpy_objfile_data_key)); if (obj->next) obj->next->prev = obj; set_objfile_data (objfile, blpy_objfile_data_key, obj); @@ -411,7 +412,7 @@ gdbpy_block_for_pc (PyObject *self, PyObject *args) static void del_objfile_blocks (struct objfile *objfile, void *datum) { - block_object *obj = datum; + block_object *obj = (block_object *) datum; while (obj) { diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 30619dc1962..9c0b0e435bc 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -720,7 +720,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) static int build_bp_list (struct breakpoint *b, void *arg) { - PyObject *list = arg; + PyObject *list = (PyObject *) arg; PyObject *bp = (PyObject *) b->py_bp_object; int iserr = 0; diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 3cfa1d562fb..dbc197e05be 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -242,7 +242,7 @@ inferior_to_inferior_object (struct inferior *inferior) { inferior_object *inf_obj; - inf_obj = inferior_data (inferior, infpy_inf_data_key); + inf_obj = (inferior_object *) inferior_data (inferior, infpy_inf_data_key); if (!inf_obj) { inf_obj = PyObject_New (inferior_object, &inferior_object_type); @@ -456,7 +456,7 @@ infpy_get_was_attached (PyObject *self, void *closure) static int build_inferior_list (struct inferior *inf, void *arg) { - PyObject *list = arg; + PyObject *list = (PyObject *) arg; PyObject *inferior = inferior_to_inferior_object (inf); int success = 0; @@ -833,7 +833,7 @@ py_free_inferior (struct inferior *inf, void *datum) { struct cleanup *cleanup; - inferior_object *inf_obj = datum; + inferior_object *inf_obj = (inferior_object *) datum; struct threadlist_entry *th_entry, *th_tmp; if (!gdb_python_initialized) diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 5dc9ae65ed9..ed2fe745c23 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -615,7 +615,7 @@ static void py_free_objfile (struct objfile *objfile, void *datum) { struct cleanup *cleanup; - objfile_object *object = datum; + objfile_object *object = (objfile_object *) datum; cleanup = ensure_python_env (get_objfile_arch (objfile), current_language); object->objfile = NULL; @@ -633,7 +633,7 @@ objfile_to_objfile_object (struct objfile *objfile) { objfile_object *object; - object = objfile_data (objfile, objfpy_objfile_data_key); + object = (objfile_object *) objfile_data (objfile, objfpy_objfile_data_key); if (!object) { object = PyObject_New (objfile_object, &objfile_object_type); diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 274ac6c5940..df21ff0260c 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -393,7 +393,7 @@ print_string_repr (PyObject *printer, const char *hint, static void py_restore_tstate (void *p) { - PyFrameObject *frame = p; + PyFrameObject *frame = (PyFrameObject *) p; PyThreadState *tstate = PyThreadState_GET (); tstate->frame = frame; diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c index 17da3d17e81..cd48cbb6418 100644 --- a/gdb/python/py-progspace.c +++ b/gdb/python/py-progspace.c @@ -323,7 +323,7 @@ static void py_free_pspace (struct program_space *pspace, void *datum) { struct cleanup *cleanup; - pspace_object *object = datum; + pspace_object *object = (pspace_object *) datum; /* This is a fiction, but we're in a nasty spot: The pspace is in the process of being deleted, we can't rely on anything in it. Plus this is one time when the current program space and current inferior @@ -351,7 +351,7 @@ pspace_to_pspace_object (struct program_space *pspace) { pspace_object *object; - object = program_space_data (pspace, pspy_pspace_data_key); + object = (pspace_object *) program_space_data (pspace, pspy_pspace_data_key); if (!object) { object = PyObject_New (pspace_object, &pspace_object_type); diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 3d2fa915678..c1511b53ea5 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -308,7 +308,8 @@ set_symbol (symbol_object *obj, struct symbol *symbol) { struct objfile *objfile = symbol_objfile (symbol); - obj->next = objfile_data (objfile, sympy_objfile_data_key); + obj->next = ((struct sympy_symbol_object *) + objfile_data (objfile, sympy_objfile_data_key)); if (obj->next) obj->next->prev = obj; set_objfile_data (objfile, sympy_objfile_data_key, obj); @@ -485,7 +486,7 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) static void del_objfile_symbols (struct objfile *objfile, void *datum) { - symbol_object *obj = datum; + symbol_object *obj = (symbol_object *) datum; while (obj) { symbol_object *next = obj->next; diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index f0ae036da35..79bfeca4246 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -380,8 +380,10 @@ set_sal (sal_object *sal_obj, struct symtab_and_line sal) objfile cleanup observer linked list. */ if (sal_obj->symtab != (symtab_object *)Py_None) { - sal_obj->next = objfile_data (SYMTAB_OBJFILE (sal_obj->symtab->symtab), - salpy_objfile_data_key); + sal_obj->next + = ((struct salpy_sal_object *) + objfile_data (SYMTAB_OBJFILE (sal_obj->symtab->symtab), + salpy_objfile_data_key)); if (sal_obj->next) sal_obj->next->prev = sal_obj; @@ -406,8 +408,9 @@ set_symtab (symtab_object *obj, struct symtab *symtab) obj->prev = NULL; if (symtab) { - obj->next = objfile_data (SYMTAB_OBJFILE (symtab), - stpy_objfile_data_key); + obj->next + = ((struct stpy_symtab_object *) + objfile_data (SYMTAB_OBJFILE (symtab), stpy_objfile_data_key)); if (obj->next) obj->next->prev = obj; set_objfile_data (SYMTAB_OBJFILE (symtab), stpy_objfile_data_key, obj); @@ -478,7 +481,7 @@ symtab_object_to_symtab (PyObject *obj) static void del_objfile_symtab (struct objfile *objfile, void *datum) { - symtab_object *obj = datum; + symtab_object *obj = (symtab_object *) datum; while (obj) { @@ -499,7 +502,7 @@ del_objfile_symtab (struct objfile *objfile, void *datum) static void del_objfile_sal (struct objfile *objfile, void *datum) { - sal_object *obj = datum; + sal_object *obj = (sal_object *) datum; while (obj) { diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c index e202c83732d..7b3f8f9a771 100644 --- a/gdb/python/py-type.c +++ b/gdb/python/py-type.c @@ -1086,7 +1086,7 @@ static const struct objfile_data *typy_objfile_data_key; static void save_objfile_types (struct objfile *objfile, void *datum) { - type_object *obj = datum; + type_object *obj = (type_object *) datum; htab_t copied_types; struct cleanup *cleanup; @@ -1127,7 +1127,8 @@ set_type (type_object *obj, struct type *type) { struct objfile *objfile = TYPE_OBJFILE (type); - obj->next = objfile_data (objfile, typy_objfile_data_key); + obj->next = ((struct pyty_type_object *) + objfile_data (objfile, typy_objfile_data_key)); if (obj->next) obj->next->prev = obj; set_objfile_data (objfile, typy_objfile_data_key, obj); diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index 523cb76ab7d..c518c5d83e4 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -498,7 +498,7 @@ static struct value * pyuw_prev_register (struct frame_info *this_frame, void **cache_ptr, int regnum) { - cached_frame_info *cached_frame = *cache_ptr; + cached_frame_info *cached_frame = (cached_frame_info *) *cache_ptr; struct reg_info *reg_info = cached_frame->reg; struct reg_info *reg_info_end = reg_info + cached_frame->reg_count; @@ -636,8 +636,9 @@ pyuw_gdbarch_data_init (struct gdbarch *gdbarch) static void pyuw_on_new_gdbarch (struct gdbarch *newarch) { - struct pyuw_gdbarch_data_type *data = - gdbarch_data (newarch, pyuw_gdbarch_data); + struct pyuw_gdbarch_data_type *data + = (struct pyuw_gdbarch_data_type *) gdbarch_data (newarch, + pyuw_gdbarch_data); if (!data->unwinder_registered) { @@ -648,7 +649,7 @@ pyuw_on_new_gdbarch (struct gdbarch *newarch) unwinder->stop_reason = default_frame_unwind_stop_reason; unwinder->this_id = pyuw_this_id; unwinder->prev_register = pyuw_prev_register; - unwinder->unwind_data = (void *) newarch; + unwinder->unwind_data = (const struct frame_data *) newarch; unwinder->sniffer = pyuw_sniffer; unwinder->dealloc_cache = pyuw_dealloc_cache; frame_unwind_prepend_unwinder (newarch, unwinder); diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 2e32f11171c..9a4d1ed9606 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -29,7 +29,7 @@ static void py_decref (void *p) { - PyObject *py = p; + PyObject *py = (PyObject *) p; Py_DECREF (py); } @@ -50,7 +50,7 @@ make_cleanup_py_decref (PyObject *py) static void py_xdecref (void *p) { - PyObject *py = p; + PyObject *py = (PyObject *) p; Py_XDECREF (py); } @@ -420,7 +420,7 @@ PyObject * gdb_py_generic_dict (PyObject *self, void *closure) { PyObject *result; - PyTypeObject *type_obj = closure; + PyTypeObject *type_obj = (PyTypeObject *) closure; char *raw_ptr; raw_ptr = (char *) self + type_obj->tp_dictoffset; diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index 91e2691d418..f927fe92729 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -54,7 +54,7 @@ void gdbpy_free_xmethod_worker_data (const struct extension_language_defn *extlang, void *data) { - struct gdbpy_worker_data *worker_data = data; + struct gdbpy_worker_data *worker_data = (struct gdbpy_worker_data *) data; struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); @@ -75,7 +75,8 @@ void * gdbpy_clone_xmethod_worker_data (const struct extension_language_defn *extlang, void *data) { - struct gdbpy_worker_data *worker_data = data, *new_data; + struct gdbpy_worker_data *worker_data + = (struct gdbpy_worker_data *) data, *new_data; struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); @@ -379,7 +380,8 @@ gdbpy_get_xmethod_arg_types (const struct extension_language_defn *extlang, struct xmethod_worker *worker, int *nargs, struct type ***arg_types) { - struct gdbpy_worker_data *worker_data = worker->data; + struct gdbpy_worker_data *worker_data + = (struct gdbpy_worker_data *) worker->data; PyObject *py_worker = worker_data->worker; PyObject *get_arg_types_method; PyObject *py_argtype_list, *list_iter = NULL, *item; @@ -513,7 +515,8 @@ gdbpy_get_xmethod_result_type (const struct extension_language_defn *extlang, struct value **args, int nargs, struct type **result_type_ptr) { - struct gdbpy_worker_data *worker_data = worker->data; + struct gdbpy_worker_data *worker_data + = (struct gdbpy_worker_data *) worker->data; PyObject *py_worker = worker_data->worker; PyObject *py_value_obj, *py_arg_tuple, *py_result_type; PyObject *get_result_type_method; @@ -616,7 +619,8 @@ gdbpy_invoke_xmethod (const struct extension_language_defn *extlang, PyObject *py_value_obj, *py_arg_tuple, *py_result; struct type *obj_type, *this_type; struct value *res = NULL; - struct gdbpy_worker_data *worker_data = worker->data; + struct gdbpy_worker_data *worker_data + = (struct gdbpy_worker_data *) worker->data; PyObject *xmethod_worker = worker_data->worker; cleanups = ensure_python_env (get_current_arch (), current_language); diff --git a/gdb/python/python.c b/gdb/python/python.c index 2031c0c824b..1c2d5c600e5 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1458,7 +1458,7 @@ gdbpy_apply_type_printers (const struct extension_language_defn *extlang, struct cleanup *cleanups; PyObject *type_obj, *type_module = NULL, *func = NULL; PyObject *result_obj = NULL; - PyObject *printers_obj = ext_printers->py_type_printers; + PyObject *printers_obj = (PyObject *) ext_printers->py_type_printers; char *result = NULL; if (printers_obj == NULL) @@ -1524,7 +1524,7 @@ gdbpy_free_type_printers (const struct extension_language_defn *extlang, struct ext_lang_type_printers *ext_printers) { struct cleanup *cleanups; - PyObject *printers = ext_printers->py_type_printers; + PyObject *printers = (PyObject *) ext_printers->py_type_printers; if (printers == NULL) return; diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index d14e6cf09cf..a9eb7fe098b 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -160,9 +160,7 @@ record_btrace_enable_warn (struct thread_info *tp) static void record_btrace_disable_callback (void *arg) { - struct thread_info *tp; - - tp = arg; + struct thread_info *tp = (struct thread_info *) arg; btrace_disable (tp); } @@ -1370,7 +1368,8 @@ static htab_t bfcache; static hashval_t bfcache_hash (const void *arg) { - const struct btrace_frame_cache *cache = arg; + const struct btrace_frame_cache *cache + = (const struct btrace_frame_cache *) arg; return htab_hash_pointer (cache->frame); } @@ -1380,8 +1379,10 @@ bfcache_hash (const void *arg) static int bfcache_eq (const void *arg1, const void *arg2) { - const struct btrace_frame_cache *cache1 = arg1; - const struct btrace_frame_cache *cache2 = arg2; + const struct btrace_frame_cache *cache1 + = (const struct btrace_frame_cache *) arg1; + const struct btrace_frame_cache *cache2 + = (const struct btrace_frame_cache *) arg2; return cache1->frame == cache2->frame; } @@ -1420,7 +1421,7 @@ btrace_get_frame_function (struct frame_info *frame) if (slot == NULL) return NULL; - cache = *slot; + cache = (const struct btrace_frame_cache *) *slot; return cache->bfun; } @@ -1433,7 +1434,7 @@ record_btrace_frame_unwind_stop_reason (struct frame_info *this_frame, const struct btrace_frame_cache *cache; const struct btrace_function *bfun; - cache = *this_cache; + cache = (const struct btrace_frame_cache *) *this_cache; bfun = cache->bfun; gdb_assert (bfun != NULL); @@ -1453,7 +1454,7 @@ record_btrace_frame_this_id (struct frame_info *this_frame, void **this_cache, const struct btrace_function *bfun; CORE_ADDR code, special; - cache = *this_cache; + cache = (const struct btrace_frame_cache *) *this_cache; bfun = cache->bfun; gdb_assert (bfun != NULL); @@ -1492,7 +1493,7 @@ record_btrace_frame_prev_register (struct frame_info *this_frame, throw_error (NOT_AVAILABLE_ERROR, _("Registers are not available in btrace record history")); - cache = *this_cache; + cache = (const struct btrace_frame_cache *) *this_cache; bfun = cache->bfun; gdb_assert (bfun != NULL); @@ -1615,7 +1616,7 @@ record_btrace_frame_dealloc_cache (struct frame_info *self, void *this_cache) struct btrace_frame_cache *cache; void **slot; - cache = this_cache; + cache = (struct btrace_frame_cache *) this_cache; slot = htab_find_slot (bfcache, cache, NO_INSERT); gdb_assert (slot != NULL); diff --git a/gdb/record-full.c b/gdb/record-full.c index e2a36cf76a6..cd47dfaa3b9 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -651,7 +651,8 @@ struct record_full_message_args { static int record_full_message_wrapper (void *args) { - struct record_full_message_args *record_full_args = args; + struct record_full_message_args *record_full_args + = (struct record_full_message_args *) args; return record_full_message (record_full_args->regcache, record_full_args->signal); @@ -2521,7 +2522,7 @@ cmd_record_full_restore (char *args, int from_tty) static void record_full_save_cleanups (void *data) { - bfd *obfd = data; + bfd *obfd = (bfd *) data; char *pathname = xstrdup (bfd_get_filename (obfd)); gdb_bfd_unref (obfd); diff --git a/gdb/regcache.c b/gdb/regcache.c index c78c1423026..41c7aca1752 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -147,7 +147,8 @@ init_regcache_descr (struct gdbarch *gdbarch) static struct regcache_descr * regcache_descr (struct gdbarch *gdbarch) { - return gdbarch_data (gdbarch, regcache_descr_handle); + return (struct regcache_descr *) gdbarch_data (gdbarch, + regcache_descr_handle); } /* Utility functions returning useful register attributes stored in @@ -256,7 +257,7 @@ regcache_xfree (struct regcache *regcache) static void do_regcache_xfree (void *data) { - regcache_xfree (data); + regcache_xfree ((struct regcache *) data); } struct cleanup * @@ -276,7 +277,7 @@ struct register_to_invalidate static void do_regcache_invalidate (void *data) { - struct register_to_invalidate *reg = data; + struct register_to_invalidate *reg = (struct register_to_invalidate *) data; regcache_invalidate (reg->regcache, reg->regnum); } @@ -386,7 +387,7 @@ regcache_restore (struct regcache *dst, static enum register_status do_cooked_read (void *src, int regnum, gdb_byte *buf) { - struct regcache *regcache = src; + struct regcache *regcache = (struct regcache *) src; return regcache_cooked_read (regcache, regnum, buf); } @@ -1095,7 +1096,9 @@ regcache_transfer_regset (const struct regset *regset, const struct regcache_map_entry *map; int offs = 0, count; - for (map = regset->regmap; (count = map->count) != 0; map++) + for (map = (const struct regcache_map_entry *) regset->regmap; + (count = map->count) != 0; + map++) { int regno = map->regno; int slot_size = map->size; diff --git a/gdb/reggroups.c b/gdb/reggroups.c index 745c5ea5de8..fd32463b37f 100644 --- a/gdb/reggroups.c +++ b/gdb/reggroups.c @@ -102,13 +102,14 @@ add_group (struct reggroups *groups, struct reggroup *group, void reggroup_add (struct gdbarch *gdbarch, struct reggroup *group) { - struct reggroups *groups = gdbarch_data (gdbarch, reggroups_data); + struct reggroups *groups + = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); if (groups == NULL) { /* ULGH, called during architecture initialization. Patch things up. */ - groups = reggroups_init (gdbarch); + groups = (struct reggroups *) reggroups_init (gdbarch); deprecated_set_gdbarch_data (gdbarch, reggroups_data, groups); } add_group (groups, group, @@ -129,7 +130,7 @@ reggroup_next (struct gdbarch *gdbarch, struct reggroup *last) /* Don't allow this function to be called during architecture creation. If there are no groups, use the default groups list. */ - groups = gdbarch_data (gdbarch, reggroups_data); + groups = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); gdb_assert (groups != NULL); if (groups->first == NULL) groups = &default_groups; @@ -161,7 +162,7 @@ reggroup_prev (struct gdbarch *gdbarch, struct reggroup *curr) /* Don't allow this function to be called during architecture creation. If there are no groups, use the default groups list. */ - groups = gdbarch_data (gdbarch, reggroups_data); + groups = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); gdb_assert (groups != NULL); if (groups->first == NULL) groups = &default_groups; diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index d84b3fffae6..8bad485dde4 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -1185,7 +1185,7 @@ static struct { static int do_remote_fileio_request (struct ui_out *uiout, void *buf_arg) { - char *buf = buf_arg; + char *buf = (char *) buf_arg; char *c; int idx; diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c index 3241e785125..a8a628517b7 100644 --- a/gdb/remote-notif.c +++ b/gdb/remote-notif.c @@ -117,7 +117,7 @@ static void remote_async_get_pending_events_handler (gdb_client_data data) { gdb_assert (non_stop); - remote_notif_process (data, NULL); + remote_notif_process ((struct remote_notif_state *) data, NULL); } /* Remote notification handler. Parse BUF, queue notification and @@ -230,7 +230,7 @@ notif_event_xfree (struct notif_event *event) static void do_notif_event_xfree (void *arg) { - notif_event_xfree (arg); + notif_event_xfree ((struct notif_event *) arg); } /* Return an allocated remote_notif_state. */ diff --git a/gdb/remote.c b/gdb/remote.c index 11be6bba6aa..ea6ff6bd744 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -616,7 +616,8 @@ static struct remote_arch_state * get_remote_arch_state (void) { gdb_assert (target_gdbarch () != NULL); - return gdbarch_data (target_gdbarch (), remote_gdbarch_data_handle); + return ((struct remote_arch_state *) + gdbarch_data (target_gdbarch (), remote_gdbarch_data_handle)); } /* Fetch the global remote target state. */ @@ -639,7 +640,7 @@ get_remote_state (void) static void remote_pspace_data_cleanup (struct program_space *pspace, void *arg) { - char *remote_exec_file = arg; + char *remote_exec_file = (char *) arg; xfree (remote_exec_file); } @@ -651,8 +652,9 @@ get_remote_exec_file (void) { char *remote_exec_file; - remote_exec_file = program_space_data (current_program_space, - remote_pspace_data); + remote_exec_file + = (char *) program_space_data (current_program_space, + remote_pspace_data); if (remote_exec_file == NULL) return ""; @@ -665,7 +667,7 @@ static void set_pspace_remote_exec_file (struct program_space *pspace, char *remote_exec_file) { - char *old_file = program_space_data (pspace, remote_pspace_data); + char *old_file = (char *) program_space_data (pspace, remote_pspace_data); xfree (old_file); set_program_space_data (pspace, remote_pspace_data, @@ -694,8 +696,10 @@ show_remote_exec_file (struct ui_file *file, int from_tty, static int compare_pnums (const void *lhs_, const void *rhs_) { - const struct packet_reg * const *lhs = lhs_; - const struct packet_reg * const *rhs = rhs_; + const struct packet_reg * const *lhs + = (const struct packet_reg * const *) lhs_; + const struct packet_reg * const *rhs + = (const struct packet_reg * const *) rhs_; if ((*lhs)->pnum < (*rhs)->pnum) return -1; @@ -2837,7 +2841,8 @@ struct threads_listing_context static void clear_threads_listing_context (void *p) { - struct threads_listing_context *context = p; + struct threads_listing_context *context + = (struct threads_listing_context *) p; int i; struct thread_item *item; @@ -2871,7 +2876,8 @@ threads_listing_context_remove (struct target_waitstatus *ws, static int remote_newthread_step (threadref *ref, void *data) { - struct threads_listing_context *context = data; + struct threads_listing_context *context + = (struct threads_listing_context *) data; struct thread_item item; int pid = ptid_get_pid (inferior_ptid); @@ -2929,13 +2935,14 @@ start_thread (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct threads_listing_context *data = user_data; + struct threads_listing_context *data + = (struct threads_listing_context *) user_data; struct thread_item item; char *id; struct gdb_xml_value *attr; - id = xml_find_attribute (attributes, "id")->value; + id = (char *) xml_find_attribute (attributes, "id")->value; item.ptid = read_ptid (id, NULL); attr = xml_find_attribute (attributes, "core"); @@ -2954,7 +2961,8 @@ end_thread (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct threads_listing_context *data = user_data; + struct threads_listing_context *data + = (struct threads_listing_context *) user_data; if (body_text && *body_text) VEC_last (thread_item_t, data->items)->extra = xstrdup (body_text); @@ -5837,8 +5845,9 @@ remove_child_of_pending_fork (QUEUE (stop_reply_p) *q, stop_reply_p event, void *data) { - struct queue_iter_param *param = data; - struct threads_listing_context *context = param->input; + struct queue_iter_param *param = (struct queue_iter_param *) data; + struct threads_listing_context *context + = (struct threads_listing_context *) param->input; if (event->ws.kind == TARGET_WAITKIND_FORKED || event->ws.kind == TARGET_WAITKIND_VFORKED) @@ -5894,8 +5903,8 @@ remove_stop_reply_for_inferior (QUEUE (stop_reply_p) *q, stop_reply_p event, void *data) { - struct queue_iter_param *param = data; - struct inferior *inf = param->input; + struct queue_iter_param *param = (struct queue_iter_param *) data; + struct inferior *inf = (struct inferior *) param->input; if (ptid_get_pid (event->ptid) == inf->pid) { @@ -5948,8 +5957,8 @@ remove_stop_reply_of_remote_state (QUEUE (stop_reply_p) *q, stop_reply_p event, void *data) { - struct queue_iter_param *param = data; - struct remote_state *rs = param->input; + struct queue_iter_param *param = (struct queue_iter_param *) data; + struct remote_state *rs = (struct remote_state *) param->input; if (event->rs == rs) { @@ -5983,8 +5992,8 @@ remote_notif_remove_once_on_match (QUEUE (stop_reply_p) *q, stop_reply_p event, void *data) { - struct queue_iter_param *param = data; - ptid_t *ptid = param->input; + struct queue_iter_param *param = (struct queue_iter_param *) data; + ptid_t *ptid = (ptid_t *) param->input; if (ptid_match (event->ptid, *ptid)) { @@ -6059,7 +6068,7 @@ stop_reply_match_ptid_and_ws (QUEUE (stop_reply_p) *q, struct stop_reply *event, void *data) { - ptid_t *ptid = data; + ptid_t *ptid = (ptid_t *) data; return !(ptid_equal (*ptid, event->ptid) && event->ws.kind == TARGET_WAITKIND_STOPPED); @@ -8504,7 +8513,7 @@ kill_child_of_pending_fork (QUEUE (stop_reply_p) *q, stop_reply_p event, void *data) { - struct queue_iter_param *param = data; + struct queue_iter_param *param = (struct queue_iter_param *) data; int parent_pid = *(int *) param->input; if (is_pending_fork_parent (&event->ws, parent_pid, event->ptid)) @@ -10356,7 +10365,8 @@ register_remote_g_packet_guess (struct gdbarch *gdbarch, int bytes, const struct target_desc *tdesc) { struct remote_g_packet_data *data - = gdbarch_data (gdbarch, remote_g_packet_data_handle); + = ((struct remote_g_packet_data *) + gdbarch_data (gdbarch, remote_g_packet_data_handle)); struct remote_g_packet_guess new_guess, *guess; int ix; @@ -10382,7 +10392,8 @@ static int remote_read_description_p (struct target_ops *target) { struct remote_g_packet_data *data - = gdbarch_data (target_gdbarch (), remote_g_packet_data_handle); + = ((struct remote_g_packet_data *) + gdbarch_data (target_gdbarch (), remote_g_packet_data_handle)); if (!VEC_empty (remote_g_packet_guess_s, data->guesses)) return 1; @@ -10394,7 +10405,8 @@ static const struct target_desc * remote_read_description (struct target_ops *target) { struct remote_g_packet_data *data - = gdbarch_data (target_gdbarch (), remote_g_packet_data_handle); + = ((struct remote_g_packet_data *) + gdbarch_data (target_gdbarch (), remote_g_packet_data_handle)); /* Do not try this during initial connection, when we do not know whether there is a running but stopped thread. */ @@ -11458,7 +11470,7 @@ static void free_actions_list_cleanup_wrapper (void *); static void free_actions_list_cleanup_wrapper (void *al) { - free_actions_list (al); + free_actions_list ((char **) al); } static void @@ -12898,7 +12910,7 @@ static serial_event_ftype remote_async_serial_handler; static void remote_async_serial_handler (struct serial *scb, void *context) { - struct remote_state *rs = context; + struct remote_state *rs = (struct remote_state *) context; /* Don't propogate error information up to the client. Instead let the client find out about the error by querying the target. */ diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c index 0f8790fa8a8..c97e7c87d3a 100644 --- a/gdb/rl78-tdep.c +++ b/gdb/rl78-tdep.c @@ -851,7 +851,8 @@ opc_reg_to_gdb_regnum (int opcreg) static int rl78_get_opcode_byte (void *handle) { - struct rl78_get_opcode_byte_handle *opcdata = handle; + struct rl78_get_opcode_byte_handle *opcdata + = (struct rl78_get_opcode_byte_handle *) handle; int status; gdb_byte byte; @@ -1104,10 +1105,11 @@ rl78_analyze_frame_prologue (struct frame_info *this_frame, if (!func_start) stop_addr = func_start; - rl78_analyze_prologue (func_start, stop_addr, *this_prologue_cache); + rl78_analyze_prologue (func_start, stop_addr, + (struct rl78_prologue *) *this_prologue_cache); } - return *this_prologue_cache; + return (struct rl78_prologue *) *this_prologue_cache; } /* Given a frame and a prologue cache, return this frame's base. */ diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 14f121ab081..b37e862bf13 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -507,7 +507,8 @@ ppc_supply_gregset (const struct regset *regset, struct regcache *regcache, { struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - const struct ppc_reg_offsets *offsets = regset->regmap; + const struct ppc_reg_offsets *offsets + = (const struct ppc_reg_offsets *) regset->regmap; size_t offset; int regsize; @@ -519,27 +520,31 @@ ppc_supply_gregset (const struct regset *regset, struct regcache *regcache, for (i = tdep->ppc_gp0_regnum, offset = offsets->r0_offset; i < tdep->ppc_gp0_regnum + ppc_num_gprs; i++, offset += gpr_size) - ppc_supply_reg (regcache, i, gregs, offset, gpr_size); + ppc_supply_reg (regcache, i, (const gdb_byte *) gregs, offset, + gpr_size); ppc_supply_reg (regcache, gdbarch_pc_regnum (gdbarch), - gregs, offsets->pc_offset, gpr_size); + (const gdb_byte *) gregs, offsets->pc_offset, gpr_size); ppc_supply_reg (regcache, tdep->ppc_ps_regnum, - gregs, offsets->ps_offset, gpr_size); + (const gdb_byte *) gregs, offsets->ps_offset, gpr_size); ppc_supply_reg (regcache, tdep->ppc_lr_regnum, - gregs, offsets->lr_offset, gpr_size); + (const gdb_byte *) gregs, offsets->lr_offset, gpr_size); ppc_supply_reg (regcache, tdep->ppc_ctr_regnum, - gregs, offsets->ctr_offset, gpr_size); + (const gdb_byte *) gregs, offsets->ctr_offset, gpr_size); ppc_supply_reg (regcache, tdep->ppc_cr_regnum, - gregs, offsets->cr_offset, offsets->xr_size); + (const gdb_byte *) gregs, offsets->cr_offset, + offsets->xr_size); ppc_supply_reg (regcache, tdep->ppc_xer_regnum, - gregs, offsets->xer_offset, offsets->xr_size); + (const gdb_byte *) gregs, offsets->xer_offset, + offsets->xr_size); ppc_supply_reg (regcache, tdep->ppc_mq_regnum, - gregs, offsets->mq_offset, offsets->xr_size); + (const gdb_byte *) gregs, offsets->mq_offset, + offsets->xr_size); return; } offset = ppc_greg_offset (gdbarch, tdep, offsets, regnum, ®size); - ppc_supply_reg (regcache, regnum, gregs, offset, regsize); + ppc_supply_reg (regcache, regnum, (const gdb_byte *) gregs, offset, regsize); } /* Supply register REGNUM in the floating-point register set REGSET @@ -559,7 +564,7 @@ ppc_supply_fpregset (const struct regset *regset, struct regcache *regcache, return; tdep = gdbarch_tdep (gdbarch); - offsets = regset->regmap; + offsets = (const struct ppc_reg_offsets *) regset->regmap; if (regnum == -1) { int i; @@ -567,15 +572,16 @@ ppc_supply_fpregset (const struct regset *regset, struct regcache *regcache, for (i = tdep->ppc_fp0_regnum, offset = offsets->f0_offset; i < tdep->ppc_fp0_regnum + ppc_num_fprs; i++, offset += 8) - ppc_supply_reg (regcache, i, fpregs, offset, 8); + ppc_supply_reg (regcache, i, (const gdb_byte *) fpregs, offset, 8); ppc_supply_reg (regcache, tdep->ppc_fpscr_regnum, - fpregs, offsets->fpscr_offset, offsets->fpscr_size); + (const gdb_byte *) fpregs, offsets->fpscr_offset, + offsets->fpscr_size); return; } offset = ppc_fpreg_offset (tdep, offsets, regnum); - ppc_supply_reg (regcache, regnum, fpregs, offset, + ppc_supply_reg (regcache, regnum, (const gdb_byte *) fpregs, offset, regnum == tdep->ppc_fpscr_regnum ? offsets->fpscr_size : 8); } @@ -602,12 +608,12 @@ ppc_supply_vsxregset (const struct regset *regset, struct regcache *regcache, for (i = tdep->ppc_vsr0_upper_regnum; i < tdep->ppc_vsr0_upper_regnum + 32; i++) - ppc_supply_reg (regcache, i, vsxregs, 0, 8); + ppc_supply_reg (regcache, i, (const gdb_byte *) vsxregs, 0, 8); return; } else - ppc_supply_reg (regcache, regnum, vsxregs, 0, 8); + ppc_supply_reg (regcache, regnum, (const gdb_byte *) vsxregs, 0, 8); } /* Supply register REGNUM in the Altivec register set REGSET @@ -627,7 +633,7 @@ ppc_supply_vrregset (const struct regset *regset, struct regcache *regcache, return; tdep = gdbarch_tdep (gdbarch); - offsets = regset->regmap; + offsets = (const struct ppc_reg_offsets *) regset->regmap; if (regnum == -1) { int i; @@ -635,23 +641,23 @@ ppc_supply_vrregset (const struct regset *regset, struct regcache *regcache, for (i = tdep->ppc_vr0_regnum, offset = offsets->vr0_offset; i < tdep->ppc_vr0_regnum + ppc_num_vrs; i++, offset += 16) - ppc_supply_reg (regcache, i, vrregs, offset, 16); + ppc_supply_reg (regcache, i, (const gdb_byte *) vrregs, offset, 16); ppc_supply_reg (regcache, (tdep->ppc_vrsave_regnum - 1), - vrregs, offsets->vscr_offset, 4); + (const gdb_byte *) vrregs, offsets->vscr_offset, 4); ppc_supply_reg (regcache, tdep->ppc_vrsave_regnum, - vrregs, offsets->vrsave_offset, 4); + (const gdb_byte *) vrregs, offsets->vrsave_offset, 4); return; } offset = ppc_vrreg_offset (tdep, offsets, regnum); if (regnum != tdep->ppc_vrsave_regnum && regnum != tdep->ppc_vrsave_regnum - 1) - ppc_supply_reg (regcache, regnum, vrregs, offset, 16); + ppc_supply_reg (regcache, regnum, (const gdb_byte *) vrregs, offset, 16); else ppc_supply_reg (regcache, regnum, - vrregs, offset, 4); + (const gdb_byte *) vrregs, offset, 4); } /* Collect register REGNUM in the general-purpose register set @@ -666,7 +672,8 @@ ppc_collect_gregset (const struct regset *regset, { struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - const struct ppc_reg_offsets *offsets = regset->regmap; + const struct ppc_reg_offsets *offsets + = (const struct ppc_reg_offsets *) regset->regmap; size_t offset; int regsize; @@ -678,27 +685,30 @@ ppc_collect_gregset (const struct regset *regset, for (i = tdep->ppc_gp0_regnum, offset = offsets->r0_offset; i < tdep->ppc_gp0_regnum + ppc_num_gprs; i++, offset += gpr_size) - ppc_collect_reg (regcache, i, gregs, offset, gpr_size); + ppc_collect_reg (regcache, i, (gdb_byte *) gregs, offset, gpr_size); ppc_collect_reg (regcache, gdbarch_pc_regnum (gdbarch), - gregs, offsets->pc_offset, gpr_size); + (gdb_byte *) gregs, offsets->pc_offset, gpr_size); ppc_collect_reg (regcache, tdep->ppc_ps_regnum, - gregs, offsets->ps_offset, gpr_size); + (gdb_byte *) gregs, offsets->ps_offset, gpr_size); ppc_collect_reg (regcache, tdep->ppc_lr_regnum, - gregs, offsets->lr_offset, gpr_size); + (gdb_byte *) gregs, offsets->lr_offset, gpr_size); ppc_collect_reg (regcache, tdep->ppc_ctr_regnum, - gregs, offsets->ctr_offset, gpr_size); + (gdb_byte *) gregs, offsets->ctr_offset, gpr_size); ppc_collect_reg (regcache, tdep->ppc_cr_regnum, - gregs, offsets->cr_offset, offsets->xr_size); + (gdb_byte *) gregs, offsets->cr_offset, + offsets->xr_size); ppc_collect_reg (regcache, tdep->ppc_xer_regnum, - gregs, offsets->xer_offset, offsets->xr_size); + (gdb_byte *) gregs, offsets->xer_offset, + offsets->xr_size); ppc_collect_reg (regcache, tdep->ppc_mq_regnum, - gregs, offsets->mq_offset, offsets->xr_size); + (gdb_byte *) gregs, offsets->mq_offset, + offsets->xr_size); return; } offset = ppc_greg_offset (gdbarch, tdep, offsets, regnum, ®size); - ppc_collect_reg (regcache, regnum, gregs, offset, regsize); + ppc_collect_reg (regcache, regnum, (gdb_byte *) gregs, offset, regsize); } /* Collect register REGNUM in the floating-point register set @@ -720,7 +730,7 @@ ppc_collect_fpregset (const struct regset *regset, return; tdep = gdbarch_tdep (gdbarch); - offsets = regset->regmap; + offsets = (const struct ppc_reg_offsets *) regset->regmap; if (regnum == -1) { int i; @@ -728,15 +738,16 @@ ppc_collect_fpregset (const struct regset *regset, for (i = tdep->ppc_fp0_regnum, offset = offsets->f0_offset; i < tdep->ppc_fp0_regnum + ppc_num_fprs; i++, offset += 8) - ppc_collect_reg (regcache, i, fpregs, offset, 8); + ppc_collect_reg (regcache, i, (gdb_byte *) fpregs, offset, 8); ppc_collect_reg (regcache, tdep->ppc_fpscr_regnum, - fpregs, offsets->fpscr_offset, offsets->fpscr_size); + (gdb_byte *) fpregs, offsets->fpscr_offset, + offsets->fpscr_size); return; } offset = ppc_fpreg_offset (tdep, offsets, regnum); - ppc_collect_reg (regcache, regnum, fpregs, offset, + ppc_collect_reg (regcache, regnum, (gdb_byte *) fpregs, offset, regnum == tdep->ppc_fpscr_regnum ? offsets->fpscr_size : 8); } @@ -765,12 +776,12 @@ ppc_collect_vsxregset (const struct regset *regset, for (i = tdep->ppc_vsr0_upper_regnum; i < tdep->ppc_vsr0_upper_regnum + 32; i++) - ppc_collect_reg (regcache, i, vsxregs, 0, 8); + ppc_collect_reg (regcache, i, (gdb_byte *) vsxregs, 0, 8); return; } else - ppc_collect_reg (regcache, regnum, vsxregs, 0, 8); + ppc_collect_reg (regcache, regnum, (gdb_byte *) vsxregs, 0, 8); } @@ -793,7 +804,7 @@ ppc_collect_vrregset (const struct regset *regset, return; tdep = gdbarch_tdep (gdbarch); - offsets = regset->regmap; + offsets = (const struct ppc_reg_offsets *) regset->regmap; if (regnum == -1) { int i; @@ -801,23 +812,23 @@ ppc_collect_vrregset (const struct regset *regset, for (i = tdep->ppc_vr0_regnum, offset = offsets->vr0_offset; i < tdep->ppc_vr0_regnum + ppc_num_vrs; i++, offset += 16) - ppc_collect_reg (regcache, i, vrregs, offset, 16); + ppc_collect_reg (regcache, i, (gdb_byte *) vrregs, offset, 16); ppc_collect_reg (regcache, (tdep->ppc_vrsave_regnum - 1), - vrregs, offsets->vscr_offset, 4); + (gdb_byte *) vrregs, offsets->vscr_offset, 4); ppc_collect_reg (regcache, tdep->ppc_vrsave_regnum, - vrregs, offsets->vrsave_offset, 4); + (gdb_byte *) vrregs, offsets->vrsave_offset, 4); return; } offset = ppc_vrreg_offset (tdep, offsets, regnum); if (regnum != tdep->ppc_vrsave_regnum && regnum != tdep->ppc_vrsave_regnum - 1) - ppc_collect_reg (regcache, regnum, vrregs, offset, 16); + ppc_collect_reg (regcache, regnum, (gdb_byte *) vrregs, offset, 16); else ppc_collect_reg (regcache, regnum, - vrregs, offset, 4); + (gdb_byte *) vrregs, offset, 4); } @@ -2652,7 +2663,7 @@ e500_move_ev_register (move_ev_register_func move, struct gdbarch *arch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (arch); int reg_index; - gdb_byte *byte_buffer = buffer; + gdb_byte *byte_buffer = (gdb_byte *) buffer; enum register_status status; gdb_assert (IS_SPE_PSEUDOREG (tdep, ev_reg)); @@ -2681,13 +2692,13 @@ e500_move_ev_register (move_ev_register_func move, static enum register_status do_regcache_raw_read (struct regcache *regcache, int regnum, void *buffer) { - return regcache_raw_read (regcache, regnum, buffer); + return regcache_raw_read (regcache, regnum, (gdb_byte *) buffer); } static enum register_status do_regcache_raw_write (struct regcache *regcache, int regnum, void *buffer) { - regcache_raw_write (regcache, regnum, buffer); + regcache_raw_write (regcache, regnum, (const gdb_byte *) buffer); return REG_VALID; } @@ -3194,7 +3205,7 @@ rs6000_frame_cache (struct frame_info *this_frame, void **this_cache) CORE_ADDR func, pc; if ((*this_cache) != NULL) - return (*this_cache); + return (struct rs6000_frame_cache *) (*this_cache); cache = FRAME_OBSTACK_ZALLOC (struct rs6000_frame_cache); (*this_cache) = cache; cache->saved_regs = trad_frame_alloc_saved_regs (this_frame); @@ -3406,7 +3417,7 @@ rs6000_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache) struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); if (*this_cache) - return *this_cache; + return (struct rs6000_frame_cache *) *this_cache; cache = FRAME_OBSTACK_ZALLOC (struct rs6000_frame_cache); (*this_cache) = cache; @@ -5982,7 +5993,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Hook in ABI-specific overrides, if they have been registered. */ info.target_desc = tdesc; - info.tdep_info = (void *) tdesc_data; + info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data; gdbarch_init_osabi (info, gdbarch); switch (info.osabi) diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c index abafa8d30a7..a95c6d33e19 100644 --- a/gdb/rx-tdep.c +++ b/gdb/rx-tdep.c @@ -200,7 +200,8 @@ struct rx_get_opcode_byte_handle static int rx_get_opcode_byte (void *handle) { - struct rx_get_opcode_byte_handle *opcdata = handle; + struct rx_get_opcode_byte_handle *opcdata + = (struct rx_get_opcode_byte_handle *) handle; int status; gdb_byte byte; @@ -445,10 +446,10 @@ rx_analyze_frame_prologue (struct frame_info *this_frame, stop_addr = func_start; rx_analyze_prologue (func_start, stop_addr, frame_type, - *this_prologue_cache); + (struct rx_prologue *) *this_prologue_cache); } - return *this_prologue_cache; + return (struct rx_prologue *) *this_prologue_cache; } /* Determine type of frame by scanning the function for a return @@ -469,7 +470,7 @@ rx_frame_type (struct frame_info *this_frame, void **this_cache) if (*this_cache != NULL) { - struct rx_prologue *p = *this_cache; + struct rx_prologue *p = (struct rx_prologue *) *this_cache; return p->frame_type; } @@ -643,7 +644,7 @@ rx_frame_sniffer_common (const struct frame_unwind *self, } else { - struct rx_prologue *p = *this_cache; + struct rx_prologue *p = (struct rx_prologue *) *this_cache; return sniff_p (p->frame_type); } diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index 8d277ac3f52..fcf93d701bc 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -1168,7 +1168,7 @@ static void s390_check_for_saved (void *data_untyped, pv_t addr, CORE_ADDR size, pv_t value) { - struct s390_prologue_data *data = data_untyped; + struct s390_prologue_data *data = (struct s390_prologue_data *) data_untyped; int i, offset; if (!pv_is_register (addr, S390_SP_REGNUM)) @@ -2081,7 +2081,7 @@ s390_frame_unwind_cache (struct frame_info *this_frame, struct s390_unwind_cache *info; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct s390_unwind_cache *) *this_prologue_cache; info = FRAME_OBSTACK_ZALLOC (struct s390_unwind_cache); *this_prologue_cache = info; @@ -2162,7 +2162,7 @@ s390_stub_frame_unwind_cache (struct frame_info *this_frame, ULONGEST reg; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct s390_stub_unwind_cache *) *this_prologue_cache; info = FRAME_OBSTACK_ZALLOC (struct s390_stub_unwind_cache); *this_prologue_cache = info; @@ -2246,7 +2246,7 @@ s390_sigtramp_frame_unwind_cache (struct frame_info *this_frame, int i; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct s390_sigtramp_unwind_cache *) *this_prologue_cache; info = FRAME_OBSTACK_ZALLOC (struct s390_sigtramp_unwind_cache); *this_prologue_cache = info; diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c index 09df712d090..7e563914bf8 100644 --- a/gdb/score-tdep.c +++ b/gdb/score-tdep.c @@ -1322,7 +1322,7 @@ score_make_prologue_cache (struct frame_info *this_frame, void **this_cache) struct score_frame_cache *cache; if ((*this_cache) != NULL) - return (*this_cache); + return (struct score_frame_cache *) (*this_cache); cache = FRAME_OBSTACK_ZALLOC (struct score_frame_cache); (*this_cache) = cache; @@ -1338,15 +1338,17 @@ score_make_prologue_cache (struct frame_info *this_frame, void **this_cache) return cache; if (target_mach == bfd_mach_score3) - score3_analyze_prologue (start_addr, pc, this_frame, *this_cache); + score3_analyze_prologue (start_addr, pc, this_frame, + (struct score_frame_cache *) *this_cache); else - score7_analyze_prologue (start_addr, pc, this_frame, *this_cache); + score7_analyze_prologue (start_addr, pc, this_frame, + (struct score_frame_cache *) *this_cache); } /* Save SP. */ trad_frame_set_value (cache->saved_regs, SCORE_SP_REGNUM, cache->base); - return (*this_cache); + return (struct score_frame_cache *) (*this_cache); } static void diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c index 1bb62f44bca..c616b547766 100644 --- a/gdb/sentinel-frame.c +++ b/gdb/sentinel-frame.c @@ -46,7 +46,8 @@ sentinel_frame_prev_register (struct frame_info *this_frame, void **this_prologue_cache, int regnum) { - struct frame_unwind_cache *cache = *this_prologue_cache; + struct frame_unwind_cache *cache + = (struct frame_unwind_cache *) *this_prologue_cache; struct value *value; value = regcache_cooked_read_value (cache->regcache, regnum); @@ -70,7 +71,8 @@ static struct gdbarch * sentinel_frame_prev_arch (struct frame_info *this_frame, void **this_prologue_cache) { - struct frame_unwind_cache *cache = *this_prologue_cache; + struct frame_unwind_cache *cache + = (struct frame_unwind_cache *) *this_prologue_cache; return get_regcache_arch (cache->regcache); } diff --git a/gdb/ser-base.c b/gdb/ser-base.c index 2f12125df65..a09fbdeaa33 100644 --- a/gdb/ser-base.c +++ b/gdb/ser-base.c @@ -153,7 +153,7 @@ run_async_handler_and_reschedule (struct serial *scb) static void fd_event (int error, void *context) { - struct serial *scb = context; + struct serial *scb = (struct serial *) context; if (error != 0) { scb->bufcnt = SERIAL_ERROR; @@ -190,7 +190,7 @@ fd_event (int error, void *context) static void push_event (void *context) { - struct serial *scb = context; + struct serial *scb = (struct serial *) context; scb->async_state = NOTHING_SCHEDULED; /* Timers are one-off */ run_async_handler_and_reschedule (scb); @@ -440,7 +440,7 @@ ser_base_readchar (struct serial *scb, int timeout) int ser_base_write (struct serial *scb, const void *buf, size_t count) { - const char *str = buf; + const char *str = (const char *) buf; int cc; while (count > 0) diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c index 1e777b7e4f6..1696eb8d138 100644 --- a/gdb/ser-pipe.c +++ b/gdb/ser-pipe.c @@ -148,7 +148,7 @@ pipe_open (struct serial *scb, const char *name) static void pipe_close (struct serial *scb) { - struct pipe_state *state = scb->state; + struct pipe_state *state = (struct pipe_state *) scb->state; close (scb->fd); scb->fd = -1; diff --git a/gdb/serial.c b/gdb/serial.c index 74567dbc497..abc050ec49d 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -404,7 +404,7 @@ serial_write (struct serial *scb, const void *buf, size_t count) { if (serial_logfp != NULL) { - const char *str = buf; + const char *str = (const char *) buf; size_t c; for (c = 0; c < count; c++) @@ -416,7 +416,7 @@ serial_write (struct serial *scb, const void *buf, size_t count) } if (serial_debug_p (scb)) { - const char *str = buf; + const char *str = (const char *) buf; size_t c; for (c = 0; c < count; c++) diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 6f66f0ea28e..46a1609c104 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1857,7 +1857,7 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct sh_frame_cache *) *this_cache; cache = sh_alloc_frame_cache (); *this_cache = cache; @@ -2021,7 +2021,7 @@ sh_stub_this_id (struct frame_info *this_frame, void **this_cache, if (*this_cache == NULL) *this_cache = sh_make_stub_cache (this_frame); - cache = *this_cache; + cache = (struct sh_frame_cache *) *this_cache; *this_id = frame_id_build (cache->saved_sp, get_frame_pc (this_frame)); } diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index cb18a35850e..f76c8453dbf 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -2210,7 +2210,7 @@ sh64_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct sh64_frame_cache *) *this_cache; gdbarch = get_frame_arch (this_frame); cache = sh64_alloc_frame_cache (); diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index a1e6b8eee70..0310e66ff87 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -112,7 +112,8 @@ get_solib_aix_inferior_data (struct inferior *inf) { struct solib_aix_inferior_data *data; - data = inferior_data (inf, solib_aix_inferior_data_handle); + data = ((struct solib_aix_inferior_data *) + inferior_data (inf, solib_aix_inferior_data_handle)); if (data == NULL) { data = XCNEW (struct solib_aix_inferior_data); @@ -160,16 +161,16 @@ library_list_start_library (struct gdb_xml_parser *parser, void *user_data, VEC (gdb_xml_value_s) *attributes) { - VEC (lm_info_p) **list = user_data; + VEC (lm_info_p) **list = (VEC (lm_info_p) **) user_data; struct lm_info *item = XCNEW (struct lm_info); struct gdb_xml_value *attr; attr = xml_find_attribute (attributes, "name"); - item->filename = xstrdup (attr->value); + item->filename = xstrdup ((const char *) attr->value); attr = xml_find_attribute (attributes, "member"); if (attr != NULL) - item->member_name = xstrdup (attr->value); + item->member_name = xstrdup ((const char *) attr->value); attr = xml_find_attribute (attributes, "text_addr"); item->text_addr = * (ULONGEST *) attr->value; @@ -193,7 +194,7 @@ library_list_start_list (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC (gdb_xml_value_s) *attributes) { - char *version = xml_find_attribute (attributes, "version")->value; + char *version = (char *) xml_find_attribute (attributes, "version")->value; if (strcmp (version, "1.0") != 0) gdb_xml_error (parser, @@ -206,7 +207,7 @@ library_list_start_list (struct gdb_xml_parser *parser, static void solib_aix_free_library_list (void *p) { - VEC (lm_info_p) **result = p; + VEC (lm_info_p) **result = (VEC (lm_info_p) **) p; struct lm_info *info; int ix; diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c index 2a33cd74ff9..876ca8cfce2 100644 --- a/gdb/solib-darwin.c +++ b/gdb/solib-darwin.c @@ -96,7 +96,8 @@ get_darwin_info (void) { struct darwin_info *info; - info = program_space_data (current_program_space, solib_darwin_pspace_data); + info = (struct darwin_info *) program_space_data (current_program_space, + solib_darwin_pspace_data); if (info != NULL) return info; diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c index 102b41abb28..3218bbec635 100644 --- a/gdb/solib-dsbt.c +++ b/gdb/solib-dsbt.c @@ -175,7 +175,8 @@ get_dsbt_info (void) { struct dsbt_info *info; - info = program_space_data (current_program_space, solib_dsbt_pspace_data); + info = (struct dsbt_info *) program_space_data (current_program_space, + solib_dsbt_pspace_data); if (info != NULL) return info; diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c index 12ff49e20c4..468ab1a3505 100644 --- a/gdb/solib-spu.c +++ b/gdb/solib-spu.c @@ -105,7 +105,8 @@ append_ocl_sos (struct so_list **link_ptr) ALL_OBJFILES (objfile) { - ocl_program_addr_base = objfile_data (objfile, ocl_program_data_key); + ocl_program_addr_base + = (CORE_ADDR *) objfile_data (objfile, ocl_program_data_key); if (ocl_program_addr_base != NULL) { enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)? diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 04d797bff8b..48dec25f476 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -405,7 +405,7 @@ free_solib_list (struct svr4_info *info) static void svr4_pspace_data_cleanup (struct program_space *pspace, void *arg) { - struct svr4_info *info = arg; + struct svr4_info *info = (struct svr4_info *) arg; free_probes_table (info); free_solib_list (info); @@ -421,7 +421,8 @@ get_svr4_info (void) { struct svr4_info *info; - info = program_space_data (current_program_space, solib_svr4_pspace_data); + info = (struct svr4_info *) program_space_data (current_program_space, + solib_svr4_pspace_data); if (info != NULL) return info; @@ -1161,11 +1162,15 @@ library_list_start_library (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct svr4_library_list *list = user_data; - const char *name = xml_find_attribute (attributes, "name")->value; - ULONGEST *lmp = xml_find_attribute (attributes, "lm")->value; - ULONGEST *l_addrp = xml_find_attribute (attributes, "l_addr")->value; - ULONGEST *l_ldp = xml_find_attribute (attributes, "l_ld")->value; + struct svr4_library_list *list = (struct svr4_library_list *) user_data; + const char *name + = (const char *) xml_find_attribute (attributes, "name")->value; + ULONGEST *lmp + = (long unsigned int *) xml_find_attribute (attributes, "lm")->value; + ULONGEST *l_addrp + = (long unsigned int *) xml_find_attribute (attributes, "l_addr")->value; + ULONGEST *l_ldp + = (long unsigned int *) xml_find_attribute (attributes, "l_ld")->value; struct so_list *new_elem; new_elem = XCNEW (struct so_list); @@ -1189,8 +1194,9 @@ svr4_library_list_start_list (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct svr4_library_list *list = user_data; - const char *version = xml_find_attribute (attributes, "version")->value; + struct svr4_library_list *list = (struct svr4_library_list *) user_data; + const char *version + = (const char *) xml_find_attribute (attributes, "version")->value; struct gdb_xml_value *main_lm = xml_find_attribute (attributes, "main-lm"); if (strcmp (version, "1.0") != 0) @@ -1699,7 +1705,7 @@ struct probe_and_action static hashval_t hash_probe_and_action (const void *p) { - const struct probe_and_action *pa = p; + const struct probe_and_action *pa = (const struct probe_and_action *) p; return (hashval_t) pa->address; } @@ -1710,8 +1716,8 @@ hash_probe_and_action (const void *p) static int equal_probe_and_action (const void *p1, const void *p2) { - const struct probe_and_action *pa1 = p1; - const struct probe_and_action *pa2 = p2; + const struct probe_and_action *pa1 = (const struct probe_and_action *) p1; + const struct probe_and_action *pa2 = (const struct probe_and_action *) p2; return pa1->address == pa2->address; } @@ -2055,7 +2061,8 @@ svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg) struct svr4_info *info; struct probe_and_action *pa; - info = program_space_data (loc->pspace, solib_svr4_pspace_data); + info = ((struct svr4_info *) + program_space_data (loc->pspace, solib_svr4_pspace_data)); if (info == NULL || info->probes_table == NULL) continue; @@ -3176,7 +3183,8 @@ void set_solib_svr4_fetch_link_map_offsets (struct gdbarch *gdbarch, struct link_map_offsets *(*flmo) (void)) { - struct solib_svr4_ops *ops = gdbarch_data (gdbarch, solib_svr4_data); + struct solib_svr4_ops *ops + = (struct solib_svr4_ops *) gdbarch_data (gdbarch, solib_svr4_data); ops->fetch_link_map_offsets = flmo; @@ -3189,7 +3197,9 @@ set_solib_svr4_fetch_link_map_offsets (struct gdbarch *gdbarch, static struct link_map_offsets * svr4_fetch_link_map_offsets (void) { - struct solib_svr4_ops *ops = gdbarch_data (target_gdbarch (), solib_svr4_data); + struct solib_svr4_ops *ops + = (struct solib_svr4_ops *) gdbarch_data (target_gdbarch (), + solib_svr4_data); gdb_assert (ops->fetch_link_map_offsets); return ops->fetch_link_map_offsets (); @@ -3200,7 +3210,9 @@ svr4_fetch_link_map_offsets (void) static int svr4_have_link_map_offsets (void) { - struct solib_svr4_ops *ops = gdbarch_data (target_gdbarch (), solib_svr4_data); + struct solib_svr4_ops *ops + = (struct solib_svr4_ops *) gdbarch_data (target_gdbarch (), + solib_svr4_data); return (ops->fetch_link_map_offsets != NULL); } diff --git a/gdb/solib-target.c b/gdb/solib-target.c index a41560e17c1..ef9599c992b 100644 --- a/gdb/solib-target.c +++ b/gdb/solib-target.c @@ -80,9 +80,10 @@ library_list_start_segment (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - VEC(lm_info_p) **list = user_data; + VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data; struct lm_info *last = VEC_last (lm_info_p, *list); - ULONGEST *address_p = xml_find_attribute (attributes, "address")->value; + ULONGEST *address_p + = (long unsigned int *) xml_find_attribute (attributes, "address")->value; CORE_ADDR address = (CORE_ADDR) *address_p; if (last->section_bases != NULL) @@ -97,9 +98,10 @@ library_list_start_section (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - VEC(lm_info_p) **list = user_data; + VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data; struct lm_info *last = VEC_last (lm_info_p, *list); - ULONGEST *address_p = xml_find_attribute (attributes, "address")->value; + ULONGEST *address_p + = (long unsigned int *) xml_find_attribute (attributes, "address")->value; CORE_ADDR address = (CORE_ADDR) *address_p; if (last->segment_bases != NULL) @@ -116,9 +118,10 @@ library_list_start_library (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - VEC(lm_info_p) **list = user_data; + VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data; struct lm_info *item = XCNEW (struct lm_info); - const char *name = xml_find_attribute (attributes, "name")->value; + const char *name + = (const char *) xml_find_attribute (attributes, "name")->value; item->name = xstrdup (name); VEC_safe_push (lm_info_p, *list, item); @@ -129,7 +132,7 @@ library_list_end_library (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - VEC(lm_info_p) **list = user_data; + VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data; struct lm_info *lm_info = VEC_last (lm_info_p, *list); if (lm_info->segment_bases == NULL @@ -151,7 +154,7 @@ library_list_start_list (struct gdb_xml_parser *parser, /* #FIXED attribute may be omitted, Expat returns NULL in such case. */ if (version != NULL) { - const char *string = version->value; + const char *string = (const char *) version->value; if (strcmp (string, "1.0") != 0) gdb_xml_error (parser, @@ -165,7 +168,7 @@ library_list_start_list (struct gdb_xml_parser *parser, static void solib_target_free_library_list (void *p) { - VEC(lm_info_p) **result = p; + VEC(lm_info_p) **result = (VEC(lm_info_p) **) p; struct lm_info *info; int ix; diff --git a/gdb/solib.c b/gdb/solib.c index d6ab93d3c40..9a6e7dee458 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -65,7 +65,8 @@ solib_init (struct obstack *obstack) static const struct target_so_ops * solib_ops (struct gdbarch *gdbarch) { - const struct target_so_ops **ops = gdbarch_data (gdbarch, solib_data); + const struct target_so_ops **ops + = (const struct target_so_ops **) gdbarch_data (gdbarch, solib_data); return *ops; } @@ -75,7 +76,8 @@ solib_ops (struct gdbarch *gdbarch) void set_solib_ops (struct gdbarch *gdbarch, const struct target_so_ops *new_ops) { - const struct target_so_ops **ops = gdbarch_data (gdbarch, solib_data); + const struct target_so_ops **ops + = (const struct target_so_ops **) gdbarch_data (gdbarch, solib_data); *ops = new_ops; } diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c index 5afe3083ec0..03bd53a8bcb 100644 --- a/gdb/sparc-sol2-tdep.c +++ b/gdb/sparc-sol2-tdep.c @@ -132,7 +132,7 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *this_frame, int regnum; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index 5c777841d6b..b2bba262264 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -1100,7 +1100,7 @@ sparc_frame_cache (struct frame_info *this_frame, void **this_cache) struct sparc_frame_cache *cache; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_alloc_frame_cache (); *this_cache = cache; @@ -1158,7 +1158,7 @@ sparc32_frame_cache (struct frame_info *this_frame, void **this_cache) struct symbol *sym; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); @@ -1895,7 +1895,7 @@ sparc32_supply_gregset (const struct sparc_gregmap *gregmap, struct regcache *regcache, int regnum, const void *gregs) { - const gdb_byte *regs = gregs; + const gdb_byte *regs = (const gdb_byte *) gregs; gdb_byte zero[4] = { 0 }; int i; @@ -1960,7 +1960,7 @@ sparc32_collect_gregset (const struct sparc_gregmap *gregmap, const struct regcache *regcache, int regnum, void *gregs) { - gdb_byte *regs = gregs; + gdb_byte *regs = (gdb_byte *) gregs; int i; if (regnum == SPARC32_PSR_REGNUM || regnum == -1) @@ -2015,7 +2015,7 @@ sparc32_supply_fpregset (const struct sparc_fpregmap *fpregmap, struct regcache *regcache, int regnum, const void *fpregs) { - const gdb_byte *regs = fpregs; + const gdb_byte *regs = (const gdb_byte *) fpregs; int i; for (i = 0; i < 32; i++) @@ -2035,7 +2035,7 @@ sparc32_collect_fpregset (const struct sparc_fpregmap *fpregmap, const struct regcache *regcache, int regnum, void *fpregs) { - gdb_byte *regs = fpregs; + gdb_byte *regs = (gdb_byte *) fpregs; int i; for (i = 0; i < 32; i++) diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c index 4e2baa6cf09..a381e532441 100644 --- a/gdb/sparc64-sol2-tdep.c +++ b/gdb/sparc64-sol2-tdep.c @@ -107,7 +107,7 @@ sparc64_sol2_sigtramp_frame_cache (struct frame_info *this_frame, int regnum; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index 49788631602..4c05277bf30 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -1244,7 +1244,7 @@ sparc64_supply_gregset (const struct sparc_gregmap *gregmap, struct gdbarch *gdbarch = get_regcache_arch (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int sparc32 = (gdbarch_ptr_bit (gdbarch) == 32); - const gdb_byte *regs = gregs; + const gdb_byte *regs = (const gdb_byte *) gregs; gdb_byte zero[8] = { 0 }; int i; @@ -1361,7 +1361,7 @@ sparc64_collect_gregset (const struct sparc_gregmap *gregmap, struct gdbarch *gdbarch = get_regcache_arch (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int sparc32 = (gdbarch_ptr_bit (gdbarch) == 32); - gdb_byte *regs = gregs; + gdb_byte *regs = (gdb_byte *) gregs; int i; if (sparc32) @@ -1469,7 +1469,7 @@ sparc64_supply_fpregset (const struct sparc_fpregmap *fpregmap, int regnum, const void *fpregs) { int sparc32 = (gdbarch_ptr_bit (get_regcache_arch (regcache)) == 32); - const gdb_byte *regs = fpregs; + const gdb_byte *regs = (const gdb_byte *) fpregs; int i; for (i = 0; i < 32; i++) @@ -1507,7 +1507,7 @@ sparc64_collect_fpregset (const struct sparc_fpregmap *fpregmap, int regnum, void *fpregs) { int sparc32 = (gdbarch_ptr_bit (get_regcache_arch (regcache)) == 32); - gdb_byte *regs = fpregs; + gdb_byte *regs = (gdb_byte *) fpregs; int i; for (i = 0; i < 32; i++) diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c index c9f9041936b..ef84316b8ea 100644 --- a/gdb/sparc64fbsd-tdep.c +++ b/gdb/sparc64fbsd-tdep.c @@ -97,7 +97,7 @@ sparc64fbsd_sigtramp_frame_cache (struct frame_info *this_frame, int regnum; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c index 32da6ac697a..adde2a5495c 100644 --- a/gdb/sparc64nbsd-tdep.c +++ b/gdb/sparc64nbsd-tdep.c @@ -156,7 +156,7 @@ sparc64nbsd_sigcontext_frame_cache (struct frame_info *this_frame, CORE_ADDR addr; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c index 9d3bedc4106..aa9651e815e 100644 --- a/gdb/sparc64obsd-tdep.c +++ b/gdb/sparc64obsd-tdep.c @@ -155,7 +155,7 @@ sparc64obsd_frame_cache (struct frame_info *this_frame, void **this_cache) CORE_ADDR addr; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); @@ -239,7 +239,7 @@ sparc64obsd_trapframe_cache (struct frame_info *this_frame, void **this_cache) int regnum; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c index c145919926f..29c699dc507 100644 --- a/gdb/sparcnbsd-tdep.c +++ b/gdb/sparcnbsd-tdep.c @@ -186,7 +186,7 @@ sparc32nbsd_sigcontext_frame_cache (struct frame_info *this_frame, CORE_ADDR addr; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c index 0796f99c2a8..792da7b9f63 100644 --- a/gdb/sparcobsd-tdep.c +++ b/gdb/sparcobsd-tdep.c @@ -74,7 +74,7 @@ sparc32obsd_sigtramp_frame_cache (struct frame_info *this_frame, CORE_ADDR addr; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c index b07c4ff1c7e..c61b27130a2 100644 --- a/gdb/spu-multiarch.c +++ b/gdb/spu-multiarch.c @@ -107,7 +107,7 @@ spu_gdbarch (int spufs_fd) info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu); info.byte_order = BFD_ENDIAN_BIG; info.osabi = GDB_OSABI_LINUX; - info.tdep_info = (void *) &spufs_fd; + info.tdep_info = (struct gdbarch_tdep_info *) &spufs_fd; return gdbarch_find_by_info (info); } diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c index 6e754a40140..c94b46e8f4f 100644 --- a/gdb/spu-tdep.c +++ b/gdb/spu-tdep.c @@ -1000,7 +1000,7 @@ spu_frame_unwind_cache (struct frame_info *this_frame, gdb_byte buf[16]; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct spu_unwind_cache *) *this_prologue_cache; info = FRAME_OBSTACK_ZALLOC (struct spu_unwind_cache); *this_prologue_cache = info; @@ -1208,7 +1208,7 @@ struct spu2ppu_cache static struct gdbarch * spu2ppu_prev_arch (struct frame_info *this_frame, void **this_cache) { - struct spu2ppu_cache *cache = *this_cache; + struct spu2ppu_cache *cache = (struct spu2ppu_cache *) *this_cache; return get_regcache_arch (cache->regcache); } @@ -1216,7 +1216,7 @@ static void spu2ppu_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { - struct spu2ppu_cache *cache = *this_cache; + struct spu2ppu_cache *cache = (struct spu2ppu_cache *) *this_cache; *this_id = cache->frame_id; } @@ -1224,7 +1224,7 @@ static struct value * spu2ppu_prev_register (struct frame_info *this_frame, void **this_cache, int regnum) { - struct spu2ppu_cache *cache = *this_cache; + struct spu2ppu_cache *cache = (struct spu2ppu_cache *) *this_cache; struct gdbarch *gdbarch = get_regcache_arch (cache->regcache); gdb_byte *buf; @@ -1286,7 +1286,7 @@ spu2ppu_sniffer (const struct frame_unwind *self, static void spu2ppu_dealloc_cache (struct frame_info *self, void *this_cache) { - struct spu2ppu_cache *cache = this_cache; + struct spu2ppu_cache *cache = (struct spu2ppu_cache *) this_cache; regcache_xfree (cache->regcache); } @@ -1725,8 +1725,10 @@ struct spu_dis_asm_data static void spu_dis_asm_print_address (bfd_vma addr, struct disassemble_info *info) { - struct spu_dis_asm_data *data = info->application_data; - print_address (data->gdbarch, SPUADDR (data->id, addr), info->stream); + struct spu_dis_asm_data *data + = (struct spu_dis_asm_data *) info->application_data; + print_address (data->gdbarch, SPUADDR (data->id, addr), + (struct ui_file *) info->stream); } static int @@ -1737,7 +1739,7 @@ gdb_print_insn_spu (bfd_vma memaddr, struct disassemble_info *info) call print_address. */ struct disassemble_info spu_info = *info; struct spu_dis_asm_data data; - data.gdbarch = info->application_data; + data.gdbarch = (struct gdbarch *) info->application_data; data.id = SPUADDR_SPU (memaddr); spu_info.application_data = &data; @@ -1808,7 +1810,7 @@ spu_get_overlay_table (struct objfile *objfile) gdb_byte *ovly_table; int i; - tbl = objfile_data (objfile, spu_overlay_data); + tbl = (struct spu_overlay_table *) objfile_data (objfile, spu_overlay_data); if (tbl) return tbl; diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 650d424f76d..e6eacd3797b 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -2057,8 +2057,8 @@ static const struct objfile_data *rs6000_builtin_type_data; static struct type * rs6000_builtin_type (int typenum, struct objfile *objfile) { - struct type **negative_types = objfile_data (objfile, - rs6000_builtin_type_data); + struct type **negative_types + = (struct type **) objfile_data (objfile, rs6000_builtin_type_data); /* We recognize types numbered from -NUMBER_RECOGNIZED to -1. */ #define NUMBER_RECOGNIZED 34 diff --git a/gdb/stack.c b/gdb/stack.c index 2b7cc92c73c..e6156a7648f 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2059,7 +2059,8 @@ do_print_variable_and_value (const char *print_name, struct symbol *sym, void *cb_data) { - struct print_variable_and_value_data *p = cb_data; + struct print_variable_and_value_data *p + = (struct print_variable_and_value_data *) cb_data; struct frame_info *frame; frame = frame_find_by_id (p->frame_id); diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c index 691877fd64f..d88c4709559 100644 --- a/gdb/stap-probe.c +++ b/gdb/stap-probe.c @@ -1550,7 +1550,7 @@ handle_stap_probe (struct objfile *objfile, struct sdt_note *el, static void get_stap_base_address_1 (bfd *abfd, asection *sect, void *obj) { - asection **ret = obj; + asection **ret = (asection **) obj; if ((sect->flags & (SEC_DATA | SEC_ALLOC | SEC_HAS_CONTENTS)) && sect->name && !strcmp (sect->name, STAP_BASE_SECTION_NAME)) diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index 6a3351a9d8f..a4beb337760 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -72,8 +72,9 @@ debug_symtab_name (struct symtab *symtab) static int debug_qf_has_symbols (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); int retval; retval = debug_data->real_sf->qf->has_symbols (objfile); @@ -87,8 +88,9 @@ debug_qf_has_symbols (struct objfile *objfile) static struct symtab * debug_qf_find_last_source_symtab (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); struct symtab *retval; fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (%s)\n", @@ -105,8 +107,9 @@ debug_qf_find_last_source_symtab (struct objfile *objfile) static void debug_qf_forget_cached_source_info (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->forget_cached_source_info (%s)\n", objfile_debug_name (objfile)); @@ -122,8 +125,9 @@ debug_qf_map_symtabs_matching_filename (struct objfile *objfile, void *), void *data) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); int retval; fprintf_filtered (gdb_stdlog, @@ -147,8 +151,9 @@ static struct compunit_symtab * debug_qf_lookup_symbol (struct objfile *objfile, int kind, const char *name, domain_enum domain) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); struct compunit_symtab *retval; fprintf_filtered (gdb_stdlog, @@ -170,8 +175,9 @@ debug_qf_lookup_symbol (struct objfile *objfile, int kind, const char *name, static void debug_qf_print_stats (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->print_stats (%s)\n", objfile_debug_name (objfile)); @@ -182,8 +188,9 @@ debug_qf_print_stats (struct objfile *objfile) static void debug_qf_dump (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->dump (%s)\n", objfile_debug_name (objfile)); @@ -196,8 +203,9 @@ debug_qf_relocate (struct objfile *objfile, const struct section_offsets *new_offsets, const struct section_offsets *delta) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->relocate (%s, %s, %s)\n", objfile_debug_name (objfile), @@ -211,8 +219,9 @@ static void debug_qf_expand_symtabs_for_function (struct objfile *objfile, const char *func_name) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->expand_symtabs_for_function (%s, \"%s\")\n", @@ -224,8 +233,9 @@ debug_qf_expand_symtabs_for_function (struct objfile *objfile, static void debug_qf_expand_all_symtabs (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->expand_all_symtabs (%s)\n", objfile_debug_name (objfile)); @@ -237,8 +247,9 @@ static void debug_qf_expand_symtabs_with_fullname (struct objfile *objfile, const char *fullname) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->expand_symtabs_with_fullname (%s, \"%s\")\n", @@ -257,8 +268,9 @@ debug_qf_map_matching_symbols (struct objfile *objfile, symbol_compare_ftype *match, symbol_compare_ftype *ordered_compare) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->map_matching_symbols (%s, \"%s\", %s, %d, %s, %s, %s, %s)\n", @@ -284,8 +296,9 @@ debug_qf_expand_symtabs_matching expand_symtabs_exp_notify_ftype *expansion_notify, enum search_domain kind, void *data) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->expand_symtabs_matching (%s, %s, %s, %s, %s, %s)\n", @@ -310,8 +323,9 @@ debug_qf_find_pc_sect_compunit_symtab (struct objfile *objfile, struct obj_section *section, int warn_if_readin) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); struct compunit_symtab *retval; fprintf_filtered (gdb_stdlog, @@ -341,8 +355,9 @@ debug_qf_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun, void *data, int need_fullname) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "qf->map_symbol_filenames (%s, %s, %s, %d)\n", objfile_debug_name (objfile), @@ -378,8 +393,9 @@ static const struct quick_symbol_functions debug_sym_quick_functions = static VEC (probe_p) * debug_sym_get_probes (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); VEC (probe_p) *retval; retval = debug_data->real_sf->sym_probe_fns->sym_get_probes (objfile); @@ -402,8 +418,9 @@ static const struct sym_probe_fns debug_sym_probe_fns = static void debug_sym_new_init (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_new_init (%s)\n", objfile_debug_name (objfile)); @@ -414,8 +431,9 @@ debug_sym_new_init (struct objfile *objfile) static void debug_sym_init (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_init (%s)\n", objfile_debug_name (objfile)); @@ -426,8 +444,9 @@ debug_sym_init (struct objfile *objfile) static void debug_sym_read (struct objfile *objfile, int symfile_flags) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_read (%s, 0x%x)\n", objfile_debug_name (objfile), symfile_flags); @@ -438,8 +457,9 @@ debug_sym_read (struct objfile *objfile, int symfile_flags) static void debug_sym_read_psymbols (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_read_psymbols (%s)\n", objfile_debug_name (objfile)); @@ -450,8 +470,9 @@ debug_sym_read_psymbols (struct objfile *objfile) static void debug_sym_finish (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_finish (%s)\n", objfile_debug_name (objfile)); @@ -463,8 +484,9 @@ static void debug_sym_offsets (struct objfile *objfile, const struct section_addr_info *info) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_offsets (%s, %s)\n", objfile_debug_name (objfile), @@ -485,8 +507,9 @@ debug_sym_segments (bfd *abfd) static void debug_sym_read_linetable (struct objfile *objfile) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); fprintf_filtered (gdb_stdlog, "sf->sym_read_linetable (%s)\n", objfile_debug_name (objfile)); @@ -497,8 +520,9 @@ debug_sym_read_linetable (struct objfile *objfile) static bfd_byte * debug_sym_relocate (struct objfile *objfile, asection *sectp, bfd_byte *buf) { - const struct debug_sym_fns_data *debug_data = - objfile_data (objfile, symfile_debug_objfile_data_key); + const struct debug_sym_fns_data *debug_data + = ((const struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); bfd_byte *retval; retval = debug_data->real_sf->sym_relocate (objfile, sectp, buf); @@ -597,7 +621,8 @@ uninstall_symfile_debug_logging (struct objfile *objfile) /* The debug versions should be currently installed. */ gdb_assert (symfile_debug_installed (objfile)); - debug_data = objfile_data (objfile, symfile_debug_objfile_data_key); + debug_data = ((struct debug_sym_fns_data *) + objfile_data (objfile, symfile_debug_objfile_data_key)); objfile->sf = debug_data->real_sf; xfree (debug_data); diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index 72fb1d01196..ff0d4586cbf 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -180,7 +180,8 @@ struct symbol_file_add_from_memory_args static int symbol_file_add_from_memory_wrapper (struct ui_out *uiout, void *data) { - struct symbol_file_add_from_memory_args *args = data; + struct symbol_file_add_from_memory_args *args + = (struct symbol_file_add_from_memory_args *) data; symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, args->size, args->name, args->from_tty); diff --git a/gdb/symfile.c b/gdb/symfile.c index 229f9b430b9..682e3cab6dc 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -424,7 +424,7 @@ struct place_section_arg static void place_section (bfd *abfd, asection *sect, void *obj) { - struct place_section_arg *arg = obj; + struct place_section_arg *arg = (struct place_section_arg *) obj; CORE_ADDR *offsets = arg->offsets->offsets, start_addr; int done; ULONGEST align = ((ULONGEST) 1) << bfd_get_section_alignment (abfd, sect); @@ -1907,7 +1907,7 @@ static int validate_download = 0; static void add_section_size_callback (bfd *abfd, asection *asec, void *data) { - bfd_size_type *sum = data; + bfd_size_type *sum = (bfd_size_type *) data; *sum += bfd_get_section_size (asec); } @@ -1944,7 +1944,8 @@ struct load_progress_section_data { static void load_progress (ULONGEST bytes, void *untyped_arg) { - struct load_progress_section_data *args = untyped_arg; + struct load_progress_section_data *args + = (struct load_progress_section_data *) untyped_arg; struct load_progress_data *totals; if (args == NULL) @@ -2009,7 +2010,7 @@ static void load_section_callback (bfd *abfd, asection *asec, void *data) { struct memory_write_request *new_request; - struct load_section_data *args = data; + struct load_section_data *args = (struct load_section_data *) data; struct load_progress_section_data *section_data; bfd_size_type size = bfd_get_section_size (asec); gdb_byte *buffer; @@ -2048,7 +2049,7 @@ load_section_callback (bfd *abfd, asection *asec, void *data) static void clear_memory_write_data (void *arg) { - VEC(memory_write_request_s) **vec_p = arg; + VEC(memory_write_request_s) **vec_p = (VEC(memory_write_request_s) **) arg; VEC(memory_write_request_s) *vec = *vec_p; int i; struct memory_write_request *mr; @@ -2901,7 +2902,8 @@ allocate_symtab (struct compunit_symtab *cust, const char *filename) struct symtab *symtab = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct symtab); - symtab->filename = bcache (filename, strlen (filename) + 1, + symtab->filename + = (const char *) bcache (filename, strlen (filename) + 1, objfile->per_bfd->filename_cache); symtab->fullname = NULL; symtab->language = deduce_language_from_filename (filename); diff --git a/gdb/symmisc.c b/gdb/symmisc.c index bee07ac64ea..53d8c03f812 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -876,7 +876,7 @@ static int maintenance_expand_file_matcher (const char *filename, void *data, int basenames) { - const char *regexp = data; + const char *regexp = (const char *) data; QUIT; diff --git a/gdb/symtab.c b/gdb/symtab.c index 91976214b06..c95b651f69a 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -473,7 +473,7 @@ iterate_over_symtabs (const char *name, static int lookup_symtab_callback (struct symtab *symtab, void *data) { - struct symtab **result_ptr = data; + struct symtab **result_ptr = (struct symtab **) data; *result_ptr = symtab; return 1; @@ -663,7 +663,8 @@ struct demangled_name_entry static hashval_t hash_demangled_name_entry (const void *data) { - const struct demangled_name_entry *e = data; + const struct demangled_name_entry *e + = (const struct demangled_name_entry *) data; return htab_hash_string (e->mangled); } @@ -673,8 +674,10 @@ hash_demangled_name_entry (const void *data) static int eq_demangled_name_entry (const void *a, const void *b) { - const struct demangled_name_entry *da = a; - const struct demangled_name_entry *db = b; + const struct demangled_name_entry *da + = (const struct demangled_name_entry *) a; + const struct demangled_name_entry *db + = (const struct demangled_name_entry *) b; return strcmp (da->mangled, db->mangled) == 0; } @@ -1331,7 +1334,8 @@ free_symbol_cache (struct symbol_cache *cache) static struct symbol_cache * get_symbol_cache (struct program_space *pspace) { - struct symbol_cache *cache = program_space_data (pspace, symbol_cache_key); + struct symbol_cache *cache + = (struct symbol_cache *) program_space_data (pspace, symbol_cache_key); if (cache == NULL) { @@ -1348,7 +1352,7 @@ get_symbol_cache (struct program_space *pspace) static void symbol_cache_cleanup (struct program_space *pspace, void *data) { - struct symbol_cache *cache = data; + struct symbol_cache *cache = (struct symbol_cache *) data; free_symbol_cache (cache); } @@ -1363,7 +1367,7 @@ set_symbol_cache_size (unsigned int new_size) ALL_PSPACES (pspace) { struct symbol_cache *cache - = program_space_data (pspace, symbol_cache_key); + = (struct symbol_cache *) program_space_data (pspace, symbol_cache_key); /* The pspace could have been created but not have a cache yet. */ if (cache != NULL) @@ -1519,7 +1523,8 @@ symbol_cache_mark_not_found (struct block_symbol_cache *bsc, static void symbol_cache_flush (struct program_space *pspace) { - struct symbol_cache *cache = program_space_data (pspace, symbol_cache_key); + struct symbol_cache *cache + = (struct symbol_cache *) program_space_data (pspace, symbol_cache_key); int pass; size_t total_size; @@ -1634,7 +1639,8 @@ maintenance_print_symbol_cache (char *args, int from_tty) : "(no object file)"); /* If the cache hasn't been created yet, avoid creating one. */ - cache = program_space_data (pspace, symbol_cache_key); + cache + = (struct symbol_cache *) program_space_data (pspace, symbol_cache_key); if (cache == NULL) printf_filtered (" <empty>\n"); else @@ -1705,7 +1711,8 @@ maintenance_print_symbol_cache_statistics (char *args, int from_tty) : "(no object file)"); /* If the cache hasn't been created yet, avoid creating one. */ - cache = program_space_data (pspace, symbol_cache_key); + cache + = (struct symbol_cache *) program_space_data (pspace, symbol_cache_key); if (cache == NULL) printf_filtered (" empty, no stats available\n"); else @@ -4167,7 +4174,7 @@ clear_filename_seen_cache (struct filename_seen_cache *cache) static void delete_filename_seen_cache (void *ptr) { - struct filename_seen_cache *cache = ptr; + struct filename_seen_cache *cache = (struct filename_seen_cache *) ptr; htab_delete (cache->tab); xfree (cache); @@ -4247,7 +4254,8 @@ static void output_partial_symbol_filename (const char *filename, const char *fullname, void *data) { - output_source_filename (fullname ? fullname : filename, data); + output_source_filename (fullname ? fullname : filename, + (struct output_source_filename_data *) data); } static void @@ -4434,7 +4442,7 @@ static int search_symbols_file_matches (const char *filename, void *user_data, int basenames) { - struct search_symbols_data *data = user_data; + struct search_symbols_data *data = (struct search_symbols_data *) user_data; return file_matches (filename, data->files, data->nfiles, basenames); } @@ -4444,7 +4452,7 @@ search_symbols_file_matches (const char *filename, void *user_data, static int search_symbols_name_matches (const char *symname, void *user_data) { - struct search_symbols_data *data = user_data; + struct search_symbols_data *data = (struct search_symbols_data *) user_data; return !data->preg_p || regexec (&data->preg, symname, 0, NULL, 0) == 0; } @@ -5035,7 +5043,7 @@ free_completion_list (VEC (char_ptr) **list_ptr) static void do_free_completion_list (void *list) { - free_completion_list (list); + free_completion_list ((VEC (char_ptr) **) list); } /* Helper routine for make_symbol_completion_list. */ @@ -5801,7 +5809,8 @@ static void maybe_add_partial_symtab_filename (const char *filename, const char *fullname, void *user_data) { - struct add_partial_filename_data *data = user_data; + struct add_partial_filename_data *data + = (struct add_partial_filename_data *) user_data; if (not_interesting_fname (filename)) return; @@ -5898,7 +5907,8 @@ make_source_files_completion_list (const char *text, const char *word) static struct main_info * get_main_info (void) { - struct main_info *info = program_space_data (current_program_space, + struct main_info *info + = (struct main_info *) program_space_data (current_program_space, main_progspace_key); if (info == NULL) @@ -5924,7 +5934,7 @@ get_main_info (void) static void main_info_cleanup (struct program_space *pspace, void *data) { - struct main_info *info = data; + struct main_info *info = (struct main_info *) data; if (info != NULL) xfree (info->name_of_main); diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c index 4d55397c135..031cf74b9db 100644 --- a/gdb/target-dcache.c +++ b/gdb/target-dcache.c @@ -31,7 +31,7 @@ static const struct address_space_data *target_dcache_aspace_key; static void target_dcache_cleanup (struct address_space *aspace, void *arg) { - dcache_free (arg); + dcache_free ((DCACHE *) arg); } /* Target dcache is initialized or not. */ @@ -39,8 +39,9 @@ target_dcache_cleanup (struct address_space *aspace, void *arg) int target_dcache_init_p (void) { - DCACHE *dcache = address_space_data (current_program_space->aspace, - target_dcache_aspace_key); + DCACHE *dcache + = (DCACHE *) address_space_data (current_program_space->aspace, + target_dcache_aspace_key); return (dcache != NULL); } @@ -50,8 +51,9 @@ target_dcache_init_p (void) void target_dcache_invalidate (void) { - DCACHE *dcache = address_space_data (current_program_space->aspace, - target_dcache_aspace_key); + DCACHE *dcache + = (DCACHE *) address_space_data (current_program_space->aspace, + target_dcache_aspace_key); if (dcache != NULL) dcache_invalidate (dcache); @@ -63,8 +65,9 @@ target_dcache_invalidate (void) DCACHE * target_dcache_get (void) { - DCACHE *dcache = address_space_data (current_program_space->aspace, - target_dcache_aspace_key); + DCACHE *dcache + = (DCACHE *) address_space_data (current_program_space->aspace, + target_dcache_aspace_key); return dcache; } @@ -75,8 +78,9 @@ target_dcache_get (void) DCACHE * target_dcache_get_or_init (void) { - DCACHE *dcache = address_space_data (current_program_space->aspace, - target_dcache_aspace_key); + DCACHE *dcache + = (DCACHE *) address_space_data (current_program_space->aspace, + target_dcache_aspace_key); if (dcache == NULL) { diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 9ef811bb5c1..de365c9c653 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -368,7 +368,8 @@ target_find_description (void) { struct tdesc_arch_data *data; - data = gdbarch_data (target_gdbarch (), tdesc_data); + data = ((struct tdesc_arch_data *) + gdbarch_data (target_gdbarch (), tdesc_data)); if (tdesc_has_registers (current_target_desc) && data->arch_regs == NULL) warning (_("Target-supplied registers are not supported " @@ -575,7 +576,7 @@ tdesc_find_type (struct gdbarch *gdbarch, const char *id) struct tdesc_arch_data *data; int i, num_regs; - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); num_regs = VEC_length (tdesc_arch_reg, data->arch_regs); for (i = 0; i < num_regs; i++) { @@ -815,7 +816,7 @@ tdesc_data_alloc (void) void tdesc_data_cleanup (void *data_untyped) { - struct tdesc_arch_data *data = data_untyped; + struct tdesc_arch_data *data = (struct tdesc_arch_data *) data_untyped; VEC_free (tdesc_arch_reg, data->arch_regs); xfree (data); @@ -913,7 +914,7 @@ tdesc_find_arch_register (struct gdbarch *gdbarch, int regno) { struct tdesc_arch_data *data; - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); if (regno < VEC_length (tdesc_arch_reg, data->arch_regs)) return VEC_index (tdesc_arch_reg, data->arch_regs, regno); else @@ -943,7 +944,8 @@ tdesc_register_name (struct gdbarch *gdbarch, int regno) if (regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); gdb_assert (data->pseudo_register_name != NULL); return data->pseudo_register_name (gdbarch, regno); @@ -962,7 +964,8 @@ tdesc_register_type (struct gdbarch *gdbarch, int regno) if (reg == NULL && regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); gdb_assert (data->pseudo_register_type != NULL); return data->pseudo_register_type (gdbarch, regno); @@ -1100,7 +1103,8 @@ tdesc_register_reggroup_p (struct gdbarch *gdbarch, int regno, if (regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); if (data->pseudo_register_reggroup_p != NULL) return data->pseudo_register_reggroup_p (gdbarch, regno, reggroup); @@ -1121,7 +1125,8 @@ void set_tdesc_pseudo_register_name (struct gdbarch *gdbarch, gdbarch_register_name_ftype *pseudo_name) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_name = pseudo_name; } @@ -1130,7 +1135,8 @@ void set_tdesc_pseudo_register_type (struct gdbarch *gdbarch, gdbarch_register_type_ftype *pseudo_type) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_type = pseudo_type; } @@ -1140,7 +1146,8 @@ set_tdesc_pseudo_register_reggroup_p (struct gdbarch *gdbarch, gdbarch_register_reggroup_p_ftype *pseudo_reggroup_p) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_reggroup_p = pseudo_reggroup_p; } @@ -1166,7 +1173,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, included. */ gdb_assert (tdesc_has_registers (target_desc)); - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->arch_regs = early_data->arch_regs; xfree (early_data); @@ -1454,7 +1461,7 @@ allocate_target_description (void) static void free_target_description (void *arg) { - struct target_desc *target_desc = arg; + struct target_desc *target_desc = (struct target_desc *) arg; struct tdesc_feature *feature; struct property *prop; int ix; diff --git a/gdb/target-memory.c b/gdb/target-memory.c index 93772aa08ad..9067033e1f4 100644 --- a/gdb/target-memory.c +++ b/gdb/target-memory.c @@ -28,8 +28,10 @@ static int compare_block_starting_address (const void *a, const void *b) { - const struct memory_write_request *a_req = a; - const struct memory_write_request *b_req = b; + const struct memory_write_request *a_req + = (const struct memory_write_request *) a; + const struct memory_write_request *b_req + = (const struct memory_write_request *) b; if (a_req->begin < b_req->begin) return -1; @@ -288,7 +290,7 @@ compute_garbled_blocks (VEC(memory_write_request_s) *erased_blocks, static void cleanup_request_data (void *p) { - VEC(memory_write_request_s) **v = p; + VEC(memory_write_request_s) **v = (VEC(memory_write_request_s) **) p; struct memory_write_request *r; int i; @@ -299,7 +301,7 @@ cleanup_request_data (void *p) static void cleanup_write_requests_vector (void *p) { - VEC(memory_write_request_s) **v = p; + VEC(memory_write_request_s) **v = (VEC(memory_write_request_s) **) p; VEC_free (memory_write_request_s, *v); } diff --git a/gdb/target.c b/gdb/target.c index 14cec5697b0..b8b1e9b4b03 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -347,7 +347,7 @@ complete_target_initialization (struct target_ops *t) static void open_target (char *args, int from_tty, struct cmd_list_element *command) { - struct target_ops *ops = get_cmd_context (command); + struct target_ops *ops = (struct target_ops *) get_cmd_context (command); if (targetdebug) fprintf_unfiltered (gdb_stdlog, "-> %s->to_open (...)\n", @@ -531,7 +531,7 @@ target_supports_terminal_ours (void) static void cleanup_restore_target_terminal (void *arg) { - enum terminal_state *previous_state = arg; + enum terminal_state *previous_state = (enum terminal_state *) arg; switch (*previous_state) { @@ -1768,7 +1768,7 @@ read_whatever_is_readable (struct target_ops *ops, void free_memory_read_result_vector (void *x) { - VEC(memory_read_result_s) *v = x; + VEC(memory_read_result_s) *v = (VEC(memory_read_result_s) *) x; memory_read_result_s *current; int ix; diff --git a/gdb/thread.c b/gdb/thread.c index 0f8eded70ff..6d410fb8f5a 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -749,7 +749,7 @@ delete_exited_threads (void) static void disable_thread_stack_temporaries (void *data) { - ptid_t *pd = data; + ptid_t *pd = (ptid_t *) data; struct thread_info *tp = find_thread_ptid (*pd); if (tp != NULL) @@ -1082,7 +1082,7 @@ finish_thread_state (ptid_t ptid) void finish_thread_state_cleanup (void *arg) { - ptid_t *ptid_p = arg; + ptid_t *ptid_p = (ptid_t *) arg; gdb_assert (arg); @@ -1457,7 +1457,7 @@ static void do_restore_current_thread_cleanup (void *arg) { struct thread_info *tp; - struct current_thread_cleanup *old = arg; + struct current_thread_cleanup *old = (struct current_thread_cleanup *) arg; tp = find_thread_ptid (old->inferior_ptid); @@ -1489,7 +1489,7 @@ do_restore_current_thread_cleanup (void *arg) static void restore_current_thread_cleanup_dtor (void *arg) { - struct current_thread_cleanup *old = arg; + struct current_thread_cleanup *old = (struct current_thread_cleanup *) arg; struct thread_info *tp; struct inferior *inf; @@ -1510,7 +1510,8 @@ static void set_thread_refcount (void *data) { int k; - struct thread_array_cleanup *ta_cleanup = data; + struct thread_array_cleanup *ta_cleanup + = (struct thread_array_cleanup *) data; for (k = 0; k != ta_cleanup->count; k++) ta_cleanup->tp_array[k]->refcount--; @@ -1573,8 +1574,10 @@ static int tp_array_compar_ascending; static int tp_array_compar (const void *ap_voidp, const void *bp_voidp) { - const struct thread_info *const *ap = ap_voidp; - const struct thread_info *const *bp = bp_voidp; + const struct thread_info *const *ap + = (const struct thread_info * const*) ap_voidp; + const struct thread_info *const *bp + = (const struct thread_info * const*) bp_voidp; return ((((*ap)->num > (*bp)->num) - ((*ap)->num < (*bp)->num)) * (tp_array_compar_ascending ? +1 : -1)); @@ -1834,7 +1837,7 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr) int num; struct thread_info *tp; - num = value_as_long (parse_and_eval (tidstr)); + num = value_as_long (parse_and_eval ((const char *) tidstr)); tp = find_thread_id (num); diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c index 2cc38c5de3f..015dbe692d6 100644 --- a/gdb/tic6x-tdep.c +++ b/gdb/tic6x-tdep.c @@ -405,7 +405,7 @@ tic6x_frame_unwind_cache (struct frame_info *this_frame, struct tic6x_unwind_cache *cache; if (*this_prologue_cache) - return *this_prologue_cache; + return (struct tic6x_unwind_cache *) *this_prologue_cache; cache = FRAME_OBSTACK_ZALLOC (struct tic6x_unwind_cache); (*this_prologue_cache) = cache; @@ -516,7 +516,7 @@ tic6x_stub_this_id (struct frame_info *this_frame, void **this_cache, if (*this_cache == NULL) *this_cache = tic6x_make_stub_cache (this_frame); - cache = *this_cache; + cache = (struct tic6x_unwind_cache *) *this_cache; *this_id = frame_id_build (cache->cfa, get_frame_pc (this_frame)); } diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c index 65f07292275..c2b00362573 100644 --- a/gdb/tilegx-tdep.c +++ b/gdb/tilegx-tdep.c @@ -869,7 +869,7 @@ tilegx_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct tilegx_frame_cache *) *this_cache; cache = FRAME_OBSTACK_ZALLOC (struct tilegx_frame_cache); *this_cache = cache; diff --git a/gdb/top.c b/gdb/top.c index 23ad6035f8b..d1e2271c431 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -278,7 +278,7 @@ void do_restore_instream_cleanup (void *stream) { /* Restore the previous input stream. */ - instream = stream; + instream = (FILE *) stream; } /* Read commands from STREAM. */ @@ -813,7 +813,8 @@ struct gdb_readline_wrapper_cleanup static void gdb_readline_wrapper_cleanup (void *arg) { - struct gdb_readline_wrapper_cleanup *cleanup = arg; + struct gdb_readline_wrapper_cleanup *cleanup + = (struct gdb_readline_wrapper_cleanup *) arg; rl_already_prompted = cleanup->already_prompted_orig; @@ -1439,7 +1440,7 @@ struct qt_args static int kill_or_detach (struct inferior *inf, void *args) { - struct qt_args *qt = args; + struct qt_args *qt = (struct qt_args *) args; struct thread_info *thread; if (inf->pid == 0) @@ -1470,7 +1471,7 @@ kill_or_detach (struct inferior *inf, void *args) static int print_inferior_quit_action (struct inferior *inf, void *arg) { - struct ui_file *stb = arg; + struct ui_file *stb = (struct ui_file *) arg; if (inf->pid == 0) return 0; diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index 68ff5b14b79..3ccd28173ec 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -713,7 +713,7 @@ typedef int (*walk_blocks_callback_func) (char blocktype, void *data); static int match_blocktype (char blocktype, void *data) { - char *wantedp = data; + char *wantedp = (char *) data; if (*wantedp == blocktype) return 1; @@ -966,7 +966,7 @@ tfile_get_trace_state_variable_value (struct target_ops *self, static int build_traceframe_info (char blocktype, void *data) { - struct traceframe_info *info = data; + struct traceframe_info *info = (struct traceframe_info *) data; switch (blocktype) { diff --git a/gdb/tracefile.c b/gdb/tracefile.c index 21bf25f53c7..c26d8db986f 100644 --- a/gdb/tracefile.c +++ b/gdb/tracefile.c @@ -41,7 +41,7 @@ static void trace_file_writer_xfree (void *arg) { - struct trace_file_writer *writer = arg; + struct trace_file_writer *writer = (struct trace_file_writer *) arg; writer->ops->dtor (writer); xfree (writer); diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 2ed24e9baff..415fa6d0fe6 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -860,7 +860,8 @@ static int memrange_cmp (const void *, const void *); static int memrange_cmp (const void *va, const void *vb) { - const struct memrange *a = va, *b = vb; + const struct memrange *a = (const struct memrange *) va; + const struct memrange *b = (const struct memrange *) vb; if (a->type < b->type) return -1; @@ -1137,7 +1138,7 @@ do_collect_symbol (const char *print_name, struct symbol *sym, void *cb_data) { - struct add_local_symbols_data *p = cb_data; + struct add_local_symbols_data *p = (struct add_local_symbols_data *) cb_data; collect_symbol (p->collect, sym, p->gdbarch, p->frame_regno, p->frame_offset, p->pc, p->trace_string); @@ -1231,7 +1232,7 @@ clear_collection_list (struct collection_list *list) static void do_clear_collection_list (void *list) { - struct collection_list *l = list; + struct collection_list *l = (struct collection_list *) list; clear_collection_list (l); } @@ -3234,7 +3235,8 @@ struct current_traceframe_cleanup static void do_restore_current_traceframe_cleanup (void *arg) { - struct current_traceframe_cleanup *old = arg; + struct current_traceframe_cleanup *old + = (struct current_traceframe_cleanup *) arg; set_current_traceframe (old->traceframe_number); } @@ -3242,7 +3244,8 @@ do_restore_current_traceframe_cleanup (void *arg) static void restore_current_traceframe_cleanup_dtor (void *arg) { - struct current_traceframe_cleanup *old = arg; + struct current_traceframe_cleanup *old + = (struct current_traceframe_cleanup *) arg; xfree (old); } @@ -3892,7 +3895,8 @@ parse_tsv_definition (char *line, struct uploaded_tsv **utsvp) void free_current_marker (void *arg) { - struct static_tracepoint_marker **marker_p = arg; + struct static_tracepoint_marker **marker_p + = (struct static_tracepoint_marker **) arg; if (*marker_p != NULL) { @@ -4185,12 +4189,14 @@ traceframe_info_start_memory (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct traceframe_info *info = user_data; + struct traceframe_info *info = (struct traceframe_info *) user_data; struct mem_range *r = VEC_safe_push (mem_range_s, info->memory, NULL); ULONGEST *start_p, *length_p; - start_p = xml_find_attribute (attributes, "start")->value; - length_p = xml_find_attribute (attributes, "length")->value; + start_p + = (long unsigned int *) xml_find_attribute (attributes, "start")->value; + length_p + = (long unsigned int *) xml_find_attribute (attributes, "length")->value; r->start = *start_p; r->length = *length_p; @@ -4204,8 +4210,9 @@ traceframe_info_start_tvar (struct gdb_xml_parser *parser, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct traceframe_info *info = user_data; - const char *id_attrib = xml_find_attribute (attributes, "id")->value; + struct traceframe_info *info = (struct traceframe_info *) user_data; + const char *id_attrib + = (const char *) xml_find_attribute (attributes, "id")->value; int id = gdb_xml_parse_ulongest (parser, id_attrib); VEC_safe_push (int, info->tvars, id); @@ -4216,7 +4223,7 @@ traceframe_info_start_tvar (struct gdb_xml_parser *parser, static void free_result (void *p) { - struct traceframe_info *result = p; + struct traceframe_info *result = (struct traceframe_info *) p; free_traceframe_info (result); } diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c index 7d288b60f5f..8f5701e904a 100644 --- a/gdb/tramp-frame.c +++ b/gdb/tramp-frame.c @@ -43,7 +43,8 @@ static struct trad_frame_cache * tramp_frame_cache (struct frame_info *this_frame, void **this_cache) { - struct tramp_frame_cache *tramp_cache = (*this_cache); + struct tramp_frame_cache *tramp_cache + = (struct tramp_frame_cache *) *this_cache; if (tramp_cache->trad_cache == NULL) { diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c index 1aa0a61631b..cf853b8be48 100644 --- a/gdb/tui/tui-file.c +++ b/gdb/tui/tui-file.c @@ -71,7 +71,7 @@ tui_file_new (void) static void tui_file_delete (struct ui_file *file) { - struct tui_stream *tmpstream = ui_file_data (file); + struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file); if (tmpstream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, @@ -88,7 +88,7 @@ struct ui_file * tui_fileopen (FILE *stream) { struct ui_file *file = tui_file_new (); - struct tui_stream *tmpstream = ui_file_data (file); + struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file); tmpstream->ts_streamtype = afile; tmpstream->ts_filestream = stream; @@ -101,7 +101,7 @@ struct ui_file * tui_sfileopen (int n) { struct ui_file *file = tui_file_new (); - struct tui_stream *tmpstream = ui_file_data (file); + struct tui_stream *tmpstream = (struct tui_stream *) ui_file_data (file); tmpstream->ts_streamtype = astring; tmpstream->ts_filestream = NULL; @@ -121,7 +121,7 @@ tui_sfileopen (int n) static int tui_file_isatty (struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, @@ -135,7 +135,7 @@ tui_file_isatty (struct ui_file *file) static void tui_file_rewind (struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, @@ -148,7 +148,7 @@ tui_file_put (struct ui_file *file, ui_file_put_method_ftype *write, void *dest) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, @@ -169,7 +169,7 @@ tui_file_put (struct ui_file *file, void tui_file_fputs (const char *linebuffer, struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_streamtype == astring) { @@ -189,7 +189,7 @@ tui_file_fputs (const char *linebuffer, struct ui_file *file) char * tui_file_get_strbuf (struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, @@ -203,7 +203,7 @@ tui_file_get_strbuf (struct ui_file *file) void tui_file_adjust_strbuf (int n, struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); int non_null_chars; if (stream->ts_magic != &tui_file_magic) @@ -233,7 +233,7 @@ tui_file_adjust_strbuf (int n, struct ui_file *file) static void tui_file_flush (struct ui_file *file) { - struct tui_stream *stream = ui_file_data (file); + struct tui_stream *stream = (struct tui_stream *) ui_file_data (file); if (stream->ts_magic != &tui_file_magic) internal_error (__FILE__, __LINE__, diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2528296bf9b..36afba44292 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -550,13 +550,14 @@ static void make_command_window (struct tui_win_info **win_info_ptr, int height, int origin_y) { - *win_info_ptr = init_and_make_win (*win_info_ptr, - CMD_WIN, - height, - tui_term_width (), - 0, - origin_y, - DONT_BOX_WINDOW); + *win_info_ptr + = (struct tui_win_info *) init_and_make_win (*win_info_ptr, + CMD_WIN, + height, + tui_term_width (), + 0, + origin_y, + DONT_BOX_WINDOW); (*win_info_ptr)->can_highlight = FALSE; } @@ -590,13 +591,14 @@ static void make_data_window (struct tui_win_info **win_info_ptr, int height, int origin_y) { - *win_info_ptr = init_and_make_win (*win_info_ptr, - DATA_WIN, - height, - tui_term_width (), - 0, - origin_y, - BOX_WINDOW); + *win_info_ptr + = (struct tui_win_info *) init_and_make_win (*win_info_ptr, + DATA_WIN, + height, + tui_term_width (), + 0, + origin_y, + BOX_WINDOW); } @@ -662,13 +664,15 @@ show_source_disasm_command (void) if (TUI_DISASM_WIN == NULL) { make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1); - locator = init_and_make_win (locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - (src_height + asm_height) - 1, - DONT_BOX_WINDOW); + locator + = ((struct tui_gen_win_info *) + init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + (src_height + asm_height) - 1, + DONT_BOX_WINDOW)); } else { @@ -754,13 +758,15 @@ show_data (enum tui_layout_type new_layout) make_source_window (&tui_win_list[win_type], src_height, data_height - 1); else make_disasm_window (&tui_win_list[win_type], src_height, data_height - 1); - locator = init_and_make_win (locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - total_height - 1, - DONT_BOX_WINDOW); + locator + = ((struct tui_gen_win_info *) + init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + total_height - 1, + DONT_BOX_WINDOW)); } else { @@ -870,22 +876,26 @@ make_source_or_disasm_window (struct tui_win_info **win_info_ptr, execution_info = tui_source_exec_info_win_ptr (); else execution_info = tui_disassem_exec_info_win_ptr (); - execution_info = init_and_make_win (execution_info, - EXEC_INFO_WIN, - height, - 3, - 0, - origin_y, - DONT_BOX_WINDOW); + execution_info + = ((struct tui_gen_win_info *) + init_and_make_win (execution_info, + EXEC_INFO_WIN, + height, + 3, + 0, + origin_y, + DONT_BOX_WINDOW)); /* Now create the source window. */ - *win_info_ptr = init_and_make_win (*win_info_ptr, - type, - height, - tui_term_width () - execution_info->width, - execution_info->width, - origin_y, - BOX_WINDOW); + *win_info_ptr + = ((struct tui_win_info *) + init_and_make_win (*win_info_ptr, + type, + height, + tui_term_width () - execution_info->width, + execution_info->width, + origin_y, + BOX_WINDOW)); (*win_info_ptr)->detail.source_info.execution_info = execution_info; } @@ -918,13 +928,15 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) make_source_window (win_info_ptr, src_height - 1, 0); else make_disasm_window (win_info_ptr, src_height - 1, 0); - locator = init_and_make_win (locator, - LOCATOR_WIN, - 2 /* 1 */ , - tui_term_width (), - 0, - src_height - 1, - DONT_BOX_WINDOW); + locator + = ((struct tui_gen_win_info *) + init_and_make_win (locator, + LOCATOR_WIN, + 2 /* 1 */ , + tui_term_width (), + 0, + src_height - 1, + DONT_BOX_WINDOW)); } else { diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c index 41ea3490589..d415a60feaa 100644 --- a/gdb/tui/tui-out.c +++ b/gdb/tui/tui-out.c @@ -48,7 +48,7 @@ tui_field_int (struct ui_out *uiout, const char *fldname, int value) { - tui_out_data *data = ui_out_data (uiout); + tui_out_data *data = (tui_out_data *) ui_out_data (uiout); if (data->base.suppress_output) return; @@ -76,7 +76,7 @@ tui_field_string (struct ui_out *uiout, const char *fldname, const char *string) { - tui_out_data *data = ui_out_data (uiout); + tui_out_data *data = (tui_out_data *) ui_out_data (uiout); if (data->base.suppress_output) return; @@ -107,7 +107,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno, const char *format, va_list args) { - tui_out_data *data = ui_out_data (uiout); + tui_out_data *data = (tui_out_data *) ui_out_data (uiout); if (data->base.suppress_output) return; @@ -122,7 +122,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno, static void tui_text (struct ui_out *uiout, const char *string) { - tui_out_data *data = ui_out_data (uiout); + tui_out_data *data = (tui_out_data *) ui_out_data (uiout); if (data->base.suppress_output) return; diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 8dc57f20b8b..8fbd1789a89 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -87,7 +87,7 @@ struct typedef_hash_table static hashval_t hash_typedef_field (const void *p) { - const struct typedef_field *tf = p; + const struct typedef_field *tf = (const struct typedef_field *) p; struct type *t = check_typedef (tf->type); return htab_hash_string (TYPE_SAFE_NAME (t)); @@ -98,8 +98,8 @@ hash_typedef_field (const void *p) static int eq_typedef_field (const void *a, const void *b) { - const struct typedef_field *tfa = a; - const struct typedef_field *tfb = b; + const struct typedef_field *tfa = (const struct typedef_field *) a; + const struct typedef_field *tfb = (const struct typedef_field *) b; return types_equal (tfa->type, tfb->type); } @@ -195,7 +195,7 @@ free_typedef_hash (struct typedef_hash_table *table) static void do_free_typedef_hash (void *arg) { - free_typedef_hash (arg); + free_typedef_hash ((struct typedef_hash_table *) arg); } /* Return a new cleanup that frees TABLE. */ @@ -211,7 +211,7 @@ make_cleanup_free_typedef_hash (struct typedef_hash_table *table) static int copy_typedef_hash_element (void **slot, void *nt) { - htab_t new_table = nt; + htab_t new_table = (htab_t) nt; void **new_slot; new_slot = htab_find_slot (new_table, *slot, INSERT); @@ -242,7 +242,7 @@ copy_typedef_hash (struct typedef_hash_table *table) static void do_free_global_table (void *arg) { - struct type_print_options *flags = arg; + struct type_print_options *flags = (struct type_print_options *) arg; free_typedef_hash (flags->global_typedefs); free_ext_lang_type_printers (flags->global_printers); @@ -281,7 +281,7 @@ find_global_typedef (const struct type_print_options *flags, slot = htab_find_slot (flags->global_typedefs->table, &tf, INSERT); if (*slot != NULL) { - new_tf = *slot; + new_tf = (struct typedef_field *) *slot; return new_tf->name; } @@ -320,7 +320,8 @@ find_typedef_in_hash (const struct type_print_options *flags, struct type *t) tf.name = NULL; tf.type = t; - found = htab_find (flags->local_typedefs->table, &tf); + found = (struct typedef_field *) htab_find (flags->local_typedefs->table, + &tf); if (found != NULL) return found->name; diff --git a/gdb/ui-file.c b/gdb/ui-file.c index c59c14c2544..1db421ddffa 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -225,7 +225,7 @@ ui_file_write (struct ui_file *file, void ui_file_write_for_put (void *data, const char *buffer, long length_buffer) { - ui_file_write (data, buffer, length_buffer); + ui_file_write ((struct ui_file *) data, buffer, length_buffer); } void @@ -330,7 +330,7 @@ struct accumulated_ui_file static void do_ui_file_xstrdup (void *context, const char *buffer, long length) { - struct accumulated_ui_file *acc = context; + struct accumulated_ui_file *acc = (struct accumulated_ui_file *) context; if (acc->buffer == NULL) acc->buffer = (char *) xmalloc (length + 1); @@ -413,7 +413,7 @@ mem_file_new (void) static void mem_file_delete (struct ui_file *file) { - struct mem_file *stream = ui_file_data (file); + struct mem_file *stream = (struct mem_file *) ui_file_data (file); if (stream->magic != &mem_file_magic) internal_error (__FILE__, __LINE__, @@ -432,7 +432,7 @@ mem_fileopen (void) static void mem_file_rewind (struct ui_file *file) { - struct mem_file *stream = ui_file_data (file); + struct mem_file *stream = (struct mem_file *) ui_file_data (file); if (stream->magic != &mem_file_magic) internal_error (__FILE__, __LINE__, @@ -445,7 +445,7 @@ mem_file_put (struct ui_file *file, ui_file_put_method_ftype *write, void *dest) { - struct mem_file *stream = ui_file_data (file); + struct mem_file *stream = (struct mem_file *) ui_file_data (file); if (stream->magic != &mem_file_magic) internal_error (__FILE__, __LINE__, @@ -459,7 +459,7 @@ mem_file_write (struct ui_file *file, const char *buffer, long length_buffer) { - struct mem_file *stream = ui_file_data (file); + struct mem_file *stream = (struct mem_file *) ui_file_data (file); if (stream->magic != &mem_file_magic) internal_error (__FILE__, __LINE__, @@ -535,7 +535,7 @@ stdio_file_new (FILE *file, int close_p) static void stdio_file_delete (struct ui_file *file) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -550,7 +550,7 @@ stdio_file_delete (struct ui_file *file) static void stdio_file_flush (struct ui_file *file) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -561,7 +561,7 @@ stdio_file_flush (struct ui_file *file) static long stdio_file_read (struct ui_file *file, char *buf, long length_buf) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -584,7 +584,7 @@ stdio_file_read (struct ui_file *file, char *buf, long length_buf) static void stdio_file_write (struct ui_file *file, const char *buf, long length_buf) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -600,7 +600,7 @@ static void stdio_file_write_async_safe (struct ui_file *file, const char *buf, long length_buf) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) { @@ -623,7 +623,7 @@ stdio_file_write_async_safe (struct ui_file *file, static void stdio_file_fputs (const char *linebuffer, struct ui_file *file) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -638,7 +638,7 @@ stdio_file_fputs (const char *linebuffer, struct ui_file *file) static int stdio_file_isatty (struct ui_file *file) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -649,7 +649,7 @@ stdio_file_isatty (struct ui_file *file) static int stdio_file_fseek (struct ui_file *file, long offset, int whence) { - struct stdio_file *stdio = ui_file_data (file); + struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file); if (stdio->magic != &stdio_file_magic) internal_error (__FILE__, __LINE__, @@ -770,7 +770,7 @@ tee_file_new (struct ui_file *one, int close_one, static void tee_file_delete (struct ui_file *file) { - struct tee_file *tee = ui_file_data (file); + struct tee_file *tee = (struct tee_file *) ui_file_data (file); if (tee->magic != &tee_file_magic) internal_error (__FILE__, __LINE__, @@ -786,7 +786,7 @@ tee_file_delete (struct ui_file *file) static void tee_file_flush (struct ui_file *file) { - struct tee_file *tee = ui_file_data (file); + struct tee_file *tee = (struct tee_file *) ui_file_data (file); if (tee->magic != &tee_file_magic) internal_error (__FILE__, __LINE__, @@ -798,7 +798,7 @@ tee_file_flush (struct ui_file *file) static void tee_file_write (struct ui_file *file, const char *buf, long length_buf) { - struct tee_file *tee = ui_file_data (file); + struct tee_file *tee = (struct tee_file *) ui_file_data (file); if (tee->magic != &tee_file_magic) internal_error (__FILE__, __LINE__, @@ -810,7 +810,7 @@ tee_file_write (struct ui_file *file, const char *buf, long length_buf) static void tee_file_fputs (const char *linebuffer, struct ui_file *file) { - struct tee_file *tee = ui_file_data (file); + struct tee_file *tee = (struct tee_file *) ui_file_data (file); if (tee->magic != &tee_file_magic) internal_error (__FILE__, __LINE__, @@ -822,7 +822,7 @@ tee_file_fputs (const char *linebuffer, struct ui_file *file) static int tee_file_isatty (struct ui_file *file) { - struct tee_file *tee = ui_file_data (file); + struct tee_file *tee = (struct tee_file *) ui_file_data (file); if (tee->magic != &tee_file_magic) internal_error (__FILE__, __LINE__, diff --git a/gdb/ui-out.c b/gdb/ui-out.c index a87c1d36a06..881a56ed793 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -360,7 +360,7 @@ and before table_body.")); static void do_cleanup_table_end (void *data) { - struct ui_out *ui_out = data; + struct ui_out *ui_out = (struct ui_out *) data; ui_out_table_end (ui_out); } @@ -429,7 +429,8 @@ struct ui_out_end_cleanup_data static void do_cleanup_end (void *data) { - struct ui_out_end_cleanup_data *end_cleanup_data = data; + struct ui_out_end_cleanup_data *end_cleanup_data + = (struct ui_out_end_cleanup_data *) data; ui_out_end (end_cleanup_data->uiout, end_cleanup_data->type); xfree (end_cleanup_data); diff --git a/gdb/user-regs.c b/gdb/user-regs.c index 526814b2e32..8e138f18b52 100644 --- a/gdb/user-regs.c +++ b/gdb/user-regs.c @@ -112,13 +112,14 @@ void user_reg_add (struct gdbarch *gdbarch, const char *name, user_reg_read_ftype *read, const void *baton) { - struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data); + struct gdb_user_regs *regs + = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); if (regs == NULL) { /* ULGH, called during architecture initialization. Patch things up. */ - regs = user_regs_init (gdbarch); + regs = (struct gdb_user_regs *) user_regs_init (gdbarch); deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs); } append_user_reg (regs, name, read, baton, @@ -154,7 +155,8 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name, /* Search the user name space. */ { - struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data); + struct gdb_user_regs *regs + = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); struct user_reg *reg; int nr; @@ -174,7 +176,8 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name, static struct user_reg * usernum_to_user_reg (struct gdbarch *gdbarch, int usernum) { - struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data); + struct gdb_user_regs *regs + = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); struct user_reg *reg; for (reg = regs->first; reg != NULL; reg = reg->next) @@ -226,7 +229,7 @@ maintenance_print_user_registers (char *args, int from_tty) struct user_reg *reg; int regnum; - regs = gdbarch_data (gdbarch, user_regs_data); + regs = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); regnum = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); fprintf_unfiltered (gdb_stdout, " %-11s %3s\n", "Name", "Nr"); diff --git a/gdb/utils.c b/gdb/utils.c index 3bb82f051b2..c7f00d9db8c 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -182,7 +182,7 @@ make_cleanup_dyn_string_delete (dyn_string_t arg) static void do_bfd_close_cleanup (void *arg) { - gdb_bfd_unref (arg); + gdb_bfd_unref ((bfd *) arg); } struct cleanup * @@ -196,7 +196,7 @@ make_cleanup_bfd_unref (bfd *abfd) static void do_fclose_cleanup (void *arg) { - FILE *file = arg; + FILE *file = (FILE *) arg; fclose (file); } @@ -214,7 +214,7 @@ make_cleanup_fclose (FILE *file) static void do_obstack_free (void *arg) { - struct obstack *ob = arg; + struct obstack *ob = (struct obstack *) arg; obstack_free (ob, NULL); } @@ -230,7 +230,7 @@ make_cleanup_obstack_free (struct obstack *obstack) static void do_ui_file_delete (void *arg) { - ui_file_delete (arg); + ui_file_delete ((struct ui_file *) arg); } struct cleanup * @@ -244,7 +244,7 @@ make_cleanup_ui_file_delete (struct ui_file *arg) static void do_ui_out_redirect_pop (void *arg) { - struct ui_out *uiout = arg; + struct ui_out *uiout = (struct ui_out *) arg; if (ui_out_redirect (uiout, NULL) < 0) warning (_("Cannot restore redirection of the current output protocol")); @@ -262,7 +262,7 @@ make_cleanup_ui_out_redirect_pop (struct ui_out *uiout) static void do_free_section_addr_info (void *arg) { - free_section_addr_info (arg); + free_section_addr_info ((struct section_addr_info *) arg); } struct cleanup * @@ -280,7 +280,8 @@ struct restore_integer_closure static void restore_integer (void *p) { - struct restore_integer_closure *closure = p; + struct restore_integer_closure *closure + = (struct restore_integer_closure *) p; *(closure->variable) = closure->value; } @@ -313,7 +314,7 @@ make_cleanup_restore_uinteger (unsigned int *variable) static void do_unpush_target (void *arg) { - struct target_ops *ops = arg; + struct target_ops *ops = (struct target_ops *) arg; unpush_target (ops); } @@ -331,7 +332,7 @@ make_cleanup_unpush_target (struct target_ops *ops) static void do_htab_delete_cleanup (void *htab_voidp) { - htab_t htab = htab_voidp; + htab_t htab = (htab_t) htab_voidp; htab_delete (htab); } @@ -353,7 +354,8 @@ struct restore_ui_file_closure static void do_restore_ui_file (void *p) { - struct restore_ui_file_closure *closure = p; + struct restore_ui_file_closure *closure + = (struct restore_ui_file_closure *) p; *(closure->variable) = closure->value; } @@ -394,7 +396,7 @@ make_cleanup_value_free_to_mark (struct value *mark) static void do_value_free (void *value) { - value_free (value); + value_free ((struct value *) value); } /* Free VALUE. */ @@ -410,7 +412,7 @@ make_cleanup_value_free (struct value *value) static void do_free_so (void *arg) { - struct so_list *so = arg; + struct so_list *so = (struct so_list *) arg; free_so (so); } @@ -474,7 +476,7 @@ make_cleanup_clear_parser_state (struct parser_state **p) void free_current_contents (void *ptr) { - void **location = ptr; + void **location = (void **) ptr; if (location == NULL) internal_error (__FILE__, __LINE__, @@ -1130,7 +1132,7 @@ make_hex_string (const gdb_byte *data, size_t length) static void do_regfree_cleanup (void *r) { - regfree (r); + regfree ((regex_t *) r); } /* Create a new cleanup that frees the compiled regular expression R. */ @@ -2781,7 +2783,7 @@ print_core_address (struct gdbarch *gdbarch, CORE_ADDR address) hashval_t core_addr_hash (const void *ap) { - const CORE_ADDR *addrp = ap; + const CORE_ADDR *addrp = (const CORE_ADDR *) ap; return *addrp; } @@ -2791,8 +2793,8 @@ core_addr_hash (const void *ap) int core_addr_eq (const void *ap, const void *bp) { - const CORE_ADDR *addr_ap = ap; - const CORE_ADDR *addr_bp = bp; + const CORE_ADDR *addr_ap = (const CORE_ADDR *) ap; + const CORE_ADDR *addr_bp = (const CORE_ADDR *) bp; return *addr_ap == *addr_bp; } @@ -3198,7 +3200,7 @@ producer_is_gcc (const char *producer, int *major, int *minor) static void do_free_char_ptr_vec (void *arg) { - VEC (char_ptr) *char_ptr_vec = arg; + VEC (char_ptr) *char_ptr_vec = (VEC (char_ptr) *) arg; free_char_ptr_vec (char_ptr_vec); } diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 401c3597b02..6c03dbde3f2 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1220,7 +1220,7 @@ v850_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct v850_frame_cache *) *this_cache; cache = v850_alloc_frame_cache (this_frame); *this_cache = cache; diff --git a/gdb/varobj.c b/gdb/varobj.c index 74a06d96385..92b0f33ffb2 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2196,7 +2196,7 @@ free_variable (struct varobj *var) static void do_free_variable_cleanup (void *var) { - free_variable (var); + free_variable ((struct varobj *) var); } static struct cleanup * diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index db57bee05c7..cf77ed9e849 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -71,7 +71,7 @@ static void vax_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - const gdb_byte *regs = gregs; + const gdb_byte *regs = (const gdb_byte *) gregs; int i; for (i = 0; i < VAX_NUM_REGS; i++) @@ -318,7 +318,7 @@ vax_frame_cache (struct frame_info *this_frame, void **this_cache) int regnum; if (*this_cache) - return *this_cache; + return (struct vax_frame_cache *) *this_cache; /* Allocate a new cache. */ cache = FRAME_OBSTACK_ZALLOC (struct vax_frame_cache); diff --git a/gdb/vaxobsd-tdep.c b/gdb/vaxobsd-tdep.c index 4e2701f79fa..af3c7faa86e 100644 --- a/gdb/vaxobsd-tdep.c +++ b/gdb/vaxobsd-tdep.c @@ -87,7 +87,7 @@ vaxobsd_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) CORE_ADDR addr, base, func; if (*this_cache) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; diff --git a/gdb/xml-support.c b/gdb/xml-support.c index 211f7457bb2..e3d57d16463 100644 --- a/gdb/xml-support.c +++ b/gdb/xml-support.c @@ -83,7 +83,7 @@ struct gdb_xml_parser static void gdb_xml_body_text (void *data, const XML_Char *text, int length) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope = VEC_last (scope_level_s, parser->scopes); if (parser->error.reason < 0) @@ -156,7 +156,7 @@ xml_find_attribute (VEC(gdb_xml_value_s) *attributes, const char *name) static void gdb_xml_values_cleanup (void *data) { - VEC(gdb_xml_value_s) **values = data; + VEC(gdb_xml_value_s) **values = (VEC(gdb_xml_value_s) **) data; struct gdb_xml_value *value; int ix; @@ -173,7 +173,7 @@ static void gdb_xml_start_element (void *data, const XML_Char *name, const XML_Char **attrs) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope; struct scope_level new_scope; const struct gdb_xml_element *element; @@ -312,7 +312,7 @@ static void gdb_xml_start_element_wrapper (void *data, const XML_Char *name, const XML_Char **attrs) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; if (parser->error.reason < 0) return; @@ -337,7 +337,7 @@ gdb_xml_start_element_wrapper (void *data, const XML_Char *name, static void gdb_xml_end_element (void *data, const XML_Char *name) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; struct scope_level *scope = VEC_last (scope_level_s, parser->scopes); const struct gdb_xml_element *element; unsigned int seen; @@ -395,7 +395,7 @@ gdb_xml_end_element (void *data, const XML_Char *name) static void gdb_xml_end_element_wrapper (void *data, const XML_Char *name) { - struct gdb_xml_parser *parser = data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data; if (parser->error.reason < 0) return; @@ -419,7 +419,7 @@ gdb_xml_end_element_wrapper (void *data, const XML_Char *name) static void gdb_xml_cleanup (void *arg) { - struct gdb_xml_parser *parser = arg; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) arg; struct scope_level *scope; int ix; @@ -489,7 +489,8 @@ gdb_xml_fetch_external_entity (XML_Parser expat_parser, const XML_Char *systemId, const XML_Char *publicId) { - struct gdb_xml_parser *parser = XML_GetUserData (expat_parser); + struct gdb_xml_parser *parser + = (struct gdb_xml_parser *) XML_GetUserData (expat_parser); XML_Parser entity_parser; const char *text; enum XML_Status status; @@ -689,10 +690,12 @@ gdb_xml_parse_attr_enum (struct gdb_xml_parser *parser, const struct gdb_xml_attribute *attribute, const char *value) { - const struct gdb_xml_enum *enums = attribute->handler_data; + const struct gdb_xml_enum *enums + = (const struct gdb_xml_enum *) attribute->handler_data; void *ret; - for (enums = attribute->handler_data; enums->name != NULL; enums++) + for (enums = (const struct gdb_xml_enum *) attribute->handler_data; + enums->name != NULL; enums++) if (strcasecmp (enums->name, value) == 0) break; @@ -754,8 +757,9 @@ xinclude_start_include (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct xinclude_parsing_data *data = user_data; - char *href = xml_find_attribute (attributes, "href")->value; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) user_data; + char *href = (char *) xml_find_attribute (attributes, "href")->value; struct cleanup *back_to; char *text, *output; @@ -789,7 +793,8 @@ xinclude_end_include (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct xinclude_parsing_data *data = user_data; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) user_data; data->skip_depth--; } @@ -797,8 +802,9 @@ xinclude_end_include (struct gdb_xml_parser *parser, static void XMLCALL xml_xinclude_default (void *data_, const XML_Char *s, int len) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; /* If we are inside of e.g. xi:include or the DTD, don't save this string. */ @@ -815,8 +821,9 @@ xml_xinclude_start_doctype (void *data_, const XML_Char *doctypeName, const XML_Char *sysid, const XML_Char *pubid, int has_internal_subset) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; /* Don't print out the doctype, or the contents of the DTD internal subset, if any. */ @@ -826,8 +833,9 @@ xml_xinclude_start_doctype (void *data_, const XML_Char *doctypeName, static void XMLCALL xml_xinclude_end_doctype (void *data_) { - struct gdb_xml_parser *parser = data_; - struct xinclude_parsing_data *data = parser->user_data; + struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data_; + struct xinclude_parsing_data *data + = (struct xinclude_parsing_data *) parser->user_data; data->skip_depth--; } @@ -844,7 +852,7 @@ xml_xinclude_xml_decl (void *data_, const XML_Char *version, static void xml_xinclude_cleanup (void *data_) { - struct xinclude_parsing_data *data = data_; + struct xinclude_parsing_data *data = (struct xinclude_parsing_data *) data_; obstack_free (&data->obstack, NULL); xfree (data); @@ -1015,7 +1023,7 @@ obstack_xml_printf (struct obstack *obstack, const char *format, ...) char * xml_fetch_content_from_file (const char *filename, void *baton) { - const char *dirname = baton; + const char *dirname = (const char *) baton; FILE *file; struct cleanup *back_to; char *text; diff --git a/gdb/xml-syscall.c b/gdb/xml-syscall.c index 255d8164bed..31a80a53277 100644 --- a/gdb/xml-syscall.c +++ b/gdb/xml-syscall.c @@ -129,7 +129,7 @@ syscalls_info_free_syscalls_desc (struct syscall_desc *sd) static void free_syscalls_info (void *arg) { - struct syscalls_info *syscalls_info = arg; + struct syscalls_info *syscalls_info = (struct syscalls_info *) arg; struct syscall_desc *sysdesc; int i; @@ -171,7 +171,7 @@ syscall_start_syscall (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct syscall_parsing_data *data = user_data; + struct syscall_parsing_data *data = (struct syscall_parsing_data *) user_data; struct gdb_xml_value *attrs = VEC_address (gdb_xml_value_s, attributes); int len, i; /* syscall info. */ @@ -183,7 +183,7 @@ syscall_start_syscall (struct gdb_xml_parser *parser, for (i = 0; i < len; i++) { if (strcmp (attrs[i].name, "name") == 0) - name = attrs[i].value; + name = (char *) attrs[i].value; else if (strcmp (attrs[i].name, "number") == 0) number = * (ULONGEST *) attrs[i].value; else diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index 65744ffe84c..10c0d9e8fed 100644 --- a/gdb/xml-tdesc.c +++ b/gdb/xml-tdesc.c @@ -101,7 +101,7 @@ tdesc_end_arch (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; const struct bfd_arch_info *arch; arch = bfd_scan_arch (body_text); @@ -118,7 +118,7 @@ tdesc_end_osabi (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; enum gdb_osabi osabi; osabi = osabi_from_tdesc_string (body_text); @@ -136,7 +136,7 @@ tdesc_end_compatible (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; const struct bfd_arch_info *arch; arch = bfd_scan_arch (body_text); @@ -150,7 +150,7 @@ tdesc_start_target (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - char *version = xml_find_attribute (attributes, "version")->value; + char *version = (char *) xml_find_attribute (attributes, "version")->value; if (strcmp (version, "1.0") != 0) gdb_xml_error (parser, @@ -165,8 +165,8 @@ tdesc_start_feature (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; - char *name = xml_find_attribute (attributes, "name")->value; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; + char *name = (char *) xml_find_attribute (attributes, "name")->value; data->current_feature = tdesc_create_feature (data->tdesc, name); } @@ -179,7 +179,7 @@ tdesc_start_reg (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct gdb_xml_value *attrs = VEC_address (gdb_xml_value_s, attributes); int ix = 0, length; char *name, *group, *type; @@ -187,7 +187,7 @@ tdesc_start_reg (struct gdb_xml_parser *parser, length = VEC_length (gdb_xml_value_s, attributes); - name = attrs[ix++].value; + name = (char *) attrs[ix++].value; bitsize = * (ULONGEST *) attrs[ix++].value; if (ix < length && strcmp (attrs[ix].name, "regnum") == 0) @@ -196,12 +196,12 @@ tdesc_start_reg (struct gdb_xml_parser *parser, regnum = data->next_regnum; if (ix < length && strcmp (attrs[ix].name, "type") == 0) - type = attrs[ix++].value; + type = (char *) attrs[ix++].value; else type = "int"; if (ix < length && strcmp (attrs[ix].name, "group") == 0) - group = attrs[ix++].value; + group = (char *) attrs[ix++].value; else group = NULL; @@ -230,8 +230,8 @@ tdesc_start_union (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; - char *id = xml_find_attribute (attributes, "id")->value; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; + char *id = (char *) xml_find_attribute (attributes, "id")->value; data->current_type = tdesc_create_union (data->current_feature, id); data->current_type_size = 0; @@ -246,8 +246,8 @@ tdesc_start_struct (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; - char *id = xml_find_attribute (attributes, "id")->value; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; + char *id = (char *) xml_find_attribute (attributes, "id")->value; struct tdesc_type *type; struct gdb_xml_value *attr; @@ -271,8 +271,8 @@ tdesc_start_flags (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; - char *id = xml_find_attribute (attributes, "id")->value; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; + char *id = (char *) xml_find_attribute (attributes, "id")->value; int length = (int) * (ULONGEST *) xml_find_attribute (attributes, "size")->value; struct tdesc_type *type; @@ -292,17 +292,17 @@ tdesc_start_field (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct gdb_xml_value *attr; struct tdesc_type *field_type; char *field_name, *field_type_id; int start, end; - field_name = xml_find_attribute (attributes, "name")->value; + field_name = (char *) xml_find_attribute (attributes, "name")->value; attr = xml_find_attribute (attributes, "type"); if (attr != NULL) - field_type_id = attr->value; + field_type_id = (char *) attr->value; else field_type_id = NULL; @@ -385,14 +385,14 @@ tdesc_start_vector (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, VEC(gdb_xml_value_s) *attributes) { - struct tdesc_parsing_data *data = user_data; + struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct gdb_xml_value *attrs = VEC_address (gdb_xml_value_s, attributes); struct tdesc_type *field_type; char *id, *field_type_id; int count; - id = attrs[0].value; - field_type_id = attrs[1].value; + id = (char *) attrs[0].value; + field_type_id = (char *) attrs[1].value; count = * (ULONGEST *) attrs[2].value; field_type = tdesc_named_type (data->current_feature, field_type_id); @@ -598,7 +598,7 @@ file_read_description_xml (const char *filename) static char * fetch_available_features_from_target (const char *name, void *baton_) { - struct target_ops *ops = baton_; + struct target_ops *ops = (struct target_ops *) baton_; /* Read this object as a string. This ensures that a NUL terminator is added. */ diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 92e3b3792b5..ee28e426d46 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -678,7 +678,7 @@ xstormy16_frame_cache (struct frame_info *this_frame, void **this_cache) int i; if (*this_cache) - return *this_cache; + return (struct xstormy16_frame_cache *) *this_cache; cache = xstormy16_alloc_frame_cache (); *this_cache = cache; diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index c3b22e0fb57..a24fb2596f2 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -851,7 +851,7 @@ xtensa_supply_gregset (const struct regset *regset, const void *gregs, size_t len) { - const xtensa_elf_gregset_t *regs = gregs; + const xtensa_elf_gregset_t *regs = (const xtensa_elf_gregset_t *) gregs; struct gdbarch *gdbarch = get_regcache_arch (rc); int i; @@ -1272,7 +1272,7 @@ xtensa_frame_cache (struct frame_info *this_frame, void **this_cache) int windowed, ps_regnum; if (*this_cache) - return *this_cache; + return (struct xtensa_frame_cache *) *this_cache; pc = get_frame_register_unsigned (this_frame, gdbarch_pc_regnum (gdbarch)); ps_regnum = gdbarch_ps_regnum (gdbarch); @@ -1452,7 +1452,7 @@ xtensa_frame_prev_register (struct frame_info *this_frame, if (*this_cache == NULL) *this_cache = xtensa_frame_cache (this_frame, this_cache); - cache = *this_cache; + cache = (struct xtensa_frame_cache *) *this_cache; if (regnum ==gdbarch_pc_regnum (gdbarch)) saved_reg = cache->ra; @@ -1566,7 +1566,7 @@ xtensa_extract_return_value (struct type *type, void *dst) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - bfd_byte *valbuf = dst; + bfd_byte *valbuf = (bfd_byte *) dst; int len = TYPE_LENGTH (type); ULONGEST pc, wb; int callsize, areg; @@ -1622,7 +1622,7 @@ xtensa_store_return_value (struct type *type, const void *dst) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - const bfd_byte *valbuf = dst; + const bfd_byte *valbuf = (const bfd_byte *) dst; unsigned int areg; ULONGEST pc, wb; int callsize; |