From 578c1c03b68ec45894ae77dc23d4d55237ba8e2a Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 19 Sep 2004 15:37:55 +0000 Subject: [PATCH] * fbsd-nat.c: New files with cleaned up contents of fbsd-proc.c. * fbsd-nat.h: New file. * Makefile.in (ALLDEPFILES): Add fbsd-nat.c. (fbsd_nat_h): New variable. (fbsd-nat.o): New dependency. --- gdb/ChangeLog | 6 ++ gdb/Makefile.in | 8 ++- gdb/fbsd-nat.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/fbsd-nat.h | 43 ++++++++++++++ 4 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 gdb/fbsd-nat.c create mode 100644 gdb/fbsd-nat.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8ee6b2a..c39d7f8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-09-19 Mark Kettenis + * fbsd-nat.c: New files with cleaned up contents of fbsd-proc.c. + * fbsd-nat.h: New file. + * Makefile.in (ALLDEPFILES): Add fbsd-nat.c. + (fbsd_nat_h): New variable. + (fbsd-nat.o): New dependency. + * config/sparc/nbsd64.mt, config/sparc/obsd.mt, config/sparc/obsd64.mt (DEPRECATED_TM_FILE): Set to solib.h. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a90de94..d992016 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -668,6 +668,7 @@ event_loop_h = event-loop.h event_top_h = event-top.h exec_h = exec.h $(target_h) expression_h = expression.h $(symtab_h) $(doublest_h) +fbsd_nat_h = fbsd-nat.h f_lang_h = f-lang.h frame_base_h = frame-base.h frame_h = frame.h @@ -1358,7 +1359,9 @@ ALLDEPFILES = \ bsd-kvm.c \ coff-solib.c \ core-regset.c core-aout.c corelow.c \ - dcache.c exec.c fork-child.c \ + dcache.c exec.c \ + fbsd-nat.c \ + fork-child.c \ glibc-tdep.c \ go32-nat.c h8300-tdep.c \ hppa-tdep.c hppa-hpux-tdep.c \ @@ -1868,6 +1871,9 @@ exec.o: exec.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) $(gdbcmd_h) \ expprint.o: expprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ $(value_h) $(language_h) $(parser_defs_h) $(user_regs_h) $(target_h) \ $(gdb_string_h) $(block_h) +fbsd-nat.o: fbsd-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h) \ + $(regset_h) $(gdb_assert_h) $(gdb_string_h) $(elf_bfd_h) \ + $(fbsd_nat_h) fbsd-proc.o: fbsd-proc.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h) \ $(regset_h) $(gdb_assert_h) $(gdb_string_h) $(elf_bfd_h) f-exp.o: f-exp.c $(defs_h) $(gdb_string_h) $(expression_h) $(value_h) \ diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c new file mode 100644 index 0000000..b7045d4 --- /dev/null +++ b/gdb/fbsd-nat.c @@ -0,0 +1,181 @@ +/* Native-dependent code for FreeBSD. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "gdbcore.h" +#include "inferior.h" +#include "regcache.h" +#include "regset.h" + +#include "gdb_assert.h" +#include "gdb_string.h" +#include +#include + +#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) +{ + char *path; + char *buf; + + path = xstrprintf ("/proc/%d/file", pid); + buf = xcalloc (MAXPATHLEN, sizeof (char)); + make_cleanup (xfree, path); + make_cleanup (xfree, buf); + + if (readlink (path, buf, MAXPATHLEN) > 0) + return buf; + + return NULL; +} + +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 +fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long, + int, int, int, void *), + void *obfd) +{ + pid_t pid = ptid_get_pid (inferior_ptid); + char *mapfilename; + FILE *mapfile; + unsigned long start, end, size; + char protection[4]; + int read, write, exec; + + mapfilename = xstrprintf ("/proc/%ld/map", (long) pid); + mapfile = fopen (mapfilename, "r"); + if (mapfile == NULL) + error ("Couldn't open %s\n", mapfilename); + + 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, + "Save segment, %ld bytes at 0x%s (%c%c%c)\n", + size, paddr_nz (start), + read ? 'r' : '-', + write ? 'w' : '-', + exec ? 'x' : '-'); + } + + /* Invoke the callback function to create the corefile segment. */ + func (start, size, read, write, exec, obfd); + } + + fclose (mapfile); + return 0; +} + +/* Create appropriate note sections for a corefile, returning them in + allocated memory. */ + +char * +fbsd_make_corefile_notes (bfd *obfd, int *note_size) +{ + struct gdbarch *gdbarch = current_gdbarch; + const struct regcache *regcache = current_regcache; + 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), + stop_signal, &gregs); + + 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 ()) + psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL); + + note_data = elfcore_write_prpsinfo (obfd, note_data, note_size, + fname, psargs); + } + + make_cleanup (xfree, note_data); + return note_data; +} diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h new file mode 100644 index 0000000..b59cf66 --- /dev/null +++ b/gdb/fbsd-nat.h @@ -0,0 +1,43 @@ +/* Native-dependent code for FreeBSD. + + Copyright 2004 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef FBSD_NAT_H +#define FBSD_NAT_H + +/* Return a the name of file that can be opened to get the symbols for + the child process identified by PID. */ + +extern char *fbsd_pid_to_exec_file (int pid); + +/* 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. */ + +extern int fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long, + int, int, int, void *), + void *obfd); + +/* Create appropriate note sections for a corefile, returning them in + allocated memory. */ + +extern char *fbsd_make_corefile_notes (bfd *obfd, int *note_size); + +#endif /* fbsd-nat.h */ -- 2.7.4