2004-09-19 15:37:55 +00:00
|
|
|
/* Native-dependent code for FreeBSD.
|
|
|
|
|
2010-01-01 07:32:07 +00:00
|
|
|
Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010
|
2009-01-03 05:58:08 +00:00
|
|
|
Free Software Foundation, Inc.
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-23 18:08:50 +00:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2004-09-19 15:37:55 +00:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 18:08:50 +00:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "gdbcore.h"
|
|
|
|
#include "inferior.h"
|
|
|
|
#include "regcache.h"
|
|
|
|
#include "regset.h"
|
2008-09-08 21:51:18 +00:00
|
|
|
#include "gdbthread.h"
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
#include "gdb_assert.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include <sys/types.h>
|
2005-05-01 10:06:12 +00:00
|
|
|
#include <sys/procfs.h>
|
|
|
|
#include <sys/sysctl.h>
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
#include "fbsd-nat.h"
|
|
|
|
|
|
|
|
/* Return a the name of file that can be opened to get the symbols for
|
|
|
|
the child process identified by PID. */
|
|
|
|
|
|
|
|
char *
|
|
|
|
fbsd_pid_to_exec_file (int pid)
|
|
|
|
{
|
2005-05-01 10:06:12 +00:00
|
|
|
size_t len = MAXPATHLEN;
|
|
|
|
char *buf = xcalloc (len, sizeof (char));
|
2004-09-19 15:37:55 +00:00
|
|
|
char *path;
|
|
|
|
|
2005-05-01 10:06:12 +00:00
|
|
|
#ifdef KERN_PROC_PATHNAME
|
|
|
|
int mib[4];
|
2004-09-19 15:37:55 +00:00
|
|
|
|
2005-05-01 10:06:12 +00:00
|
|
|
mib[0] = CTL_KERN;
|
|
|
|
mib[1] = KERN_PROC;
|
|
|
|
mib[2] = KERN_PROC_PATHNAME;
|
|
|
|
mib[3] = pid;
|
|
|
|
if (sysctl (mib, 4, buf, &len, NULL, 0) == 0)
|
2004-09-19 15:37:55 +00:00
|
|
|
return buf;
|
2005-05-01 10:06:12 +00:00
|
|
|
#endif
|
2004-09-19 15:37:55 +00:00
|
|
|
|
2005-05-01 10:06:12 +00:00
|
|
|
path = xstrprintf ("/proc/%d/file", pid);
|
|
|
|
if (readlink (path, buf, MAXPATHLEN) == -1)
|
|
|
|
{
|
|
|
|
xfree (buf);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
xfree (path);
|
|
|
|
return buf;
|
2004-09-19 15:37:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
fbsd_read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end,
|
|
|
|
char *protection)
|
|
|
|
{
|
|
|
|
/* FreeBSD 5.1-RELEASE uses a 256-byte buffer. */
|
|
|
|
char buf[256];
|
|
|
|
int resident, privateresident;
|
|
|
|
unsigned long obj;
|
|
|
|
int ret = EOF;
|
|
|
|
|
|
|
|
/* As of FreeBSD 5.0-RELEASE, the layout is described in
|
|
|
|
/usr/src/sys/fs/procfs/procfs_map.c. Somewhere in 5.1-CURRENT a
|
|
|
|
new column was added to the procfs map. Therefore we can't use
|
|
|
|
fscanf since we need to support older releases too. */
|
|
|
|
if (fgets (buf, sizeof buf, mapfile) != NULL)
|
|
|
|
ret = sscanf (buf, "%lx %lx %d %d %lx %s", start, end,
|
|
|
|
&resident, &privateresident, &obj, protection);
|
|
|
|
|
|
|
|
return (ret != 0 && ret != EOF);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Iterate over all the memory regions in the current inferior,
|
|
|
|
calling FUNC for each memory region. OBFD is passed as the last
|
|
|
|
argument to FUNC. */
|
|
|
|
|
|
|
|
int
|
2010-08-31 18:08:43 +00:00
|
|
|
fbsd_find_memory_regions (find_memory_region_ftype func, void *obfd)
|
2004-09-19 15:37:55 +00:00
|
|
|
{
|
|
|
|
pid_t pid = ptid_get_pid (inferior_ptid);
|
|
|
|
char *mapfilename;
|
|
|
|
FILE *mapfile;
|
|
|
|
unsigned long start, end, size;
|
|
|
|
char protection[4];
|
|
|
|
int read, write, exec;
|
2008-10-28 15:22:13 +00:00
|
|
|
struct cleanup *cleanup;
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
mapfilename = xstrprintf ("/proc/%ld/map", (long) pid);
|
2008-10-28 15:22:13 +00:00
|
|
|
cleanup = make_cleanup (xfree, mapfilename);
|
2004-09-19 15:37:55 +00:00
|
|
|
mapfile = fopen (mapfilename, "r");
|
|
|
|
if (mapfile == NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Couldn't open %s."), mapfilename);
|
2008-10-28 15:22:13 +00:00
|
|
|
make_cleanup_fclose (mapfile);
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
if (info_verbose)
|
|
|
|
fprintf_filtered (gdb_stdout,
|
|
|
|
"Reading memory regions from %s\n", mapfilename);
|
|
|
|
|
|
|
|
/* Now iterate until end-of-file. */
|
|
|
|
while (fbsd_read_mapping (mapfile, &start, &end, &protection[0]))
|
|
|
|
{
|
|
|
|
size = end - start;
|
|
|
|
|
|
|
|
read = (strchr (protection, 'r') != 0);
|
|
|
|
write = (strchr (protection, 'w') != 0);
|
|
|
|
exec = (strchr (protection, 'x') != 0);
|
|
|
|
|
|
|
|
if (info_verbose)
|
|
|
|
{
|
|
|
|
fprintf_filtered (gdb_stdout,
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-02 17:21:10 +00:00
|
|
|
"Save segment, %ld bytes at %s (%c%c%c)\n",
|
|
|
|
size, paddress (target_gdbarch, start),
|
2004-09-19 15:37:55 +00:00
|
|
|
read ? 'r' : '-',
|
|
|
|
write ? 'w' : '-',
|
|
|
|
exec ? 'x' : '-');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Invoke the callback function to create the corefile segment. */
|
|
|
|
func (start, size, read, write, exec, obfd);
|
|
|
|
}
|
|
|
|
|
2008-10-28 15:22:13 +00:00
|
|
|
do_cleanups (cleanup);
|
2004-09-19 15:37:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-08 21:51:18 +00:00
|
|
|
static int
|
|
|
|
find_signalled_thread (struct thread_info *info, void *data)
|
|
|
|
{
|
gdb/
Rename and move inferior_thread_state and inferior_status.
* gdbthread.h (struct thread_control_state): New struct, move fields
step_range_start, step_range_end, step_frame_id, step_stack_frame_id,
trap_expected, proceed_to_finish, in_infcall, step_over_calls,
stop_step and stop_bpstat here from struct thread_info.
(struct thread_suspend_state): New struct, move field stop_signal here
from struct thread_info.
(struct thread_info): Move the fields above from this struct.
* inferior.h: Move the inferior_thread_state and inferior_status
declarations comment to their definitions at infrun.c.
(struct inferior_control_state): New struct, move field stop_soon from
struct inferior here.
(struct inferior_suspend_state): New empty struct.
(struct inferior): New fields control and suspend. Move out field
stop_soon.
* infrun.c (struct inferior_thread_state): Rename to ...
(infcall_suspend_state): ... here. Replace field stop_signal by
fields thread_suspend and inferior_suspend.
(save_inferior_thread_state): Rename to ...
(save_infcall_suspend_state): ... here. New variable inf. Update the
code for new fields.
(restore_inferior_thread_state): Rename to ...
(restore_infcall_suspend_state): ... here. New variable inf. Update
the code for new fields.
(do_restore_inferior_thread_state_cleanup): Rename to ...
(do_restore_infcall_suspend_state_cleanup): ... here.
(make_cleanup_restore_inferior_thread_state): Rename to ...
(make_cleanup_restore_infcall_suspend_state): ... here.
(discard_inferior_thread_state): Rename to ...
(discard_infcall_suspend_state): ... here.
(get_inferior_thread_state_regcache): Rename to ...
(get_infcall_suspend_state_regcache): ... here.
(struct inferior_status): Rename to ...
(struct infcall_control_state): ... here. Replace fields
step_range_start, step_range_end, step_frame_id, step_stack_frame_id,
trap_expected, proceed_to_finish, in_infcall, step_over_calls,
stop_step, stop_bpstat and stop_soon by fields thread_control and
inferior_control.
(save_inferior_status): Rename to ...
(save_infcall_control_state): ... here. Update the code for new
fields.
(restore_inferior_status): Rename to ...
(restore_infcall_control_state): ... here. Update the code for new
fields.
(do_restore_inferior_status_cleanup): Rename to ...
(do_restore_infcall_control_state_cleanup): ... here.
(make_cleanup_restore_inferior_status): Rename to ...
(make_cleanup_restore_infcall_control_state): ... here.
(discard_inferior_status): Rename to ...
(discard_infcall_control_state): ... here.
* alpha-tdep.c, breakpoint.c, dummy-frame.c, dummy-frame.h,
exceptions.c, fbsd-nat.c, gdbthread.h, infcall.c, infcmd.c,
inferior.c, inferior.h, infrun.c, linux-nat.c, mi/mi-interp.c,
mips-tdep.c, procfs.c, solib-irix.c, solib-osf.c, solib-spu.c,
solib-sunos.c, solib-svr4.c, thread.c, windows-nat.c: Update all the
references to the moved fields and renamed functions.
2010-11-28 04:31:25 +00:00
|
|
|
if (info->suspend.stop_signal != TARGET_SIGNAL_0
|
2008-09-08 21:51:18 +00:00
|
|
|
&& ptid_get_pid (info->ptid) == ptid_get_pid (inferior_ptid))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum target_signal
|
|
|
|
find_stop_signal (void)
|
|
|
|
{
|
|
|
|
struct thread_info *info =
|
|
|
|
iterate_over_threads (find_signalled_thread, NULL);
|
|
|
|
|
|
|
|
if (info)
|
gdb/
Rename and move inferior_thread_state and inferior_status.
* gdbthread.h (struct thread_control_state): New struct, move fields
step_range_start, step_range_end, step_frame_id, step_stack_frame_id,
trap_expected, proceed_to_finish, in_infcall, step_over_calls,
stop_step and stop_bpstat here from struct thread_info.
(struct thread_suspend_state): New struct, move field stop_signal here
from struct thread_info.
(struct thread_info): Move the fields above from this struct.
* inferior.h: Move the inferior_thread_state and inferior_status
declarations comment to their definitions at infrun.c.
(struct inferior_control_state): New struct, move field stop_soon from
struct inferior here.
(struct inferior_suspend_state): New empty struct.
(struct inferior): New fields control and suspend. Move out field
stop_soon.
* infrun.c (struct inferior_thread_state): Rename to ...
(infcall_suspend_state): ... here. Replace field stop_signal by
fields thread_suspend and inferior_suspend.
(save_inferior_thread_state): Rename to ...
(save_infcall_suspend_state): ... here. New variable inf. Update the
code for new fields.
(restore_inferior_thread_state): Rename to ...
(restore_infcall_suspend_state): ... here. New variable inf. Update
the code for new fields.
(do_restore_inferior_thread_state_cleanup): Rename to ...
(do_restore_infcall_suspend_state_cleanup): ... here.
(make_cleanup_restore_inferior_thread_state): Rename to ...
(make_cleanup_restore_infcall_suspend_state): ... here.
(discard_inferior_thread_state): Rename to ...
(discard_infcall_suspend_state): ... here.
(get_inferior_thread_state_regcache): Rename to ...
(get_infcall_suspend_state_regcache): ... here.
(struct inferior_status): Rename to ...
(struct infcall_control_state): ... here. Replace fields
step_range_start, step_range_end, step_frame_id, step_stack_frame_id,
trap_expected, proceed_to_finish, in_infcall, step_over_calls,
stop_step, stop_bpstat and stop_soon by fields thread_control and
inferior_control.
(save_inferior_status): Rename to ...
(save_infcall_control_state): ... here. Update the code for new
fields.
(restore_inferior_status): Rename to ...
(restore_infcall_control_state): ... here. Update the code for new
fields.
(do_restore_inferior_status_cleanup): Rename to ...
(do_restore_infcall_control_state_cleanup): ... here.
(make_cleanup_restore_inferior_status): Rename to ...
(make_cleanup_restore_infcall_control_state): ... here.
(discard_inferior_status): Rename to ...
(discard_infcall_control_state): ... here.
* alpha-tdep.c, breakpoint.c, dummy-frame.c, dummy-frame.h,
exceptions.c, fbsd-nat.c, gdbthread.h, infcall.c, infcmd.c,
inferior.c, inferior.h, infrun.c, linux-nat.c, mi/mi-interp.c,
mips-tdep.c, procfs.c, solib-irix.c, solib-osf.c, solib-spu.c,
solib-sunos.c, solib-svr4.c, thread.c, windows-nat.c: Update all the
references to the moved fields and renamed functions.
2010-11-28 04:31:25 +00:00
|
|
|
return info->suspend.stop_signal;
|
2008-09-08 21:51:18 +00:00
|
|
|
else
|
|
|
|
return TARGET_SIGNAL_0;
|
|
|
|
}
|
|
|
|
|
2004-09-19 15:37:55 +00:00
|
|
|
/* Create appropriate note sections for a corefile, returning them in
|
|
|
|
allocated memory. */
|
|
|
|
|
|
|
|
char *
|
|
|
|
fbsd_make_corefile_notes (bfd *obfd, int *note_size)
|
|
|
|
{
|
2007-06-16 17:16:26 +00:00
|
|
|
const struct regcache *regcache = get_current_regcache ();
|
2007-11-07 06:53:41 +00:00
|
|
|
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
2004-09-19 15:37:55 +00:00
|
|
|
gregset_t gregs;
|
|
|
|
fpregset_t fpregs;
|
|
|
|
char *note_data = NULL;
|
|
|
|
Elf_Internal_Ehdr *i_ehdrp;
|
|
|
|
const struct regset *regset;
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
/* Put a "FreeBSD" label in the ELF header. */
|
|
|
|
i_ehdrp = elf_elfheader (obfd);
|
|
|
|
i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
|
|
|
|
|
|
|
|
gdb_assert (gdbarch_regset_from_core_section_p (gdbarch));
|
|
|
|
|
|
|
|
size = sizeof gregs;
|
|
|
|
regset = gdbarch_regset_from_core_section (gdbarch, ".reg", size);
|
|
|
|
gdb_assert (regset && regset->collect_regset);
|
|
|
|
regset->collect_regset (regset, regcache, -1, &gregs, size);
|
|
|
|
|
|
|
|
note_data = elfcore_write_prstatus (obfd, note_data, note_size,
|
|
|
|
ptid_get_pid (inferior_ptid),
|
2008-09-08 21:51:18 +00:00
|
|
|
find_stop_signal (), &gregs);
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
size = sizeof fpregs;
|
|
|
|
regset = gdbarch_regset_from_core_section (gdbarch, ".reg2", size);
|
|
|
|
gdb_assert (regset && regset->collect_regset);
|
|
|
|
regset->collect_regset (regset, regcache, -1, &fpregs, size);
|
|
|
|
|
|
|
|
note_data = elfcore_write_prfpreg (obfd, note_data, note_size,
|
|
|
|
&fpregs, sizeof (fpregs));
|
|
|
|
|
|
|
|
if (get_exec_file (0))
|
|
|
|
{
|
|
|
|
char *fname = strrchr (get_exec_file (0), '/') + 1;
|
|
|
|
char *psargs = xstrdup (fname);
|
|
|
|
|
|
|
|
if (get_inferior_args ())
|
2010-05-07 14:42:30 +00:00
|
|
|
psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
|
|
|
|
(char *) NULL);
|
2004-09-19 15:37:55 +00:00
|
|
|
|
|
|
|
note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
|
|
|
|
fname, psargs);
|
|
|
|
}
|
|
|
|
|
|
|
|
make_cleanup (xfree, note_data);
|
|
|
|
return note_data;
|
|
|
|
}
|