From c2b054dc11b15ecb11201cb2caa5a98d6f6f6c25 Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 29 Jun 2002 01:16:01 +0000 Subject: Bmake bits for GDB 5.2. --- gnu/usr.bin/binutils/gdb/Makefile | 55 +- gnu/usr.bin/binutils/gdb/Makefile.alpha | 16 +- gnu/usr.bin/binutils/gdb/Makefile.i386 | 11 +- gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c | 55 -- gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c | 174 ---- gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c | 451 --------- gnu/usr.bin/binutils/gdb/alpha/nm.h | 97 -- gnu/usr.bin/binutils/gdb/alpha/tm.h | 48 - gnu/usr.bin/binutils/gdb/alpha/version.c | 4 - gnu/usr.bin/binutils/gdb/alpha/xm.h | 30 - gnu/usr.bin/binutils/gdb/config.h | 11 +- gnu/usr.bin/binutils/gdb/freebsd-uthread.c | 403 ++------ gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c | 710 ------------- gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c | 1045 -------------------- gnu/usr.bin/binutils/gdb/i386/nm.h | 168 ---- gnu/usr.bin/binutils/gdb/i386/tm.h | 70 -- gnu/usr.bin/binutils/gdb/i386/xm.h | 23 - gnu/usr.bin/binutils/gdb/kvm-fbsd.c | 18 +- 18 files changed, 176 insertions(+), 3213 deletions(-) delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/nm.h delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/tm.h delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/version.c delete mode 100644 gnu/usr.bin/binutils/gdb/alpha/xm.h delete mode 100644 gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c delete mode 100644 gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c delete mode 100644 gnu/usr.bin/binutils/gdb/i386/nm.h delete mode 100644 gnu/usr.bin/binutils/gdb/i386/tm.h delete mode 100644 gnu/usr.bin/binutils/gdb/i386/xm.h (limited to 'gnu/usr.bin') diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile index 291a0a18..f6c7865 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -9,22 +9,28 @@ PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c command.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c core-regset.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ - findvar%UAfix.c fork-child.c freebsd-uthread.c gdbarch.c gdbtypes.c \ + findvar.c fork-child.c gdbarch.c gdbtypes.c \ infcmd.c inflow.c infptrace.c infrun.c inftarg.c language.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c nlmread.c \ m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c main.c maint.c \ mdebugread.c mem-break.c minsyms.c objfiles.c parse.c \ printcmd.c remote.c remote-utils.c scm-exp.c scm-lang.c \ scm-valprint.c solib.c source.c stabsread.c stack.c symfile.c \ - symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ + symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ typeprint.c utils.c valarith.c valops.c valprint.c values.c \ - version.c serial.c ser-unix.c ser-tcp.c -SRCS= init.c ${XSRCS} -SRCS+= wait.h + serial.c ser-unix.c ser-tcp.c +XSRCS+= arch-utils.c cp-abi.c completer.c doublest.c event-loop.c \ + event-top.c frame.c gdb-events.c inf-loop.c linespec.c \ + memattr.c regcache.c signals.c solib-svr4.c solib-legacy.c \ + ui-file.c ui-out.c wrapper.c cli-out.c \ + cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-script.c \ + cli-script.h cli-setshow.c cli-setshow.h cli-utils.c cli-utils.h +XSRCS+= freebsd-uthread.c kvm-fbsd.c +SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h .if exists(${.CURDIR}/Makefile.${TARGET_ARCH}) .include "${.CURDIR}/Makefile.${TARGET_ARCH}" @@ -34,17 +40,22 @@ WARNS= 0 .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${GDBDIR}/gdb CFLAGS+= -I${GDBDIR}/gdb/config -DPADD= ${RELTOP}/libbfd/libbfd.a +DPADD= ${LIBKVM} +DPADD+= ${LIBM} +DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a DPADD+= ${LIBGNUREGEX} DPADD+= ${RELTOP}/libiberty/libiberty.a DPADD+= ${LIBREADLINE} DPADD+= ${LIBTERMCAP} +LDADD= -lkvm +LDADD+= -lm LDADD+= ${RELTOP}/libbfd/libbfd.a LDADD+= ${RELTOP}/libopcodes/libopcodes.a LDADD+= -lgnuregex @@ -53,16 +64,13 @@ LDADD+= -lreadline LDADD+= -ltermcap GDBDIR= ${.CURDIR}/../../../../contrib/gdb -.PATH: ${GDBDIR}/gdb +.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli .PATH: ${SRCDIR}/opcodes -CFLAGS+= -DFREEBSD_ELF - CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline YFLAGS= -CLEANFILES= init.c init.c-tmp wait.h -CLEANFILES+= findvar%UAfix.c +CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine @@ -80,6 +88,8 @@ init.c: ${XSRCS} @rm -f init.c-tmp @echo '/* Do not modify this file. */' >init.c-tmp @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp + @echo '#include "defs.h"' >>init.c-tmp + @echo '#include "call-cmds.h"' >>init.c-tmp @echo 'void initialize_all_files () {' >>init.c-tmp @for i in ${.ALLSRC} ; do \ filename=`echo $$i | sed \ @@ -106,7 +116,24 @@ init.c: ${XSRCS} .PRECIOUS: init.c -wait.h: - ln -sf ${.CURDIR}/../../../../sys/sys/wait.h ${.TARGET} +nm.h: + echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "fbsd-kgdb.h"' >>${.TARGET} + +.for H in tm-fbsd xm-${TARGET_ARCH} +${H:C/-.*$//}.h: + ln -sf \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.TARGET} +.endfor + +gdbversion.c: version.in + @echo '#include "version.h"' > ${.TARGET} + @echo 'const char version[] = "'"`sed q ${.ALLSRC}`"'";'>>${.TARGET} + @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET} + @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET} + +xregex.h: + @echo '#include ' >${.TARGET} .include diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha index 73f77af..2f1a2ab 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile.alpha +++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha @@ -1,16 +1,4 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/alpha - -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -XSRCS+= freebsd-nat.c -.else -XSRCS+= freebsd-nat-stubs.c -.endif -XSRCS+= alpha-tdep.c kvm-fbsd.c -LDADD+= -lkvm - -findvar%UAfix.c: findvar.c - sed -e \ - 's,char registers[REGISTER_BYTES + /* SLOP */ 256];,char registers[REGISTER_BYTES + /* SLOP */ 256] __attribute__ ((aligned (8)));,g' \ - ${.ALLSRC} >${.TARGET} +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386 index d78cf9b..ac24514 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile.i386 +++ b/gnu/usr.bin/binutils/gdb/Makefile.i386 @@ -1,10 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/i386 - -XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c +XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ + i387-nat.c i387-tdep.c \ + core-aout.c CFLAGS+= -Dprint_insn_i386=print_insn_i386_att - -findvar%UAfix.c: findvar.c - ln -sf ${.ALLSRC} ${.TARGET} +CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec +CFLAGS+= -DGDB_XM_FILE diff --git a/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c b/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c deleted file mode 100644 index 08183d8..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c +++ /dev/null @@ -1,55 +0,0 @@ -/* $FreeBSD$ */ - -#include "defs.h" - -/* Size of elements in jmpbuf */ - -#define JB_ELEMENT_SIZE 8 - -#define JB_PC 2 - -int kernel_debugging = 0; - -fetch_kcore_registers (pcbp) - struct pcb *pcbp; -{ - return; -} - -void -fetch_inferior_registers (regno) - int regno; -{ - return; -} - -void -store_inferior_registers (regno) - int regno; -{ - return; -} - -/* From gdb/alpha-nat.c. */ - -/* Figure out where the longjmp will land. - We expect the first arg to be a pointer to the jmp_buf structure from which - we extract the pc (JB_PC) that we will land at. The pc is copied into PC. - This routine returns true on success. */ - -int -get_longjmp_target (pc) - CORE_ADDR *pc; -{ - CORE_ADDR jb_addr; - char raw_buffer[MAX_REGISTER_RAW_SIZE]; - - jb_addr = read_register(A0_REGNUM); - - if (target_read_memory(jb_addr + JB_PC * JB_ELEMENT_SIZE, raw_buffer, - sizeof(CORE_ADDR))) - return 0; - - *pc = extract_address (raw_buffer, sizeof(CORE_ADDR)); - return 1; -} diff --git a/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c b/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c deleted file mode 100644 index 515d244..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c +++ /dev/null @@ -1,174 +0,0 @@ -/* $FreeBSD$ */ -/* Native-dependent code for BSD Unix running on alphas's, for GDB. - Copyright 1988, 1989, 1991, 1992, 1994, 1996 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 -#include -#include -#include -#include -#include -#include -#include "gdbcore.h" -#include "value.h" -#include "inferior.h" - -#if defined(HAVE_GREGSET_T) -#include -#endif - -int kernel_debugging = 0; - -/* Size of elements in jmpbuf */ - -#define JB_ELEMENT_SIZE 8 - -/* The definition for JB_PC in machine/reg.h is wrong. - And we can't get at the correct definition in setjmp.h as it is - not always available (eg. if _POSIX_SOURCE is defined which is the - default). As the defintion is unlikely to change (see comment - in , define the correct value here. */ - -#undef JB_PC -#define JB_PC 2 - -/* Figure out where the longjmp will land. - We expect the first arg to be a pointer to the jmp_buf structure from which - we extract the pc (JB_PC) that we will land at. The pc is copied into PC. - This routine returns true on success. */ - -int -get_longjmp_target (pc) - CORE_ADDR *pc; -{ - CORE_ADDR jb_addr; - char raw_buffer[MAX_REGISTER_RAW_SIZE]; - - jb_addr = read_register(A0_REGNUM); - - if (target_read_memory(jb_addr + JB_PC * JB_ELEMENT_SIZE, raw_buffer, - sizeof(CORE_ADDR))) - return 0; - - *pc = extract_address (raw_buffer, sizeof(CORE_ADDR)); - return 1; -} - -void -fetch_inferior_registers (regno) - int regno; -{ - struct reg regs; /* ptrace order, not gcc/gdb order */ - struct fpreg fpregs; - int r; - - ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) ®s, 0); - ptrace (PT_GETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &fpregs, 0); - - for (r = 0; r < 31; r++) - memcpy (®isters[REGISTER_BYTE (r)], - ®s.r_regs[r], sizeof(u_int64_t)); - for (r = 0; r < 32; r++) - memcpy (®isters[REGISTER_BYTE (r + FP0_REGNUM)], - &fpregs.fpr_regs[r], sizeof(u_int64_t)); - memcpy (®isters[REGISTER_BYTE (PC_REGNUM)], - ®s.r_regs[31], sizeof(u_int64_t)); - - memset (®isters[REGISTER_BYTE (ZERO_REGNUM)], 0, sizeof(u_int64_t)); - memset (®isters[REGISTER_BYTE (FP_REGNUM)], 0, sizeof(u_int64_t)); - - registers_fetched (); -} - -void -store_inferior_registers (regno) - int regno; -{ - struct reg regs; /* ptrace order, not gcc/gdb order */ - struct fpreg fpregs; - int r; - - for (r = 0; r < 31; r++) - memcpy (®s.r_regs[r], - ®isters[REGISTER_BYTE (r)], sizeof(u_int64_t)); - for (r = 0; r < 32; r++) - memcpy (&fpregs.fpr_regs[r], - ®isters[REGISTER_BYTE (r + FP0_REGNUM)], sizeof(u_int64_t)); - memcpy (®s.r_regs[31], - ®isters[REGISTER_BYTE (PC_REGNUM)], sizeof(u_int64_t)); - - ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) ®s, 0); - ptrace (PT_SETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &fpregs, 0); -} - -#ifdef HAVE_GREGSET_T -void -supply_gregset (gp) - gregset_t *gp; -{ - int regno = 0; - - /* These must be ordered the same as REGISTER_NAMES in - config/alpha/tm-alpha.h. */ - for (regno = 0; regno < 31; regno++) - supply_register (regno, (char *)&gp->r_regs[regno]); - supply_register (PC_REGNUM, (char *)&gp->r_regs[regno]); -} -#endif /* HAVE_GREGSET_T */ - -#ifdef HAVE_FPREGSET_T -void -supply_fpregset (fp) - fpregset_t *fp; -{ - int regno = 0; - - for (regno = 0; regno < 32; regno++) - supply_register (regno + 32, (char *)&fp->fpr_regs[regno]); -} -#endif /* HAVE_FPREGSET_T */ - -/* - * Get registers from a kernel crash dump or live kernel. - * Called by kvm-fbsd.c:get_kcore_registers(). - */ -fetch_kcore_registers (pcbp) - struct pcb *pcbp; -{ - - /* First clear out any garbage. */ - memset(registers, '\0', REGISTER_BYTES); - - /* SP */ - *(long *) ®isters[REGISTER_BYTE (SP_REGNUM)] = - pcbp->pcb_hw.apcb_ksp; - - /* S0 through S6 */ - memcpy (®isters[REGISTER_BYTE (S0_REGNUM)], - &pcbp->pcb_context[0], 7 * sizeof(long)); - - /* PC */ - *(long *) ®isters[REGISTER_BYTE (PC_REGNUM)] = - pcbp->pcb_context[7]; - - registers_fetched (); -} - diff --git a/gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c deleted file mode 100644 index 23a016e..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c +++ /dev/null @@ -1,451 +0,0 @@ -/* Kernel core dump functions below target vector, for GDB. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995 - 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. -*/ - -/* $FreeBSD$ */ - -/* - * This works like "remote" but, you use it like this: - * target kcore /dev/mem - * or - * target kcore /var/crash/host/core.0 - * - * This way makes it easy to short-circut the whole bfd monster, - * and direct the inferior stuff to our libkvm implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "defs.h" -#include "gdb_string.h" -#include "frame.h" /* required by inferior.h */ -#include "inferior.h" -#include "symtab.h" -#include "command.h" -#include "bfd.h" -#include "target.h" -#include "gdbcore.h" - -static void -kcore_files_info PARAMS ((struct target_ops *)); - -static void -kcore_close PARAMS ((int)); - -static void -get_kcore_registers PARAMS ((int)); - -static int -xfer_mem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *)); - -static int -xfer_umem PARAMS ((CORE_ADDR, char *, int, int)); - -static char *core_file; -static kvm_t *core_kd; -static struct pcb cur_pcb; - -static struct target_ops kcore_ops; -int kernel_writablecore; - -/* - * Read the "thing" at kernel address 'addr' into the space pointed to - * by point. The length of the "thing" is determined by the type of p. - * Result is non-zero if transfer fails. - */ -#define kvread(addr, p) \ -(target_read_memory((CORE_ADDR)(addr), (char *)(p), sizeof(*(p)))) - - -CORE_ADDR -ksym_lookup(name) - const char *name; -{ - struct minimal_symbol *sym; - - sym = lookup_minimal_symbol(name, NULL, NULL); - if (sym == NULL) - error("kernel symbol `%s' not found.", name); - - return SYMBOL_VALUE_ADDRESS(sym); -} - -/* - * Provide the address of an initial PCB to use. - * If this is a crash dump, try for "dumppcb". - * If no "dumppcb" or it's /dev/mem, use proc0. - * Return the core address of the PCB we found. - */ -static CORE_ADDR -initial_pcb() -{ - struct minimal_symbol *sym; - CORE_ADDR addr; - void *val; - - /* Make sure things are open... */ - if (!core_kd || !core_file) - return (0); - - /* If this is NOT /dev/mem try for dumppcb. */ - if (strncmp(core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) { - sym = lookup_minimal_symbol("dumppcb", NULL, NULL); - if (sym != NULL) { - addr = SYMBOL_VALUE_ADDRESS(sym); - return (addr); - } - } - - /* - * OK, just use proc0pcb. Note that curproc might - * not exist, and if it does, it will point to gdb. - * Therefore, just use proc0 and let the user set - * some other context if they care about it. - */ - addr = ksym_lookup("thread0"); - if (kvread(addr, &val)) { - error("cannot read thread0 pointer at %x\n", addr); - val = 0; - } else { - /* Read the PCB address in proc structure. */ - addr = (CORE_ADDR)val + offsetof(struct thread, td_pcb); - if (kvread(addr, &val)) { - error("cannot read thread0->td_pcb pointer at %x\n", addr); - val = 0; - } - } - - return ((CORE_ADDR)val); -} - -/* - * Set the current context to that of the PCB struct - * at the system address passed. - */ -static int -set_context(addr) - CORE_ADDR addr; -{ - - if (kvread(addr, &cur_pcb)) - error("cannot read pcb at %#x", addr); - - /* Fetch all registers from core file */ - target_fetch_registers (-1); - - /* Now, set up the frame cache, and print the top of stack */ - flush_cached_frames(); - set_current_frame (create_new_frame (read_fp (), read_pc ())); - select_frame (get_current_frame (), 0); - return (0); -} - -/* Discard all vestiges of any previous core file and mark data and stack - spaces as empty. */ - -/* ARGSUSED */ -static void -kcore_close (quitting) - int quitting; -{ - - inferior_pid = 0; /* Avoid confusion from thread stuff */ - - if (core_kd) { - kvm_close(core_kd); - free(core_file); - core_file = NULL; - core_kd = NULL; - } -} - -/* This routine opens and sets up the core file bfd. */ - -static void -kcore_open (filename, from_tty) - char *filename; /* the core file */ - int from_tty; -{ - kvm_t *kd; - const char *p; - struct cleanup *old_chain; - char buf[256], *cp; - int ontop; - CORE_ADDR addr; - - target_preopen (from_tty); - - /* The exec file is required for symbols. */ - if (exec_bfd == NULL) - error("No kernel exec file specified"); - - if (core_kd) { - error ("No core file specified." - " (Use `detach' to stop debugging a core file.)"); - return; - } - - if (!filename) { - error ("No core file specified."); - return; - } - - filename = tilde_expand (filename); - if (filename[0] != '/') { - cp = concat (current_directory, "/", filename, NULL); - free (filename); - filename = cp; - } - - old_chain = make_cleanup (free, filename); - - kd = kvm_open (bfd_get_filename(exec_bfd), filename, NULL, - kernel_writablecore ? O_RDWR: O_RDONLY, 0); - if (kd == NULL) { - perror_with_name (filename); - return; - } - - /* Looks semi-reasonable. Toss the old core file and work on the new. */ - - discard_cleanups (old_chain); /* Don't free filename any more */ - core_file = filename; - unpush_target (&kcore_ops); - ontop = !push_target (&kcore_ops); - - /* Note unpush_target (above) calls kcore_close. */ - core_kd = kd; - - /* print out the panic string if there is one */ - if (kvread(ksym_lookup("panicstr"), &addr) == 0 && - addr != 0 && - target_read_memory(addr, buf, sizeof(buf)) == 0) { - - for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++) - if (!isascii(*cp) || (!isprint(*cp) && !isspace(*cp))) - *cp = '?'; - *cp = '\0'; - if (buf[0] != '\0') - printf_filtered("panic: %s\n", buf); - } - - if (!ontop) { - warning ( -"you won't be able to access this core file until you terminate\n\ -your %s; do ``info files''", target_longname); - return; - } - - /* Now, set up process context, and print the top of stack */ - (void)set_context(initial_pcb()); - print_stack_frame (selected_frame, selected_frame_level, 1); -} - -static void -kcore_detach (args, from_tty) - char *args; - int from_tty; -{ - if (args) - error ("Too many arguments"); - unpush_target (&kcore_ops); - reinit_frame_cache (); - if (from_tty) - printf_filtered ("No kernel core file now.\n"); -} - -/* Get the registers out of a core file. This is the machine- - independent part. Fetch_core_registers is the machine-dependent - part, typically implemented in the xm-file for each architecture. */ - -/* We just get all the registers, so we don't use regno. */ - -/* ARGSUSED */ -static void -get_kcore_registers (regno) - int regno; -{ - - /* - * XXX - Only read the pcb when set_context() is called. - * When looking at a live kernel this may be a problem, - * but the user can do another "proc" or "pcb" command to - * grab a new copy of the pcb... - */ - - /* - * Zero out register set then fill in the ones we know about. - */ - fetch_kcore_registers (&cur_pcb); -} - -static void -kcore_files_info (t) - struct target_ops *t; -{ - printf_filtered ("\t`%s'\n", core_file); -} - -/* If mourn is being called in all the right places, this could be say - `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ - -static int -ignore (addr, contents) - CORE_ADDR addr; - char *contents; -{ - return 0; -} - -static int -xfer_kmem (memaddr, myaddr, len, write, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; - struct target_ops *target; -{ - int n; - -#if 0 /* XXX */ - if (it is a user address) - return xfer_umem(memaddr, myaddr, len, write); -#endif - - if (core_kd == NULL) - return 0; - - if (write) - n = kvm_write(core_kd, memaddr, myaddr, len); - else - n = kvm_read (core_kd, memaddr, myaddr, len) ; - if (n < 0) { - fprintf_unfiltered (gdb_stderr, "can not access 0x%x, %s\n", - memaddr, kvm_geterr(core_kd)); - n = 0; - } - - return n; -} - -#if 0 /* XXX */ -static int -xfer_umem (memaddr, myaddr, len, write) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; /* ignored */ -{ - int n; - struct proc proc; - - if (kvread(cur_proc, &proc)) - error("cannot read proc at %#x", cur_proc); - n = kvm_uread(core_kd, &proc, memaddr, myaddr, len) ; - - if (n < 0) - return 0; - return n; -} -#endif - -static void -set_proc_cmd(arg) - char *arg; -{ - CORE_ADDR addr, first_td; - void *val; - - if (!arg) - error_no_arg("proc address for the new context"); - - if (core_kd == NULL) - error("no kernel core file"); - - addr = (CORE_ADDR)parse_and_eval_address(arg); - - /* Find the first thread in the process XXXKSE */ - addr += offsetof(struct proc, p_threads.tqh_first); - if (kvread(addr, &first_td)) - error("cannot read thread ptr"); - - /* Read the PCB address in thread structure. */ - addr = first_td + offsetof(struct thread, td_pcb); - if (kvread(addr, &val)) - error("cannot read pcb ptr"); - - /* Read the PCB address in proc structure. */ - if (set_context((CORE_ADDR)val)) - error("invalid proc address"); -} - -static void -set_pcb_cmd(arg) - char *arg; -{ - CORE_ADDR addr; - void *val; - - if (!arg) - error_no_arg("pcb address for the new context"); - - if (core_kd == NULL) - error("no kernel core file"); - - addr = (CORE_ADDR)parse_and_eval_address(arg); - - if (set_context(addr)) - error("invalid pcb address"); -} - - - -void -_initialize_kcorelow() -{ - kcore_ops.to_shortname = "kcore"; - kcore_ops.to_longname = "Kernel core dump file"; - kcore_ops.to_doc = - "Use a core file as a target. Specify the filename of the core file."; - kcore_ops.to_open = kcore_open; - kcore_ops.to_close = kcore_close; - kcore_ops.to_attach = find_default_attach; - kcore_ops.to_detach = kcore_detach; - kcore_ops.to_fetch_registers = get_kcore_registers; - kcore_ops.to_xfer_memory = xfer_kmem; - kcore_ops.to_files_info = kcore_files_info; - kcore_ops.to_create_inferior = find_default_create_inferior; - kcore_ops.to_stratum = kcore_stratum; - kcore_ops.to_has_memory = 1; - kcore_ops.to_has_stack = 1; - kcore_ops.to_has_registers = 1; - kcore_ops.to_magic = OPS_MAGIC; - - add_target (&kcore_ops); - add_com ("proc", class_obscure, set_proc_cmd, "Set current process context"); -} diff --git a/gnu/usr.bin/binutils/gdb/alpha/nm.h b/gnu/usr.bin/binutils/gdb/alpha/nm.h deleted file mode 100644 index 1b63ef2..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/nm.h +++ /dev/null @@ -1,97 +0,0 @@ -/* Native definitions for alpha running FreeBSD. - Copyright (C) 1993, 1994 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -/* Figure out where the longjmp will land. We expect that we have just entered - longjmp and haven't yet setup the stack frame, so the args are still in the - argument regs. A0_REGNUM points at the jmp_buf structure from which we - extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. - This routine returns true on success */ - -/* $FreeBSD$ */ - -#include - -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int -get_longjmp_target PARAMS ((CORE_ADDR *)); - -/* Tell gdb that we can attach and detach other processes */ -#define ATTACH_DETACH - -/* We define our own fetch/store methods */ -#define FETCH_INFERIOR_REGISTERS - -extern CORE_ADDR alpha_u_regs_offset(); -#define U_REGS_OFFSET alpha_u_regs_offset() - -#define PTRACE_ARG3_TYPE caddr_t - -/* ptrace transfers longs, the ptrace man page is lying. */ - -#define PTRACE_XFER_TYPE int - -/* The alpha does not step over a breakpoint, the manpage is lying again. */ - -#define CANNOT_STEP_BREAKPOINT - -/* Linux has shared libraries. */ - -#define GDB_TARGET_HAS_SHARED_LIBS - -/* Support for shared libraries. */ - -#include "solib.h" -#include "elf/common.h" - -#define SVR4_SHARED_LIBS -#define TARGET_ELF64 - -/* This is a lie. It's actually in stdio.h. */ - -#define PSIGNAL_IN_SIGNAL_H - -/* Given a pointer to either a gregset_t or fpregset_t, return a - pointer to the first register. */ -#define ALPHA_REGSET_BASE(regsetp) ((long *) (regsetp)) - -extern int kernel_debugging; -extern int kernel_writablecore; - -#define ADDITIONAL_OPTIONS \ - {"kernel", no_argument, &kernel_debugging, 1}, \ - {"k", no_argument, &kernel_debugging, 1}, \ - {"wcore", no_argument, &kernel_writablecore, 1}, \ - {"w", no_argument, &kernel_writablecore, 1}, - -#define ADDITIONAL_OPTION_HELP \ - "\ - --kernel Enable kernel debugging.\n\ - --wcore Make core file writable (only works for /dev/mem).\n\ - This option only works while debugging a kernel !!\n\ -" - -#define DEFAULT_PROMPT kernel_debugging?"(kgdb) ":"(gdb) " - -/* misuse START_PROGRESS to test whether we're running as kgdb */ -/* START_PROGRESS is called at the top of main */ -#undef START_PROGRESS -#define START_PROGRESS(STR,N) \ - if (!strcmp(STR, "kgdb")) \ - kernel_debugging = 1; - diff --git a/gnu/usr.bin/binutils/gdb/alpha/tm.h b/gnu/usr.bin/binutils/gdb/alpha/tm.h deleted file mode 100644 index 4836b1d..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/tm.h +++ /dev/null @@ -1,48 +0,0 @@ -/* $FreeBSD$ */ -/* Definitions to make GDB run on an Alpha box under FreeBSD. The - definitions here are used when the _target_ system is running Linux. - Copyright 1996 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 TM_FREEBSDALPHA_H -#define TM_FREEBSDALPHA_H - -#include "alpha/tm-alpha.h" -#ifndef S0_REGNUM -#define S0_REGNUM (T7_REGNUM+1) -#endif - -#ifndef VM_MIN_ADDRESS -#define VM_MIN_ADDRESS (0) -#endif - -/* Number of traps that happen between exec'ing the shell to run an - inferior, and when we finally get to the inferior code. This is 2 - on FreeBSD and most implementations. */ - -#undef START_INFERIOR_TRAPS_EXPECTED -#define START_INFERIOR_TRAPS_EXPECTED 2 - -struct objfile; -void freebsd_uthread_new_objfile PARAMS ((struct objfile *objfile)); -#define target_new_objfile(OBJFILE) freebsd_uthread_new_objfile (OBJFILE) - -extern char *freebsd_uthread_pid_to_str PARAMS ((int pid)); -#define target_pid_to_str(PID) freebsd_uthread_pid_to_str (PID) - -#endif /* TM_FREEBSDALPHA_H */ diff --git a/gnu/usr.bin/binutils/gdb/alpha/version.c b/gnu/usr.bin/binutils/gdb/alpha/version.c deleted file mode 100644 index e239829..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/version.c +++ /dev/null @@ -1,4 +0,0 @@ -/* $FreeBSD$ */ -char *version = "4.18 (FreeBSD)"; -char *host_name = "alpha-unknown-freebsd"; -char *target_name = "alpha-unknown-freebsd"; diff --git a/gnu/usr.bin/binutils/gdb/alpha/xm.h b/gnu/usr.bin/binutils/gdb/alpha/xm.h deleted file mode 100644 index 9d340a3..0000000 --- a/gnu/usr.bin/binutils/gdb/alpha/xm.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Host definitions for GDB running on an Alpha under FreeBSD - Copyright (C) 1996 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#if !defined (HOST_BYTE_ORDER) -#define HOST_BYTE_ORDER LITTLE_ENDIAN -#endif - -/* The alpha has no siginterrupt routine. */ -#define NO_SIGINTERRUPT - -#define HAVE_TERMIOS -#define HAVE_SIGSETMASK 1 - -#include diff --git a/gnu/usr.bin/binutils/gdb/config.h b/gnu/usr.bin/binutils/gdb/config.h index 5c206a7..1e62d71 100644 --- a/gnu/usr.bin/binutils/gdb/config.h +++ b/gnu/usr.bin/binutils/gdb/config.h @@ -170,22 +170,22 @@ #define USE_INCLUDED_REGEX 1 /* BFD's default architecture. */ -#define DEFAULT_BFD_ARCH bfd_i386_arch +/* #define DEFAULT_BFD_ARCH bfd_alpha_arch */ /* BFD's default target vector. */ -#define DEFAULT_BFD_VEC bfd_elf32_i386_vec +/* #define DEFAULT_BFD_VEC bfd_elf64_alpha_vec */ /* Multi-arch enabled. */ /* #undef GDB_MULTI_ARCH */ /* hostfile */ -#define GDB_XM_FILE config/i386/xm-i386.h +/* #define GDB_XM_FILE 1 */ /* targetfile */ -#define GDB_TM_FILE config/i386/tm-fbsd.h +#define GDB_TM_FILE 1 /* nativefile */ -#define GDB_NM_FILE config/i386/nm-fbsd.h +#define GDB_NM_FILE 1 /* Define if you have the __argz_count function. */ /* #undef HAVE___ARGZ_COUNT */ @@ -503,4 +503,3 @@ /* Define if has pr_siginfo64_t. */ /* #undef HAVE_PR_SIGINFO64_T */ - diff --git a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c index 9d89589..689574a 100644 --- a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c +++ b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c @@ -51,8 +51,6 @@ extern struct target_ops child_ops; /* target vector for inftarg.c */ extern void _initialize_freebsd_uthread PARAMS ((void)); -static int main_pid = -1; /* Real process ID */ - /* Set to true while we are part-way through attaching */ static int freebsd_uthread_attaching; @@ -60,60 +58,17 @@ static int freebsd_uthread_active = 0; static CORE_ADDR P_thread_list; static CORE_ADDR P_thread_run; -static struct cleanup * save_inferior_pid PARAMS ((void)); - -static void restore_inferior_pid PARAMS ((int pid)); +/* Pointer to the next function on the objfile event chain. */ +static void (*target_new_objfile_chain) (struct objfile *objfile); -static void freebsd_uthread_resume PARAMS ((int pid, int step, +static void freebsd_uthread_resume PARAMS ((ptid_t pid, int step, enum target_signal signo)); static void init_freebsd_uthread_ops PARAMS ((void)); static struct target_ops freebsd_uthread_ops; -static struct target_thread_vector freebsd_uthread_vec; - -/* - -LOCAL FUNCTION - - save_inferior_pid - Save inferior_pid on the cleanup list - restore_inferior_pid - Restore inferior_pid from the cleanup list - -SYNOPSIS - - struct cleanup *save_inferior_pid () - void restore_inferior_pid (int pid) - -DESCRIPTION - - These two functions act in unison to restore inferior_pid in - case of an error. - -NOTES - - inferior_pid is a global variable that needs to be changed by many of - these routines before calling functions in procfs.c. In order to - guarantee that inferior_pid gets restored (in case of errors), you - need to call save_inferior_pid before changing it. At the end of the - function, you should invoke do_cleanups to restore it. - - */ - -static struct cleanup * -save_inferior_pid () -{ - return make_cleanup ((make_cleanup_func) restore_inferior_pid, - (void *)(intptr_t) inferior_pid); -} - -static void -restore_inferior_pid (pid) - int pid; -{ - inferior_pid = pid; -} -static int find_active_thread PARAMS ((void)); +static ptid_t find_active_ptid PARAMS ((void)); struct cached_pthread { u_int64_t uniqueid; @@ -125,13 +80,10 @@ struct cached_pthread { } ctx; }; -static int cached_thread; +static ptid_t cached_ptid; static struct cached_pthread cached_pthread; static CORE_ADDR cached_pthread_addr; -#define THREADID_TID(id) ((id) >> 17) -#define THREADID_PID(id) ((id) & ((1 << 17) - 1)) - LIST_HEAD(idmaplist, idmap); struct idmap { @@ -171,8 +123,7 @@ static int PS_DEAD_value; #define IS_TID_FREE(tid) (tid_to_hash[tid] == -1) static int -get_new_tid(h) - int h; +get_new_tid(int h) { int tid = next_free_tid; @@ -199,30 +150,28 @@ get_new_tid(h) return tid; } -static int -find_pid(uniqueid) - u_int64_t uniqueid; +static ptid_t +find_ptid(u_int64_t uniqueid) { int h = UNIQUEID_HASH(uniqueid); struct idmap *im; LIST_FOREACH(im, &map_hash[h], link) if (im->uniqueid == uniqueid) - return (im->tid << 17) + main_pid; + return MERGEPID(PIDGET(inferior_ptid), im->tid); im = xmalloc(sizeof(struct idmap)); im->uniqueid = uniqueid; im->tid = get_new_tid(h); LIST_INSERT_HEAD(&map_hash[h], im, link); - return (im->tid << 17) + main_pid; + return MERGEPID(PIDGET(inferior_ptid), im->tid); } static void -free_pid(pid) - int pid; +free_ptid(ptid_t ptid) { - int tid = THREADID_TID(pid); + int tid = TIDGET(ptid); int h = tid_to_hash[tid]; struct idmap *im; @@ -248,7 +197,7 @@ free_pid(pid) sizeof(name##_value)) static void -read_thread_offsets () +read_thread_offsets (void) { READ_OFFSET(next); READ_OFFSET(uniqueid); @@ -264,8 +213,7 @@ read_thread_offsets () read_memory ((ptr) + field##_offset, (char *) &(result), sizeof result) static u_int64_t -read_pthread_uniqueid (ptr) - CORE_ADDR ptr; +read_pthread_uniqueid (CORE_ADDR ptr) { u_int64_t uniqueid; READ_FIELD(ptr, u_int64_t, uniqueid, uniqueid); @@ -273,8 +221,7 @@ read_pthread_uniqueid (ptr) } static CORE_ADDR -read_pthread_next (ptr) - CORE_ADDR ptr; +read_pthread_next (CORE_ADDR ptr) { CORE_ADDR next; READ_FIELD(ptr, CORE_ADDR, next, next); @@ -282,9 +229,7 @@ read_pthread_next (ptr) } static void -read_cached_pthread (ptr, cache) - CORE_ADDR ptr; - struct cached_pthread *cache; +read_cached_pthread (CORE_ADDR ptr, struct cached_pthread *cache) { READ_FIELD(ptr, u_int64_t, uniqueid, cache->uniqueid); READ_FIELD(ptr, int, state, cache->state); @@ -292,31 +237,27 @@ read_cached_pthread (ptr, cache) READ_FIELD(ptr, ucontext_t, ctx, cache->ctx); } -static int -find_active_thread () +static ptid_t +find_active_ptid (void) { CORE_ADDR ptr; - if (main_pid == -1) - return -1; - read_memory ((CORE_ADDR)P_thread_run, (char *)&ptr, sizeof ptr); - return find_pid(read_pthread_uniqueid(ptr)); + return find_ptid(read_pthread_uniqueid(ptr)); } -static CORE_ADDR find_pthread_addr PARAMS ((int thread)); -static struct cached_pthread * find_pthread PARAMS ((int thread)); +static CORE_ADDR find_pthread_addr PARAMS ((ptid_t ptid)); +static struct cached_pthread * find_pthread PARAMS ((ptid_t ptid)); static CORE_ADDR -find_pthread_addr (thread) - int thread; +find_pthread_addr (ptid_t ptid) { CORE_ADDR ptr; - if (thread == cached_thread) + if (ptid_equal(ptid, cached_ptid)) return cached_pthread_addr; read_memory ((CORE_ADDR)P_thread_list, @@ -325,9 +266,9 @@ find_pthread_addr (thread) while (ptr != 0) { - if (find_pid(read_pthread_uniqueid(ptr)) == thread) + if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) { - cached_thread = thread; + cached_ptid = ptid; cached_pthread_addr = ptr; read_cached_pthread(ptr, &cached_pthread); return ptr; @@ -339,12 +280,11 @@ find_pthread_addr (thread) } static struct cached_pthread * -find_pthread (thread) - int thread; +find_pthread (ptid_t ptid) { CORE_ADDR ptr; - if (thread == cached_thread) + if (ptid_equal(ptid, cached_ptid)) return &cached_pthread; read_memory ((CORE_ADDR)P_thread_list, @@ -353,9 +293,9 @@ find_pthread (thread) while (ptr != 0) { - if (find_pid(read_pthread_uniqueid(ptr)) == thread) + if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) { - cached_thread = thread; + cached_ptid = ptid; cached_pthread_addr = ptr; read_cached_pthread(ptr, &cached_pthread); return &cached_pthread; @@ -364,8 +304,7 @@ find_pthread (thread) } #if 0 - error ("Can't find pthread %d,%d", - THREADID_TID(thread), THREADID_PID(thread)); + error ("Can't find pthread %d,%d", PIDGET(ptid), TIDGET(ptid)); #endif return NULL; } @@ -376,9 +315,7 @@ find_pthread (thread) /* ARGSUSED */ static void -freebsd_uthread_open (arg, from_tty) - char *arg; - int from_tty; +freebsd_uthread_open (char *arg, int from_tty) { child_ops.to_open (arg, from_tty); } @@ -387,9 +324,7 @@ freebsd_uthread_open (arg, from_tty) and wait for the trace-trap that results from attaching. */ static void -freebsd_uthread_attach (args, from_tty) - char *args; - int from_tty; +freebsd_uthread_attach (char *args, int from_tty) { child_ops.to_attach (args, from_tty); push_target (&freebsd_uthread_ops); @@ -399,20 +334,13 @@ freebsd_uthread_attach (args, from_tty) /* After an attach, see if the target is threaded */ static void -freebsd_uthread_post_attach (pid) - int pid; +freebsd_uthread_post_attach (int pid) { if (freebsd_uthread_active) { read_thread_offsets (); - - main_pid = pid; - - bind_target_thread_vector (&freebsd_uthread_vec); - - inferior_pid = find_active_thread (); - - add_thread (inferior_pid); + inferior_ptid = find_active_ptid (); + add_thread (inferior_ptid); } else { @@ -432,9 +360,7 @@ freebsd_uthread_post_attach (pid) started via the normal ptrace (PTRACE_TRACEME). */ static void -freebsd_uthread_detach (args, from_tty) - char *args; - int from_tty; +freebsd_uthread_detach (char *args, int from_tty) { child_ops.to_detach (args, from_tty); } @@ -445,70 +371,46 @@ freebsd_uthread_detach (args, from_tty) for procfs. */ static void -freebsd_uthread_resume (pid, step, signo) - int pid; - int step; - enum target_signal signo; +freebsd_uthread_resume (ptid_t ptid, int step, enum target_signal signo) { - struct cleanup *old_chain; - if (freebsd_uthread_attaching) { - child_ops.to_resume (pid, step, signo); + child_ops.to_resume (ptid, step, signo); return; } - old_chain = save_inferior_pid (); - - pid = inferior_pid = main_pid; - - child_ops.to_resume (pid, step, signo); - - cached_thread = 0; - - do_cleanups (old_chain); + child_ops.to_resume (ptid, step, signo); + cached_ptid = MERGEPID(0, 0); } /* Wait for any threads to stop. We may have to convert PID from a thread id to a LWP id, and vice versa on the way out. */ -static int -freebsd_uthread_wait (pid, ourstatus) - int pid; - struct target_waitstatus *ourstatus; +static ptid_t +freebsd_uthread_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { - int rtnval; - struct cleanup *old_chain; + ptid_t rtnval; if (freebsd_uthread_attaching) { - return child_ops.to_wait (pid, ourstatus); + return child_ops.to_wait (ptid, ourstatus); } - old_chain = save_inferior_pid (); + rtnval = child_ops.to_wait (ptid, ourstatus); - inferior_pid = main_pid; - - if (pid != -1) - pid = main_pid; - - rtnval = child_ops.to_wait (pid, ourstatus); - - if (rtnval >= 0) + if (PIDGET(rtnval) >= 0) { - rtnval = find_active_thread (); + rtnval = find_active_ptid (); if (!in_thread_list (rtnval)) add_thread (rtnval); } - do_cleanups (old_chain); - return rtnval; } #ifdef __i386__ -static char sigmap[NUM_REGS] = /* map reg to sigcontext */ +static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ { 12, /* eax */ 11, /* ecx */ @@ -526,9 +428,13 @@ static char sigmap[NUM_REGS] = /* map reg to sigcontext */ 3, /* es */ 2, /* fs */ 1, /* gs */ + -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ + -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ + -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ + -1, /* mxcsr */ }; -static char jmpmap[NUM_REGS] = /* map reg to jmp_buf */ +static char jmpmap[MAX_NUM_REGS] = /* map reg to jmp_buf */ { 6, /* eax */ -1, /* ecx */ @@ -546,6 +452,10 @@ static char jmpmap[NUM_REGS] = /* map reg to jmp_buf */ -1, /* es */ -1, /* fs */ -1, /* gs */ + -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ + -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ + -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ + -1, /* mxcsr */ }; #endif @@ -579,36 +489,26 @@ static char jmpmap[NUM_REGS] = { #endif static void -freebsd_uthread_fetch_registers (regno) - int regno; +freebsd_uthread_fetch_registers (int regno) { struct cached_pthread *thread; - struct cleanup *old_chain; int active; int first_regno, last_regno; register_t *regbase; char *regmap; - if (freebsd_uthread_attaching) + if (freebsd_uthread_attaching || TIDGET(inferior_ptid) == 0) { child_ops.to_fetch_registers (regno); return; } - thread = find_pthread (inferior_pid); - - old_chain = save_inferior_pid (); - - active = (inferior_pid == find_active_thread()); - - inferior_pid = main_pid; + thread = find_pthread (inferior_ptid); + active = (ptid_equal(inferior_ptid, find_active_ptid())); if (active) { child_ops.to_fetch_registers (regno); - - do_cleanups (old_chain); - return; } @@ -631,19 +531,18 @@ freebsd_uthread_fetch_registers (regno) if (regmap[regno] == -1) child_ops.to_fetch_registers (regno); else - supply_register (regno, (char*) ®base[regmap[regno]]); + if (thread) + supply_register (regno, (char*) ®base[regmap[regno]]); + else + supply_register (regno, NULL); } - - do_cleanups (old_chain); } static void -freebsd_uthread_store_registers (regno) - int regno; +freebsd_uthread_store_registers (int regno) { struct cached_pthread *thread; CORE_ADDR ptr; - struct cleanup *old_chain; int first_regno, last_regno; u_int32_t *regbase; char *regmap; @@ -654,18 +553,11 @@ freebsd_uthread_store_registers (regno) return; } - thread = find_pthread (inferior_pid); - - old_chain = save_inferior_pid (); - - inferior_pid = main_pid; + thread = find_pthread (inferior_ptid); if (thread->state == PS_RUNNING_value) { child_ops.to_store_registers (regno); - - do_cleanups (old_chain); - return; } @@ -683,7 +575,7 @@ freebsd_uthread_store_registers (regno) regbase = (u_int32_t*) &thread->ctx.jb[0]; regmap = jmpmap; - ptr = find_pthread_addr (inferior_pid); + ptr = find_pthread_addr (inferior_ptid); for (regno = first_regno; regno <= last_regno; regno++) { if (regmap[regno] == -1) @@ -704,8 +596,6 @@ freebsd_uthread_store_registers (regno) REGISTER_RAW_SIZE (regno)); } } - - do_cleanups (old_chain); } /* Get ready to modify the registers array. On machines which store @@ -715,102 +605,53 @@ freebsd_uthread_store_registers (regno) debugged. */ static void -freebsd_uthread_prepare_to_store () +freebsd_uthread_prepare_to_store (void) { - struct cleanup *old_chain; - - if (freebsd_uthread_attaching) - { - child_ops.to_prepare_to_store (); - return; - } - - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - child_ops.to_prepare_to_store (); - - do_cleanups (old_chain); } static int -freebsd_uthread_xfer_memory (memaddr, myaddr, len, dowrite, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int dowrite; - struct target_ops *target; /* ignored */ +freebsd_uthread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, + int dowrite, struct mem_attrib *attrib, + struct target_ops *target) { - int retval; - struct cleanup *old_chain; - - if (freebsd_uthread_attaching) - { - return child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, target); - } - - old_chain = save_inferior_pid (); - - inferior_pid = main_pid; - - retval = child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, target); - - do_cleanups (old_chain); - - return retval; + return child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, + attrib, target); } /* Print status information about what we're accessing. */ static void -freebsd_uthread_files_info (ignore) - struct target_ops *ignore; +freebsd_uthread_files_info (struct target_ops *ignore) { child_ops.to_files_info (ignore); } static void -freebsd_uthread_kill_inferior () +freebsd_uthread_kill_inferior (void) { - inferior_pid = main_pid; child_ops.to_kill (); } static void -freebsd_uthread_notice_signals (pid) - int pid; +freebsd_uthread_notice_signals (ptid_t ptid) { - struct cleanup *old_chain; - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - - child_ops.to_notice_signals (pid); - - do_cleanups (old_chain); + child_ops.to_notice_signals (ptid); } /* Fork an inferior process, and start debugging it with /proc. */ static void -freebsd_uthread_create_inferior (exec_file, allargs, env) - char *exec_file; - char *allargs; - char **env; +freebsd_uthread_create_inferior (char *exec_file, char *allargs, char **env) { child_ops.to_create_inferior (exec_file, allargs, env); - if (inferior_pid && freebsd_uthread_active) + if (PIDGET(inferior_ptid) && freebsd_uthread_active) { read_thread_offsets (); - - main_pid = inferior_pid; - push_target (&freebsd_uthread_ops); - bind_target_thread_vector (&freebsd_uthread_vec); - - inferior_pid = find_active_thread (); - - add_thread (inferior_pid); + inferior_ptid = find_active_ptid (); + add_thread (inferior_ptid); } } @@ -818,8 +659,7 @@ freebsd_uthread_create_inferior (exec_file, allargs, env) We check for the _thread_run and _thread_list globals. */ void -freebsd_uthread_new_objfile (objfile) - struct objfile *objfile; +freebsd_uthread_new_objfile (struct objfile *objfile) { struct minimal_symbol *ms; @@ -873,24 +713,11 @@ freebsd_uthread_new_objfile (objfile) freebsd_uthread_active = 1; } -int -freebsd_uthread_has_exited (pid, wait_status, exit_status) - int pid; - int wait_status; - int * exit_status; -{ - int t = child_ops.to_has_exited (pid, wait_status, exit_status); - if (t) - main_pid = -1; - return t; -} - /* Clean up after the inferior dies. */ static void freebsd_uthread_mourn_inferior () { - inferior_pid = main_pid; /* don't bother to restore inferior_pid */ child_ops.to_mourn_inferior (); unpush_target (&freebsd_uthread_ops); } @@ -904,10 +731,8 @@ freebsd_uthread_can_run () } static int -freebsd_uthread_thread_alive (pid) - int pid; +freebsd_uthread_thread_alive (ptid_t ptid) { - struct cleanup *old_chain; struct cached_pthread *thread; int ret = 0; @@ -918,48 +743,33 @@ freebsd_uthread_thread_alive (pid) * We can get called from child_ops.to_wait() which passes the underlying * pid (without a thread number). */ - if (THREADID_TID(pid) == 0) + if (TIDGET(ptid) == 0) return 1; - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - - if (find_pthread_addr (pid) != 0) + if (find_pthread_addr (ptid) != 0) { - thread = find_pthread (pid); + thread = find_pthread (ptid); ret = (thread->state != PS_DEAD_value); } - do_cleanups (old_chain); - if (!ret) - free_pid(pid); + free_ptid(ptid); return ret; } static void -freebsd_uthread_stop () +freebsd_uthread_stop (void) { - struct cleanup *old_chain; - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - child_ops.to_stop (); - - do_cleanups (old_chain); } -static int -freebsd_uthread_find_new_threads () +static void +freebsd_uthread_find_new_threads (void) { CORE_ADDR ptr; int state; u_int64_t uniqueid; - struct cleanup *old_chain; - - old_chain = save_inferior_pid (); - inferior_pid = main_pid; read_memory ((CORE_ADDR)P_thread_list, (char *)&ptr, @@ -970,14 +780,10 @@ freebsd_uthread_find_new_threads () READ_FIELD(ptr, int, state, state); READ_FIELD(ptr, u_int64_t, uniqueid, uniqueid); if (state != PS_DEAD_value && - !in_thread_list (find_pid(uniqueid))) - add_thread (find_pid(uniqueid)); + !in_thread_list (find_ptid(uniqueid))) + add_thread (find_ptid(uniqueid)); ptr = read_pthread_next(ptr); } - - do_cleanups (old_chain); - - return 0; } /* MUST MATCH enum pthread_state */ @@ -1004,6 +810,8 @@ static const char *statenames[] = { "DEADLOCK", }; +#if 0 + static int freebsd_uthread_get_thread_info (ref, selection, info) gdb_threadref *ref; @@ -1031,17 +839,18 @@ freebsd_uthread_get_thread_info (ref, selection, info) return (0); } +#endif + char * -freebsd_uthread_pid_to_str (pid) - int pid; +freebsd_uthread_pid_to_str (ptid_t ptid) { static char buf[30]; if (STREQ (current_target.to_shortname, "freebsd-uthreads")) - sprintf (buf, "process %d, thread %d\0", - THREADID_PID(pid), THREADID_TID(pid)); + sprintf (buf, "Process %d, Thread %ld", + PIDGET(ptid), TIDGET(ptid)); else - sprintf (buf, "process %d\0", pid); + sprintf (buf, "Process %d", PIDGET(ptid)); return buf; } @@ -1073,7 +882,6 @@ init_freebsd_uthread_ops () freebsd_uthread_ops.to_terminal_info = child_terminal_info; freebsd_uthread_ops.to_kill = freebsd_uthread_kill_inferior; freebsd_uthread_ops.to_create_inferior = freebsd_uthread_create_inferior; - freebsd_uthread_ops.to_has_exited = freebsd_uthread_has_exited; freebsd_uthread_ops.to_mourn_inferior = freebsd_uthread_mourn_inferior; freebsd_uthread_ops.to_can_run = freebsd_uthread_can_run; freebsd_uthread_ops.to_notice_signals = freebsd_uthread_notice_signals; @@ -1087,9 +895,11 @@ init_freebsd_uthread_ops () freebsd_uthread_ops.to_has_execution = 1; freebsd_uthread_ops.to_has_thread_control = 0; freebsd_uthread_ops.to_magic = OPS_MAGIC; - - freebsd_uthread_vec.find_new_threads = freebsd_uthread_find_new_threads; + freebsd_uthread_ops.to_find_new_threads = freebsd_uthread_find_new_threads; + freebsd_uthread_ops.to_pid_to_str = freebsd_uthread_pid_to_str; +#if 0 freebsd_uthread_vec.get_thread_info = freebsd_uthread_get_thread_info; +#endif } void @@ -1098,5 +908,8 @@ _initialize_freebsd_uthread () init_freebsd_uthread_ops (); add_target (&freebsd_uthread_ops); + target_new_objfile_chain = target_new_objfile_hook; + target_new_objfile_hook = freebsd_uthread_new_objfile; + child_suppress_run = 1; } diff --git a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c deleted file mode 100644 index a346f47..0000000 --- a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c +++ /dev/null @@ -1,710 +0,0 @@ -/* $FreeBSD$ */ -/* Native-dependent code for BSD Unix running on i386's, for GDB. - Copyright 1988, 1989, 1991, 1992, 1994, 1996 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 -#include -#include -#include -#include -#include -#include "gdbcore.h" -#include "value.h" -#include "inferior.h" - -#if defined(HAVE_GREGSET_T) || defined(HAVE_FPREGSET_T) -#include -#endif - -/* this table must line up with REGISTER_NAMES in tm-i386v.h */ -/* symbols like 'tEAX' come from */ -static int tregmap[] = -{ - tEAX, tECX, tEDX, tEBX, - tESP, tEBP, tESI, tEDI, - tEIP, tEFLAGS, tCS, tSS, - tDS, tES, tFS, tGS, -}; - -static struct save87 pcb_savefpu; - -void -fetch_inferior_registers (regno) - int regno; -{ - struct reg inferior_registers; /* ptrace order, not gcc/gdb order */ - int r; - - ptrace (PT_GETREGS, inferior_pid, - (PTRACE_ARG3_TYPE) &inferior_registers, 0); - - for (r = 0; r < NUM_REGS; r++) - memcpy (®isters[REGISTER_BYTE (r)], ((int *)&inferior_registers) + tregmap[r], 4); - - registers_fetched (); -} - -void -store_inferior_registers (regno) - int regno; -{ - struct reg inferior_registers; /* ptrace order, not gcc/gdb order */ - int r; - - for (r = 0; r < NUM_REGS; r++) - memcpy (((int *)&inferior_registers) + tregmap[r], ®isters[REGISTER_BYTE (r)], 4); - - ptrace (PT_SETREGS, inferior_pid, - (PTRACE_ARG3_TYPE) &inferior_registers, 0); -} - -/* Extract the register values out of the core file and store - them where `read_register' will find them. - Extract the floating point state out of the core file and store - it where `float_info' will find it. - - CORE_REG_SECT points to the register values themselves, read into memory. - CORE_REG_SIZE is the size of that area. - WHICH says which set of registers we are handling (0 = int, 2 = float - on machines where they are discontiguous). - REG_ADDR is the offset from u.u_ar0 to the register values relative to - core_reg_sect. This is used with old-fashioned core files to - locate the registers in a large upage-plus-stack ".reg" section. - Original upage address X is at location core_reg_sect+x+reg_addr. - */ - -static void -fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) - char *core_reg_sect; - unsigned core_reg_size; - int which; - CORE_ADDR reg_addr; -{ - register int regno; - register int cregno; - register int addr; - int bad_reg = -1; - int offset; - struct pcb *tmp_pcbaddr; - - /* - * First get virtual address of user structure. Then calculate offset. - */ - memcpy(&tmp_pcbaddr, - &((struct user *) core_reg_sect)->u_kproc.ki_pcb, - sizeof(tmp_pcbaddr)); - offset = -reg_addr - (int) tmp_pcbaddr; - - for (regno = 0; regno < NUM_REGS; regno++) - { - cregno = tregmap[regno]; - if (cregno == tGS) - addr = offsetof (struct pcb, pcb_gs); - else - addr = offset + 4 * cregno; - if (addr < 0 || addr >= core_reg_size) - { - if (bad_reg < 0) - bad_reg = regno; - } - else - { - supply_register (regno, core_reg_sect + addr); - } - } - if (bad_reg >= 0) - { - error ("Register %s not found in core file.", gdb_register_names[bad_reg]); - } - - addr = offsetof (struct pcb, pcb_save); - memcpy (&pcb_savefpu, core_reg_sect + addr, sizeof pcb_savefpu); -} - -#ifdef FLOAT_INFO -#include "expression.h" -#include "language.h" /* for local_hex_string */ -#include "floatformat.h" - -#include -#include -#include -#include - -#include - -#include -#include -#include -#define curpcb Xcurpcb /* XXX avoid leaking declaration from pcb.h */ -#include -#undef curpcb -#include -#include "gdb_stat.h" -#include - -extern void print_387_control_word (); /* i387-tdep.h */ -extern void print_387_status_word (); - -#define fpstate save87 - -static void -i387_to_double (from, to) - char *from; - char *to; -{ - long *lp; - /* push extended mode on 387 stack, then pop in double mode - * - * first, set exception masks so no error is generated - - * number will be rounded to inf or 0, if necessary - */ - asm ("pushl %eax"); /* grab a stack slot */ - asm ("fstcw (%esp)"); /* get 387 control word */ - asm ("movl (%esp),%eax"); /* save old value */ - asm ("orl $0x3f,%eax"); /* mask all exceptions */ - asm ("pushl %eax"); - asm ("fldcw (%esp)"); /* load new value into 387 */ - - asm ("movl 8(%ebp),%eax"); - asm ("fldt (%eax)"); /* push extended number on 387 stack */ - asm ("fwait"); - asm ("movl 12(%ebp),%eax"); - asm ("fstpl (%eax)"); /* pop double */ - asm ("fwait"); - - asm ("popl %eax"); /* flush modified control word */ - asm ("fnclex"); /* clear exceptions */ - asm ("fldcw (%esp)"); /* restore original control word */ - asm ("popl %eax"); /* flush saved copy */ -} - -struct env387 -{ - unsigned short control; - unsigned short r0; - unsigned short status; - unsigned short r1; - unsigned short tag; - unsigned short r2; - unsigned long eip; - unsigned short code_seg; - unsigned short opcode; - unsigned long operand; - unsigned short operand_seg; - unsigned short r3; - unsigned char regs[8][10]; -}; - -static void -print_387_status (status, ep) - unsigned short status; - struct env387 *ep; -{ - int i; - int bothstatus; - int top; - int fpreg; - - bothstatus = ((status != 0) && (ep->status != 0)); - if (status != 0) - { - if (bothstatus) - printf_unfiltered ("u: "); - print_387_status_word ((unsigned int)status); - } - - if (ep->status != 0) - { - if (bothstatus) - printf_unfiltered ("e: "); - print_387_status_word ((unsigned int)ep->status); - } - - print_387_control_word ((unsigned int)ep->control); - printf_unfiltered ("last instruction: "); - printf_unfiltered ("opcode %s; ", local_hex_string(ep->opcode)); - printf_unfiltered ("pc %s:", local_hex_string(ep->code_seg)); - printf_unfiltered ("%s; ", local_hex_string(ep->eip)); - printf_unfiltered ("operand %s", local_hex_string(ep->operand_seg)); - printf_unfiltered (":%s\n", local_hex_string(ep->operand)); - - top = (ep->status >> 11) & 7; - - printf_unfiltered (" regno tag msb lsb value\n"); - for (fpreg = 7; fpreg >= 0; fpreg--) - { - int exp; - int mantissa_or; - int normal; - char *sign; - int st_regno; - unsigned short *usregs; - double val; - - /* The physical regno `fpreg' is only relevant as an index into the - * tag word. Logical `%st' numbers are required for indexing ep->regs. - */ - st_regno = (fpreg + 8 - top) & 7; - - printf_unfiltered ("%%st(%d) %s ", st_regno, fpreg == top ? "=>" : " "); - - switch ((ep->tag >> (fpreg * 2)) & 3) - { - case 0: printf_unfiltered ("valid "); break; - case 1: printf_unfiltered ("zero "); break; - case 2: printf_unfiltered ("trap "); break; - case 3: printf_unfiltered ("empty "); break; - } - for (i = 9; i >= 0; i--) - printf_unfiltered ("%02x", ep->regs[st_regno][i]); - - printf_unfiltered (" "); - - /* - * Handle weird cases better than floatformat_to_double () and - * printf (). - */ - usregs = (unsigned short *) ep->regs[st_regno]; - sign = usregs[4] & 0x8000 ? "-" : ""; - exp = usregs[4] & 0x7fff; - normal = usregs[3] & 0x8000; - mantissa_or = usregs[0] | usregs[1] | usregs[2] | (usregs[3] & 0x7fff); - if (exp == 0) - { - if (normal) - printf_unfiltered ("Pseudo Denormal (0 as a double)"); - else if (mantissa_or == 0) - printf_unfiltered ("%s0", sign); - else - printf_unfiltered ("Denormal (0 as a double)"); - } - else if (exp == 0x7fff) - { - if (!normal) - printf_unfiltered ("Pseudo "); - if (mantissa_or == 0) - printf_unfiltered ("%sInf", sign); - else - printf_unfiltered ("%s NaN", - usregs[3] & 0x4000 ? "Quiet" : "Signaling"); - if (!normal) - printf_unfiltered (" (NaN)"); - } - else if (!normal) - printf_unfiltered ("Unnormal (NaN)"); - else - { -#if 0 - /* Use this we stop trapping on overflow. */ - floatformat_to_double(&floatformat_i387_ext, - (char *) ep->regs[st_regno], &val); -#else - i387_to_double((char *) ep->regs[st_regno], (char *) &val); -#endif - printf_unfiltered ("%g", val); - } - printf_unfiltered ("\n"); - } -} - -void -i386_float_info () -{ - struct user u; /* just for address computations */ - int i; - /* fpstate defined in */ - struct fpstate *fpstatep; - char buf[sizeof (struct fpstate) + 2 * sizeof (int)]; - char fpvalid; - unsigned int rounded_addr; - unsigned int rounded_size; - /*extern int corechan;*/ - int skip; - extern int inferior_pid; - - if (inferior_pid != 0 && core_bfd == NULL) - { - int pid = inferior_pid & ((1 << 17) - 1); /* XXX extract pid from tid */ - ptrace(PT_GETFPREGS, pid, &buf[0], sizeof(struct fpreg)); - fpstatep = (struct fpstate *)&buf[0]; - } - else - fpstatep = &pcb_savefpu; - - print_387_status (fpstatep->sv_ex_sw, (struct env387 *)fpstatep); -} -#endif /* FLOAT_INFO */ - -int -kernel_u_size () -{ - return (sizeof (struct user)); -} - -#ifdef SETUP_ARBITRARY_FRAME -#include "frame.h" -struct frame_info * -setup_arbitrary_frame (argc, argv) - int argc; - CORE_ADDR *argv; -{ - if (argc != 2) - error ("i386 frame specifications require two arguments: sp and pc"); - - return create_new_frame (argv[0], argv[1]); -} -#endif /* SETUP_ARBITRARY_FRAME */ - -#ifdef HAVE_GREGSET_T -void -supply_gregset (gp) - gregset_t *gp; -{ - int regno = 0; - - /* These must be ordered the same as REGISTER_NAMES in - config/i386/tm-i386.h. */ - supply_register (regno++, (char *)&gp->r_eax); - supply_register (regno++, (char *)&gp->r_ecx); - supply_register (regno++, (char *)&gp->r_edx); - supply_register (regno++, (char *)&gp->r_ebx); - supply_register (regno++, (char *)&gp->r_esp); - supply_register (regno++, (char *)&gp->r_ebp); - supply_register (regno++, (char *)&gp->r_esi); - supply_register (regno++, (char *)&gp->r_edi); - supply_register (regno++, (char *)&gp->r_eip); - supply_register (regno++, (char *)&gp->r_eflags); - supply_register (regno++, (char *)&gp->r_cs); - supply_register (regno++, (char *)&gp->r_ss); - supply_register (regno++, (char *)&gp->r_ds); - supply_register (regno++, (char *)&gp->r_es); - supply_register (regno++, (char *)&gp->r_fs); - supply_register (regno++, (char *)&gp->r_gs); -} -#endif /* HAVE_GREGSET_T */ - -#ifdef HAVE_FPREGSET_T -void -supply_fpregset (fp) - fpregset_t *fp; -{ - memcpy (&pcb_savefpu, fp, sizeof pcb_savefpu); -} -#endif /* HAVE_FPREGSET_T */ - -/* Register that we are able to handle aout (trad-core) file formats. */ - -static struct core_fns aout_core_fns = -{ - bfd_target_unknown_flavour, - fetch_core_registers, - NULL -}; - -void -_initialize_core_aout () -{ - add_core_fns (&aout_core_fns); -} - -#ifdef PT_GETDBREGS - -/* - * 0: no trace output - * 1: trace watchpoint requests - * 2: trace `watchpoint hit?' tests, too - */ -#define WATCHPOINT_DEBUG 0 - -#include "breakpoint.h" - -int -can_watch(type, cnt, ot) - int type, cnt, ot; -{ - int rv; - static int cnt_watch, cnt_awatch; - - switch (type) - { - case bp_hardware_watchpoint: - cnt_watch = cnt; - break; - - case bp_access_watchpoint: - cnt_awatch = cnt; - break; - - default: - rv = 0; - goto overandout; - } - - rv = cnt_watch + cnt_awatch <= 4? 1: -1; - - overandout: -#if WATCHPOINT_DEBUG - printf_filtered("can_watch(%d, %d, %d) = %d (counts: w: %d, rw: %d)\n", - type, cnt, ot, rv, cnt_watch, cnt_awatch); -#endif - - return rv; -} - -int -stopped_by_watchpoint() -{ - struct dbreg dbr; - extern int inferior_pid; - - if (current_target.to_shortname == 0 || - ! (strcmp(current_target.to_shortname, "child") == 0 || - strcmp(current_target.to_shortname, "freebsd-uthreads") == 0)) - return 0; - - if (inferior_pid != 0 && core_bfd == NULL) - { - int pid = inferior_pid & ((1 << 17) - 1); /* XXX extract pid from tid */ - - if (ptrace(PT_GETDBREGS, pid, (caddr_t)&dbr, 0) == -1) - { - perror("ptrace(PT_GETDBREGS) failed"); - return 0; - } -#if WATCHPOINT_DEBUG > 1 - printf_filtered("stopped_by_watchpoint(): DR6 = %#x\n", dbr.dr6); -#endif - /* - * If a hardware watchpoint was hit, one of the lower 4 bits in - * DR6 is set (the actual bit indicates which of DR0...DR3 triggered - * the trap). - */ - return dbr.dr6 & 0x0f; - } - else - { - warning("Can't set a watchpoint on a core file."); - return 0; - } -} - -int -insert_watchpoint(addr, len, type) - int addr, len, type; -{ - struct dbreg dbr; - extern int inferior_pid; - - if (current_target.to_shortname == 0 || - ! (strcmp(current_target.to_shortname, "child") == 0 || - strcmp(current_target.to_shortname, "freebsd-uthreads") == 0)) - return 0; - - if (inferior_pid != 0 && core_bfd == NULL) - { - int pid = inferior_pid & ((1 << 17) - 1); /* XXX extract pid from tid */ - int i, mask; - unsigned int sbits; - - if (ptrace(PT_GETDBREGS, pid, (caddr_t)&dbr, 0) == -1) - { - perror("ptrace(PT_GETDBREGS) failed"); - return 0; - } - - for (i = 0, mask = 0x03; i < 4; i++, mask <<= 2) - if ((dbr.dr7 & mask) == 0) - break; - if (i >= 4) { - warning("no more hardware watchpoints available"); - return -1; - } - - /* paranoia */ - if (len > 4) - { - warning("watchpoint length %d unsupported, using lenght = 4", - len); - len = 4; - } - else if (len == 3) - { - warning("weird watchpoint length 3, using 2"); - len = 2; - } - else if (len == 0) - { - warning("weird watchpoint length 0, using 1"); - len = 1; - } - - switch (len) - { - case 1: sbits = 0; break; - case 2: sbits = 4; break; - case 4: sbits = 0x0c; break; - } - - /* - * The `type' value is 0 for `watch on write', 1 for `watch on - * read', 2 for `watch on both'. The i386 debug register - * breakpoint types are 0 for `execute' (not used in GDB), 1 for - * `write', and 4 for `read/write'. Plain `read' trapping is - * not supported on i386, value 3 is illegal. - */ - switch (type) - { - default: - warning("weird watchpoint type %d, using a write watchpoint"); - /* FALLTHROUGH */ - case 0: - sbits |= 1; - break; - - case 2: - sbits |= 3; - break; - } - sbits <<= 4 * i + 16; - sbits |= 1 << 2 * i; - - dbr.dr7 |= sbits; - *(&dbr.dr0 + i) = (unsigned int)addr; - -#if WATCHPOINT_DEBUG - printf_filtered("insert_watchpoint(), inserting DR7 = %#x, DR%d = %#x\n", - dbr.dr7, i, addr); -#endif - if (ptrace(PT_SETDBREGS, pid, (caddr_t)&dbr, 0) == -1) - { - perror("ptrace(PT_SETDBREGS) failed"); - return 0; - } - } - else - { - warning("Can't set a watchpoint on a core file."); - return 0; - } -} - -int -remove_watchpoint(addr, len, type) - int addr, len, type; -{ - struct dbreg dbr; - extern int inferior_pid; - - if (current_target.to_shortname == 0 || - ! (strcmp(current_target.to_shortname, "child") == 0 || - strcmp(current_target.to_shortname, "freebsd-uthreads") == 0)) - return 0; - - if (inferior_pid != 0 && core_bfd == NULL) - { - int pid = inferior_pid & ((1 << 17) - 1); /* XXX extract pid from tid */ - int i; - unsigned int sbits, *dbregp; - - if (ptrace(PT_GETDBREGS, pid, (caddr_t)&dbr, 0) == -1) - { - perror("ptrace(PT_GETDBREGS) failed"); - return 0; - } - - for (i = 0, dbregp = &dbr.dr0; i < 4; i++, dbregp++) - if (*dbregp == (unsigned int)addr) - break; - if (i >= 4) - { - warning("watchpoint for address %#x not found", addr); - return -1; - } - - *dbregp = 0; - sbits = 0xf << (4 * i + 16); - sbits |= 3 << 2 * i; - dbr.dr7 &= ~sbits; - -#if WATCHPOINT_DEBUG - printf_filtered("remove_watchpoint(): removing watchpoint for %#x, DR7 = %#x\n", - addr, dbr.dr7); -#endif - if (ptrace(PT_SETDBREGS, pid, (caddr_t)&dbr, 0) == -1) - { - perror("ptrace(PT_SETDBREGS) failed"); - return 0; - } - } - else - { - warning("Can't set a watchpoint on a core file."); - return 0; - } -} - -#endif /* PT_GETDBREGS */ - -CORE_ADDR -fbsd_sigtramp_saved_pc (frame) - struct frame_info *frame; -{ - CORE_ADDR sigcontext_addr; - CORE_ADDR sigcode_addr; - char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT]; - int ptrbytes = TARGET_PTR_BIT / TARGET_CHAR_BIT; - int sigcontext_offs = (2 * TARGET_INT_BIT) / TARGET_CHAR_BIT; - int sigcode_offs = (-1 * TARGET_INT_BIT) / TARGET_CHAR_BIT; - - /* Get sigcontext address, it is the third parameter on the stack. */ - if (frame->next) - sigcontext_addr = read_memory_integer (FRAME_ARGS_ADDRESS (frame->next) - + FRAME_ARGS_SKIP - + sigcontext_offs, - ptrbytes); - else - sigcontext_addr = read_memory_integer (read_register (SP_REGNUM) - + sigcontext_offs, - ptrbytes); - -#ifdef OSIGCODE_MAGIC_OFFSET - if (frame->next) - sigcode_addr = read_memory_integer (FRAME_ARGS_ADDRESS (frame->next) - + FRAME_ARGS_SKIP - + sigcode_offs, - ptrbytes); - else - sigcode_addr = read_memory_integer (read_register (SP_REGNUM) - + sigcode_offs, - ptrbytes); - target_read_memory (sigcode_addr + OSIGCODE_MAGIC_OFFSET, - buf, ptrbytes); - if (extract_unsigned_integer(buf, ptrbytes) == 0x01d516) { - target_read_memory (sigcontext_addr + OSIGCONTEXT_PC_OFFSET, - buf, ptrbytes); - } else -#endif - /* Don't cause a memory_error when accessing sigcontext in case the stack - layout has changed or the stack is corrupt. */ - target_read_memory (sigcontext_addr + NSIGCONTEXT_PC_OFFSET, buf, ptrbytes); - return extract_unsigned_integer (buf, ptrbytes); -} diff --git a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c deleted file mode 100644 index a695ab4..0000000 --- a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c +++ /dev/null @@ -1,1045 +0,0 @@ -/* Live and postmortem kernel debugging functions for FreeBSD. - Copyright 1996 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. */ - -/* $FreeBSD$ */ - -#include "defs.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "frame.h" /* required by inferior.h */ -#include "inferior.h" -#include "symtab.h" -#include "symfile.h" -#include "objfiles.h" -#include "command.h" -#include "bfd.h" -#include "target.h" -#include "gdbcore.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#define _KERNEL -#include -#undef _KERNEL - -static void kcore_files_info PARAMS ((struct target_ops *)); - -static void kcore_close PARAMS ((int)); - -static void get_kcore_registers PARAMS ((int)); - -static int kcore_xfer_kmem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *)); - -static int xfer_umem PARAMS ((CORE_ADDR, char *, int, int)); - -static CORE_ADDR ksym_lookup PARAMS ((const char *)); - -static int read_pcb PARAMS ((int, CORE_ADDR)); - -static struct proc * curProc PARAMS ((void)); - -static int set_proc_context PARAMS ((CORE_ADDR paddr)); - -static void kcore_open PARAMS ((char *filename, int from_tty)); - -static void kcore_detach PARAMS ((char *args, int from_tty)); - -static void set_proc_cmd PARAMS ((char *arg, int from_tty)); - -static void set_cpu_cmd PARAMS ((char *arg, int from_tty)); - -static CORE_ADDR kvtophys PARAMS ((int, CORE_ADDR)); - -static int physrd PARAMS ((int, u_int, char*, int)); - -static int kvm_open PARAMS ((const char *efile, char *cfile, char *sfile, - int perm, char *errout)); - -static int kvm_close PARAMS ((int fd)); - -static int kvm_write PARAMS ((int core_kd, CORE_ADDR memaddr, - char *myaddr, int len)); - -static int kvm_read PARAMS ((int core_kd, CORE_ADDR memaddr, - char *myaddr, int len)); - -static int kvm_uread PARAMS ((int core_kd, struct proc *p, - CORE_ADDR memaddr, char *myaddr, - int len)); - -static int kernel_core_file_hook PARAMS ((int fd, CORE_ADDR addr, - char *buf, int len)); - -static CORE_ADDR kvm_getpcpu PARAMS ((int cfd, int cpuid)); - -static struct kinfo_proc * kvm_getprocs PARAMS ((int cfd, int op, - CORE_ADDR proc, int *cnt)); - -extern struct target_ops kcore_ops; /* Forward decl */ - -/* Non-zero means we are debugging a kernel core file */ -int kernel_debugging = 0; -int kernel_writablecore = 0; - -static char *core_file; -static int core_kd = -1; -static struct proc *cur_proc; -static CORE_ADDR kernel_start; - -static CORE_ADDR pcpu; -#define PCPU_OFFSET(name) \ - offsetof(struct pcpu, pc_ ## name) - -/* - * Symbol names of kernel entry points. Use special frames. - */ -#define KSYM_TRAP "calltrap" -#define KSYM_INTR "Xintr" -#define KSYM_FASTINTR "Xfastintr" -#define KSYM_SYSCALL "Xsyscall" - -/* - * Read the "thing" at kernel address 'addr' into the space pointed to - * by point. The length of the "thing" is determined by the type of p. - * Result is non-zero if transfer fails. - */ -#define kvread(addr, p) \ - (target_read_memory ((CORE_ADDR)(addr), (char *)(p), sizeof(*(p)))) - - - -/* - * The following is FreeBSD-specific hackery to decode special frames - * and elide the assembly-language stub. This could be made faster by - * defining a frame_type field in the machine-dependent frame information, - * but we don't think that's too important right now. - */ -enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall }; - -CORE_ADDR -fbsd_kern_frame_saved_pc (fr) -struct frame_info *fr; -{ - struct minimal_symbol *sym; - CORE_ADDR this_saved_pc; - enum frametype frametype; - - this_saved_pc = read_memory_integer (fr->frame + 4, 4); - sym = lookup_minimal_symbol_by_pc (this_saved_pc); - frametype = tf_normal; - if (sym != NULL) { - if (strcmp (SYMBOL_NAME(sym), KSYM_TRAP) == 0) - frametype = tf_trap; - else if (strncmp (SYMBOL_NAME(sym), KSYM_INTR, - strlen(KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym), - KSYM_FASTINTR, strlen(KSYM_FASTINTR)) == 0) - frametype = tf_interrupt; - else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0) - frametype = tf_syscall; - } - - switch (frametype) { - case tf_normal: - return (this_saved_pc); - -#define oEIP offsetof(struct trapframe, tf_eip) - - case tf_trap: - return (read_memory_integer (fr->frame + 8 + oEIP, 4)); - - case tf_interrupt: - return (read_memory_integer (fr->frame + 12 + oEIP, 4)); - - case tf_syscall: - return (read_memory_integer (fr->frame + 8 + oEIP, 4)); -#undef oEIP - } -} - -static CORE_ADDR -ksym_lookup (name) -const char *name; -{ - struct minimal_symbol *sym; - - sym = lookup_minimal_symbol (name, NULL, NULL); - if (sym == NULL) - error ("kernel symbol `%s' not found.", name); - - return SYMBOL_VALUE_ADDRESS (sym); -} - -static struct proc * -curProc () -{ - struct proc *p; - struct thread *td; - CORE_ADDR addr = pcpu + PCPU_OFFSET (curthread); - - if (kvread (addr, &td)) - error ("cannot read thread pointer at %x\n", addr); - addr = (CORE_ADDR)td + offsetof(struct thread, td_proc); - if (kvread (addr, &p)) - error ("cannot read proc pointer at %x\n", addr); - return p; -} - -/* - * Set the process context to that of the proc structure at - * system address paddr. - */ -static int -set_proc_context (paddr) - CORE_ADDR paddr; -{ - struct proc p; - - if (paddr < kernel_start) - return (1); - - cur_proc = (struct proc *)paddr; -#ifdef notyet - set_kernel_boundaries (cur_proc); -#endif - - /* Fetch all registers from core file */ - target_fetch_registers (-1); - - /* Now, set up the frame cache, and print the top of stack */ - flush_cached_frames (); - set_current_frame (create_new_frame (read_fp (), read_pc ())); - select_frame (get_current_frame (), 0); - return (0); -} - -/* Discard all vestiges of any previous core file - and mark data and stack spaces as empty. */ - -/* ARGSUSED */ -static void -kcore_close (quitting) - int quitting; -{ - inferior_pid = 0; /* Avoid confusion from thread stuff */ - - if (core_kd) - { - kvm_close (core_kd); - free (core_file); - core_file = NULL; - core_kd = -1; - } -} - -/* This routine opens and sets up the core file bfd */ - -static void -kcore_open (filename, from_tty) - char *filename; - int from_tty; -{ - const char *p; - struct cleanup *old_chain; - char buf[256], *cp; - int ontop; - CORE_ADDR addr; - struct pcb pcb; - - target_preopen (from_tty); - - unpush_target (&kcore_ops); - - if (!filename) - { - /*error (core_kd?*/ - error ( (core_kd >= 0)? - "No core file specified. (Use `detach' to stop debugging a core file.)" - : "No core file specified."); - } - - filename = tilde_expand (filename); - if (filename[0] != '/') - { - cp = concat (current_directory, "/", filename, NULL); - free (filename); - filename = cp; - } - - old_chain = make_cleanup (free, filename); - - /* - * gdb doesn't really do anything if the exec-file couldn't - * be opened (in that case exec_bfd is NULL). Usually that's - * no big deal, but kvm_open needs the exec-file's name, - * which results in dereferencing a NULL pointer, a real NO-NO ! - * So, check here if the open of the exec-file succeeded. - */ - if (exec_bfd == NULL) /* the open failed */ - error ("kgdb could not open the exec-file, please check the name you used !"); - - core_kd = kvm_open (exec_bfd->filename, filename, NULL, - kernel_writablecore? O_RDWR : O_RDONLY, "kgdb: "); - if (core_kd < 0) - perror_with_name (filename); - - /* Looks semi-reasonable. Toss the old core file and work on the new. */ - - discard_cleanups (old_chain); /* Don't free filename any more */ - core_file = filename; - ontop = !push_target (&kcore_ops); - - kernel_start = bfd_get_start_address (exec_bfd); /* XXX */ - - /* print out the panic string if there is one */ - if (kvread (ksym_lookup ("panicstr"), &addr) == 0 - && addr != 0 - && target_read_memory (addr, buf, sizeof (buf)) == 0) - { - for (cp = buf; cp < &buf[sizeof (buf)] && *cp; cp++) - if (!isascii (*cp) || (!isprint (*cp) && !isspace (*cp))) - *cp = '?'; - *cp = '\0'; - if (buf[0] != '\0') - printf ("panicstr: %s\n", buf); - } - - /* Print all the panic messages if possible. */ - if (symfile_objfile != NULL) - { - printf ("panic messages:\n---\n"); - snprintf (buf, sizeof buf, - "/sbin/dmesg -N %s -M %s | \ - /usr/bin/awk '/^(panic:|Fatal trap) / { printing = 1 } \ - { if (printing) print $0 }'", - symfile_objfile->name, filename); - fflush(stdout); - system (buf); - printf ("---\n"); - } - - if (!ontop) - { - warning ("you won't be able to access this core file until you terminate\n\ -your %s; do ``info files''", target_longname); - return; - } - - /* we may need this later */ - cur_proc = (struct proc *)curProc (); - /* Now, set up the frame cache, and print the top of stack */ - flush_cached_frames (); - set_current_frame (create_new_frame (read_fp (), read_pc ())); - select_frame (get_current_frame (), 0); - print_stack_frame (selected_frame, selected_frame_level, 1); -} - -static void -kcore_detach (args, from_tty) - char *args; - int from_tty; -{ - if (args) - error ("Too many arguments"); - unpush_target (&kcore_ops); - reinit_frame_cache (); - if (from_tty) - printf_filtered ("No kernel core file now.\n"); -} - -/* Get the registers out of a core file. This is the machine- - independent part. Fetch_core_registers is the machine-dependent - part, typically implemented in the xm-file for each architecture. */ - -/* We just get all the registers, so we don't use regno. */ -/* ARGSUSED */ -static void -get_kcore_registers (regno) - int regno; -{ - struct pcb *pcbaddr; - struct thread *mainthread; - - /* find the pcb for the current process */ - if (cur_proc == NULL) - error ("get_kcore_registers no proc"); - if (kvread (&TAILQ_FIRST(&cur_proc->p_threads), &mainthread)) /* XXXKSE */ - error ("cannot read main thread for proc at %#x", cur_proc); - if (kvread (&mainthread->td_pcb, &pcbaddr)) /* XXXKSE */ - error ("cannot read pcb pointer for proc at %#x", cur_proc); - if (read_pcb (core_kd, (CORE_ADDR)pcbaddr) < 0) - error ("cannot read pcb at %#x", pcbaddr); -} - -static void -kcore_files_info (t) - struct target_ops *t; -{ - printf ("\t`%s'\n", core_file); -} - -static CORE_ADDR -ksym_maxuseraddr() -{ - static CORE_ADDR maxuseraddr; - struct minimal_symbol *sym; - - if (maxuseraddr == 0) - { - sym = lookup_minimal_symbol ("PTmap", NULL, NULL); - if (sym == NULL) { - maxuseraddr = VM_MAXUSER_ADDRESS; - } else { - maxuseraddr = SYMBOL_VALUE_ADDRESS (sym); - } - } - return maxuseraddr; -} - -static int -kcore_xfer_kmem (memaddr, myaddr, len, write, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; - struct target_ops *target; -{ - int ns; - int nu; - - if (memaddr >= ksym_maxuseraddr()) - nu = 0; - else - { - nu = xfer_umem (memaddr, myaddr, len, write); - if (nu <= 0) - return (0); - if (nu == len) - return (nu); - memaddr += nu; - if (memaddr != ksym_maxuseraddr()) - return (nu); - myaddr += nu; - len -= nu; - } - - ns = (write ? kvm_write : kvm_read) (core_kd, memaddr, myaddr, len); - if (ns < 0) - ns = 0; - - return (nu + ns); -} - -static int -xfer_umem (memaddr, myaddr, len, write) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; /* ignored */ -{ - int n; - struct proc proc; - - if (cur_proc == NULL || kvread (cur_proc, &proc)) - error ("cannot read proc at %#x", cur_proc); - n = kvm_uread (core_kd, &proc, memaddr, myaddr, len) ; - - if (n < 0) - return 0; - return n; -} - -static CORE_ADDR -ksym_kernbase() -{ - static CORE_ADDR kernbase; - struct minimal_symbol *sym; - - if (kernbase == 0) - { - sym = lookup_minimal_symbol ("kernbase", NULL, NULL); - if (sym == NULL) { - kernbase = KERNBASE; - } else { - kernbase = SYMBOL_VALUE_ADDRESS (sym); - } - } - return kernbase; -} - -#define KERNOFF (ksym_kernbase()) -#define INKERNEL(x) ((x) >= KERNOFF) - -static CORE_ADDR sbr; -static CORE_ADDR curpcb; -static int found_pcb; -static int devmem; -static int kfd; -static struct pcb pcb; - -static void -set_proc_cmd (arg, from_tty) - char *arg; - int from_tty; -{ - CORE_ADDR paddr; - struct kinfo_proc *kp; - int cnt = 0; - - if (!arg) - error_no_arg ("proc address for new current process"); - if (!kernel_debugging) - error ("not debugging kernel"); - - paddr = (CORE_ADDR)parse_and_eval_address (arg); - /* assume it's a proc pointer if it's in the kernel */ - if (paddr >= kernel_start) { - if (set_proc_context(paddr)) - error("invalid proc address"); - } else { - kp = kvm_getprocs(core_kd, KERN_PROC_PID, paddr, &cnt); - if (!cnt) - error("invalid pid"); - if (set_proc_context((CORE_ADDR)kp->ki_paddr)) - error("invalid proc address"); - } -} - -static void -set_cpu_cmd (arg, from_tty) - char *arg; - int from_tty; -{ - CORE_ADDR paddr; - CORE_ADDR pcaddr; - struct kinfo_proc *kp; - int cpu, cfd; - - if (!arg) - error_no_arg ("cpu number"); - if (!kernel_debugging) - error ("not debugging kernel"); - - cfd = core_kd; - cpu = (int)parse_and_eval_address (arg); - if ((pcaddr = kvm_getpcpu (cfd, cpu)) == NULL) - error ("cpu number out of range"); - - pcpu = pcaddr; - curpcb = kvtophys(cfd, pcpu + PCPU_OFFSET (curpcb)); - physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb); - - if (!devmem) - paddr = ksym_lookup ("dumppcb") - KERNOFF; - else - paddr = kvtophys (cfd, curpcb); - read_pcb (cfd, paddr); - printf ("initial pcb at %lx\n", (unsigned long)paddr); - - if ((cur_proc = curProc())) - target_fetch_registers (-1); - - /* Now, set up the frame cache, and print the top of stack */ - flush_cached_frames (); - set_current_frame (create_new_frame (read_fp (), read_pc ())); - select_frame (get_current_frame (), 0); - print_stack_frame (selected_frame, selected_frame_level, 1); -} - -/* substitutes for the stuff in libkvm which doesn't work */ -/* most of this was taken from the old kgdb */ - -/* we don't need all this stuff, but the call should look the same */ - -static int -kvm_open (efile, cfile, sfile, perm, errout) - const char *efile; - char *cfile; - char *sfile; /* makes this kvm_open more compatible to the one in libkvm */ - int perm; - char *errout; /* makes this kvm_open more compatible to the one in libkvm */ -{ - struct stat stb; - int cfd; - CORE_ADDR paddr; - - if ((cfd = open (cfile, perm, 0)) < 0) - return (cfd); - - if ((pcpu = kvm_getpcpu (cfd, 0)) == NULL) - return (-1); - - fstat (cfd, &stb); - if ((stb.st_mode & S_IFMT) == S_IFCHR - && stb.st_rdev == makedev (2, 0)) - { - devmem = 1; - kfd = open (_PATH_KMEM, perm, 0); - } - - physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr); - printf ("IdlePTD at physical address 0x%08lx\n", (unsigned long)sbr); - curpcb = kvtophys(cfd, pcpu + PCPU_OFFSET (curpcb)); - physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb); - - found_pcb = 1; /* for vtophys */ - if (!devmem) - paddr = ksym_lookup ("dumppcb") - KERNOFF; - else - paddr = kvtophys (cfd, curpcb); - read_pcb (cfd, paddr); - printf ("initial pcb at physical address 0x%08lx\n", (unsigned long)paddr); - - return (cfd); -} - -static int -kvm_close (fd) - int fd; -{ - return (close (fd)); -} - -static int -kvm_write (core_kd, memaddr, myaddr, len) - int core_kd; - CORE_ADDR memaddr; - char *myaddr; -{ - int cc; - - if (devmem) - { - if (kfd > 0) - { - /* - * Just like kvm_read, only we write. - */ - errno = 0; - if (lseek (kfd, (off_t)memaddr, 0) < 0 - && errno != 0) - { - error ("kvm_write:invalid address (%x)", memaddr); - return (0); - } - cc = write (kfd, myaddr, len); - if (cc < 0) - { - error ("kvm_write:write failed"); - return (0); - } - else if (cc < len) - error ("kvm_write:short write"); - return (cc); - } - else - return (0); - } - else - { - printf ("kvm_write not implemented for dead kernels\n"); - return (0); - } - /* NOTREACHED */ -} - -static int -kvm_read (core_kd, memaddr, myaddr, len) - int core_kd; - CORE_ADDR memaddr; - char *myaddr; -{ - return (kernel_core_file_hook (core_kd, memaddr, myaddr, len)); -} - -static int -kvm_uread (core_kd, p, memaddr, myaddr, len) - int core_kd; - register struct proc *p; - CORE_ADDR memaddr; - char *myaddr; - int len; -{ - register char *cp; - char procfile[MAXPATHLEN]; - ssize_t amount; - int fd; - - if (devmem) - { - sprintf (procfile, "/proc/%d/mem", p->p_pid); - fd = open (procfile, O_RDONLY, 0); - if (fd < 0) - { - error ("cannot open %s", procfile); - close (fd); - return (0); - } - - cp = myaddr; - while (len > 0) - { - errno = 0; - if (lseek (fd, (off_t)memaddr, 0) == -1 && errno != 0) - { - error ("invalid address (%x) in %s", memaddr, procfile); - break; - } - amount = read (fd, cp, len); - if (amount < 0) - { - error ("error reading %s", procfile); - break; - } - if (amount == 0) - { - error ("EOF reading %s", procfile); - break; - } - cp += amount; - memaddr += amount; - len -= amount; - } - - close (fd); - return ((ssize_t) (cp - myaddr)); - } - else - return (kernel_core_file_hook (core_kd, memaddr, myaddr, len)); -} - -static struct kinfo_proc kp; - -/* - * try to do what kvm_proclist in libkvm would do - */ -static int -kvm_proclist (cfd, pid, p, cnt) -int cfd, pid, *cnt; -struct proc *p; -{ - struct proc lp; - - for (; p != NULL; p = LIST_NEXT(&lp, p_list)) { - if (!kvm_read(cfd, (CORE_ADDR)p, (char *)&lp, sizeof (lp))) - return (0); - if (lp.p_pid != pid) - continue; - kp.ki_paddr = p; - *cnt = 1; - return (1); - } - *cnt = 0; - return (0); -} - -/* - * try to do what kvm_deadprocs in libkvm would do - */ -static struct kinfo_proc * -kvm_deadprocs (cfd, pid, cnt) -int cfd, pid, *cnt; -{ - CORE_ADDR allproc, zombproc; - struct proc *p; - - allproc = ksym_lookup("allproc"); - if (kvm_read(cfd, allproc, (char *)&p, sizeof (p)) == 0) - return (NULL); - kvm_proclist (cfd, pid, p, cnt); - if (!*cnt) { - zombproc = ksym_lookup("zombproc"); - if (kvm_read(cfd, zombproc, (char *)&p, sizeof (p)) == 0) - return (NULL); - kvm_proclist (cfd, pid, p, cnt); - } - return (&kp); -} - -static CORE_ADDR -kvm_getpcpu (cfd, cpuid) -int cfd, cpuid; -{ - SLIST_HEAD(, pcpu) pcpu_head; - struct pcpu lpc; - struct pcpu *pc; - - physrd (cfd, ksym_lookup ("cpuhead") - KERNOFF, (char*)&pcpu_head, - sizeof pcpu_head); - pc = SLIST_FIRST (&pcpu_head); - for (; pc != NULL; pc = SLIST_NEXT (&lpc, pc_allcpu)) - { - kvm_read (cfd, (CORE_ADDR)pc, (char*)&lpc, sizeof lpc); - if (lpc.pc_cpuid == cpuid) - break; - } - - return ((CORE_ADDR)pc); -} - -/* - * try to do what kvm_getprocs in libkvm would do - */ -static struct kinfo_proc * -kvm_getprocs (cfd, op, proc, cnt) -int cfd, op, *cnt; -CORE_ADDR proc; -{ - int mib[4], size; - - *cnt = 0; - /* assume it's a pid */ - if (devmem) { /* "live" kernel, use sysctl */ - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = (int)proc; - size = sizeof (kp); - if (sysctl (mib, 4, &kp, &size, NULL, 0) < 0) { - perror("sysctl"); - *cnt = 0; - return (NULL); - } - if (!size) - *cnt = 0; - else - *cnt = 1; - return (&kp); - } else - return (kvm_deadprocs (cfd, (int)proc, cnt)); -} - -static int -physrd (cfd, addr, dat, len) - int cfd; - u_int addr; - char *dat; - int len; -{ - if (lseek (cfd, (off_t)addr, L_SET) == -1) - return (-1); - return (read (cfd, dat, len)); -} - -static CORE_ADDR -kvtophys (fd, addr) - int fd; - CORE_ADDR addr; -{ - CORE_ADDR v; - unsigned int pte; - static CORE_ADDR PTD = -1; - CORE_ADDR current_ptd; - - /* - * We may no longer have a linear system page table... - * - * Here's the scoop. IdlePTD contains the physical address - * of a page table directory that always maps the kernel. - * IdlePTD is in memory that is mapped 1-to-1, so we can - * find it easily given its 'virtual' address from ksym_lookup(). - * For hysterical reasons, the value of IdlePTD is stored in sbr. - * - * To look up a kernel address, we first convert it to a 1st-level - * address and look it up in IdlePTD. This gives us the physical - * address of a page table page; we extract the 2nd-level part of - * VA and read the 2nd-level pte. Finally, we add the offset part - * of the VA into the physical address from the pte and return it. - * - * User addresses are a little more complicated. If we don't have - * a current PCB from read_pcb(), we use PTD, which is the (fixed) - * virtual address of the current ptd. Since it's NOT in 1-to-1 - * kernel space, we must look it up using IdlePTD. If we do have - * a pcb, we get the ptd from pcb_ptd. - */ - - if (INKERNEL (addr)) - current_ptd = sbr; - else if (found_pcb == 0) - { - if (PTD == -1) - PTD = kvtophys (fd, ksym_lookup ("PTD")); - current_ptd = PTD; - } - else - current_ptd = pcb.pcb_cr3; - - /* - * Read the first-level page table (ptd). - */ - v = current_ptd + ( (unsigned)addr >> PDRSHIFT) * sizeof pte; - if (physrd (fd, v, (char *)&pte, sizeof pte) < 0 || (pte&PG_V) == 0) - return (~0); - - if (pte & PG_PS) - { - /* - * No second-level page table; ptd describes one 4MB page. - * (We assume that the kernel wouldn't set PG_PS without enabling - * it cr0, and that the kernel doesn't support 36-bit physical - * addresses). - */ -#define PAGE4M_MASK (NBPDR - 1) -#define PG_FRAME4M (~PAGE4M_MASK) - addr = (pte & PG_FRAME4M) + (addr & PAGE4M_MASK); - } - else - { - /* - * Read the second-level page table. - */ - v = (pte&PG_FRAME) + ((addr >> PAGE_SHIFT)&(NPTEPG-1)) * sizeof pte; - if (physrd (fd, v, (char *) &pte, sizeof (pte)) < 0 || (pte&PG_V) == 0) - return (~0); - - addr = (pte & PG_FRAME) + (addr & PAGE_MASK); - } -#if 0 - printf ("vtophys (%x) -> %x\n", oldaddr, addr); -#endif - return (addr); -} - -static int -read_pcb (fd, uaddr) - int fd; - CORE_ADDR uaddr; -{ - int i; - int noreg; - CORE_ADDR nuaddr = uaddr; - - /* need this for the `proc' command to work */ - if (INKERNEL(uaddr)) - nuaddr = kvtophys(fd, uaddr); - - if (physrd (fd, nuaddr, (char *)&pcb, sizeof pcb) < 0) - { - error ("cannot read pcb at %x\n", uaddr); - return (-1); - } - - /* - * get the register values out of the sys pcb and - * store them where `read_register' will find them. - */ - /* - * XXX many registers aren't available. - * XXX for the non-core case, the registers are stale - they are for - * the last context switch to the debugger. - * XXX gcc's register numbers aren't all #defined in tm-i386.h. - */ - noreg = 0; - for (i = 0; i < 3; ++i) /* eax,ecx,edx */ - supply_register (i, (char *)&noreg); - supply_register (3, (char *)&pcb.pcb_ebx); - supply_register (SP_REGNUM, (char *)&pcb.pcb_esp); - supply_register (FP_REGNUM, (char *)&pcb.pcb_ebp); - supply_register (6, (char *)&pcb.pcb_esi); - supply_register (7, (char *)&pcb.pcb_edi); - supply_register (PC_REGNUM, (char *)&pcb.pcb_eip); - for (i = 9; i < 14; ++i) /* eflags, cs, ss, ds, es, fs */ - supply_register (i, (char *)&noreg); - supply_register (15, (char *)&pcb.pcb_gs); - - /* XXX 80387 registers? */ -} - -/* - * read len bytes from kernel virtual address 'addr' into local - * buffer 'buf'. Return numbert of bytes if read ok, 0 otherwise. On read - * errors, portion of buffer not read is zeroed. - */ - -static int -kernel_core_file_hook (fd, addr, buf, len) - int fd; - CORE_ADDR addr; - char *buf; - int len; -{ - int i; - CORE_ADDR paddr; - register char *cp; - int cc; - - cp = buf; - - while (len > 0) - { - paddr = kvtophys (fd, addr); - if (paddr == ~0) - { - memset (buf, '\000', len); - break; - } - /* we can't read across a page boundary */ - i = min (len, PAGE_SIZE - (addr & PAGE_MASK)); - if ( (cc = physrd (fd, paddr, cp, i)) <= 0) - { - memset (cp, '\000', len); - return (cp - buf); - } - cp += cc; - addr += cc; - len -= cc; - } - return (cp - buf); -} - -static struct target_ops kcore_ops; - -void -_initialize_kcorelow() -{ - kcore_ops.to_shortname = "kcore"; - kcore_ops.to_longname = "Kernel core dump file"; - kcore_ops.to_doc = - "Use a core file as a target. Specify the filename of the core file."; - kcore_ops.to_open = kcore_open; - kcore_ops.to_close = kcore_close; - kcore_ops.to_attach = find_default_attach; - kcore_ops.to_detach = kcore_detach; - kcore_ops.to_fetch_registers = get_kcore_registers; - kcore_ops.to_xfer_memory = kcore_xfer_kmem; - kcore_ops.to_files_info = kcore_files_info; - kcore_ops.to_create_inferior = find_default_create_inferior; - kcore_ops.to_stratum = kcore_stratum; - kcore_ops.to_has_memory = 1; - kcore_ops.to_has_stack = 1; - kcore_ops.to_has_registers = 1; - kcore_ops.to_magic = OPS_MAGIC; - - add_target (&kcore_ops); - add_com ("proc", class_obscure, set_proc_cmd, "Set current process context"); - add_com ("cpu", class_obscure, set_cpu_cmd, "Set current cpu"); -} diff --git a/gnu/usr.bin/binutils/gdb/i386/nm.h b/gnu/usr.bin/binutils/gdb/i386/nm.h deleted file mode 100644 index 65f872b..0000000 --- a/gnu/usr.bin/binutils/gdb/i386/nm.h +++ /dev/null @@ -1,168 +0,0 @@ -/* $FreeBSD$ */ -/* Native-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992, 1996 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 NM_FREEBSD_H -#define NM_FREEBSD_H - -#define ATTACH_DETACH - -/* Be shared lib aware */ -#include "solib.h" -#ifdef FREEBSD_ELF -#define SVR4_SHARED_LIBS -#endif - -/* This is the amount to subtract from u.u_ar0 - to get the offset in the core file of the register values. */ - -#include -#define KERNEL_U_ADDR USRSTACK - -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = i386_register_u_addr ((blockend),(regno)); - -/* We define our own fetch/store methods */ -#define FETCH_INFERIOR_REGISTERS - -extern int -i386_register_u_addr PARAMS ((int, int)); - -#define PTRACE_ARG3_TYPE char* - -#ifndef FREEBSD_ELF - -/* make structure definitions match up with those expected in solib.c */ -#define link_object sod -#define lo_name sod_name -#define lo_library sod_library -#define lo_unused sod_reserved -#define lo_major sod_major -#define lo_minor sod_minor -#define lo_next sod_next - -#define link_map so_map -#define lm_addr som_addr -#define lm_name som_path -#define lm_next som_next -#define lm_lop som_sod -#define lm_lob som_sodbase -#define lm_rwt som_write -#define lm_ld som_dynamic -#define lm_lpd som_spd - -#define link_dynamic_2 section_dispatch_table -#define ld_loaded sdt_loaded -#define ld_need sdt_sods -#define ld_rules sdt_filler1 -#define ld_got sdt_got -#define ld_plt sdt_plt -#define ld_rel sdt_rel -#define ld_hash sdt_hash -#define ld_stab sdt_nzlist -#define ld_stab_hash sdt_filler2 -#define ld_buckets sdt_buckets -#define ld_symbols sdt_strings -#define ld_symb_size sdt_str_sz -#define ld_text sdt_text_sz -#define ld_plt_sz sdt_plt_sz - -#define rtc_symb rt_symbol -#define rtc_sp rt_sp -#define rtc_next rt_next - -#define ld_debug so_debug -#define ldd_version dd_version -#define ldd_in_debugger dd_in_debugger -#define ldd_sym_loaded dd_sym_loaded -#define ldd_bp_addr dd_bpt_addr -#define ldd_bp_inst dd_bpt_shadow -#define ldd_cp dd_cc - -#define link_dynamic _dynamic -#define ld_version d_version -#define ldd d_debug -#define ld_un d_un -#define ld_2 d_sdt - -#endif - -/* Return sizeof user struct to callers in less machine dependent routines */ - -#define KERNEL_U_SIZE kernel_u_size() -extern int kernel_u_size PARAMS ((void)); - -#define ADDITIONAL_OPTIONS \ - {"kernel", no_argument, &kernel_debugging, 1}, \ - {"k", no_argument, &kernel_debugging, 1}, \ - {"wcore", no_argument, &kernel_writablecore, 1}, \ - {"w", no_argument, &kernel_writablecore, 1}, - -#define ADDITIONAL_OPTION_HELP \ - "\ - --kernel Enable kernel debugging.\n\ - --wcore Make core file writable (only works for /dev/mem).\n\ - This option only works while debugging a kernel !!\n\ -" - -extern int kernel_debugging; -extern int kernel_writablecore; - -#define DEFAULT_PROMPT kernel_debugging?"(kgdb) ":"(gdb) " - -/* misuse START_PROGRESS to test whether we're running as kgdb */ -/* START_PROGRESS is called at the top of main */ -#undef START_PROGRESS -#define START_PROGRESS(STR,N) \ - if (!strcmp(STR, "kgdb")) \ - kernel_debugging = 1; - -#include -#include - -#ifdef PT_GETDBREGS -#define TARGET_HAS_HARDWARE_WATCHPOINTS - -extern int can_watch PARAMS((int type, int cnt, int othertype)); -extern int stopped_by_watchpoint PARAMS((void)); -extern int insert_watchpoint PARAMS((int addr, int len, int type)); -extern int remove_watchpoint PARAMS((int addr, int len, int type)); - -#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \ - can_watch(type, cnt, ot) - -/* After a watchpoint trap, the PC points to the instruction after - the one that caused the trap. Therefore we don't need to step over it. - But we do need to reset the status register to avoid another trap. */ -#define HAVE_CONTINUABLE_WATCHPOINT - -#define STOPPED_BY_WATCHPOINT(W) \ - stopped_by_watchpoint() - -/* Use these macros for watchpoint insertion/removal. */ - -#define target_insert_watchpoint(addr, len, type) \ - insert_watchpoint(addr, len, type) - -#define target_remove_watchpoint(addr, len, type) \ - remove_watchpoint(addr, len, type) - -#endif /* PT_GETDBREGS */ - -#endif /* NM_FREEBSD_H */ diff --git a/gnu/usr.bin/binutils/gdb/i386/tm.h b/gnu/usr.bin/binutils/gdb/i386/tm.h deleted file mode 100644 index ac2f86f..0000000 --- a/gnu/usr.bin/binutils/gdb/i386/tm.h +++ /dev/null @@ -1,70 +0,0 @@ -/* $FreeBSD$ */ -/* Target macro definitions for i386 running FreeBSD - Copyright (C) 1997 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef TM_FBSD_H -#define TM_FBSD_H 1 - -#include "i386/tm-i386bsd.h" - -#undef NUM_REGS -#define NUM_REGS 16 - -extern struct frame_info *setup_arbitrary_frame PARAMS ((int, CORE_ADDR *)); - -#define SETUP_ARBITRARY_FRAME(argc, argv) setup_arbitrary_frame (argc, argv) - -extern void i386_float_info PARAMS ((void)); - -#define FLOAT_INFO i386_float_info () - -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) STREQ (name, "_DYNAMIC") - -/* Saved Pc. Get it from sigcontext if within sigtramp. */ - -extern CORE_ADDR fbsd_kern_frame_saved_pc (struct frame_info *); -#undef FRAME_SAVED_PC -#define FRAME_SAVED_PC(FRAME) \ - (kernel_debugging ? fbsd_kern_frame_saved_pc(FRAME) : \ - (((FRAME)->signal_handler_caller \ - ? fbsd_sigtramp_saved_pc (FRAME) \ - : read_memory_integer ((FRAME)->frame + 4, 4)) \ - )) - -/* On FreeBSD, sigtramp has size 0x48 and is immediately below the - ps_strings struct which has size 0x10 and is at the top of the - user stack. */ - -#undef SIGTRAMP_START -#undef SIGTRAMP_END -#define SIGTRAMP_START(pc) 0xbfbfffa8 -#define SIGTRAMP_END(pc) 0xbfbffff0 -#undef SIGCONTEXT_PC_OFFSET -#define OSIGCONTEXT_PC_OFFSET 20 -#define NSIGCONTEXT_PC_OFFSET 76 -#define OSIGCODE_MAGIC_OFFSET 20 - -struct objfile; -void freebsd_uthread_new_objfile PARAMS ((struct objfile *objfile)); -#define target_new_objfile(OBJFILE) freebsd_uthread_new_objfile (OBJFILE) - -extern char *freebsd_uthread_pid_to_str PARAMS ((int pid)); -#define target_pid_to_str(PID) freebsd_uthread_pid_to_str (PID) - -#endif /* ifndef TM_FBSD_H */ diff --git a/gnu/usr.bin/binutils/gdb/i386/xm.h b/gnu/usr.bin/binutils/gdb/i386/xm.h deleted file mode 100644 index 8a852a2..0000000 --- a/gnu/usr.bin/binutils/gdb/i386/xm.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Host-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992 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. */ - -#define HOST_BYTE_ORDER LITTLE_ENDIAN - -#include /* for INT_MIN, to avoid "INT_MIN - redefined" warnings from defs.h */ diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c index a695ab4..3e7f121 100644 --- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c +++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "defs.h" +#include #include #include #include @@ -46,8 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include +#ifdef __i386__ #include +#endif #include + +#if __FreeBSD_version >= 500032 && defined(i386) #define _KERNEL #include #undef _KERNEL @@ -58,7 +63,7 @@ static void kcore_close PARAMS ((int)); static void get_kcore_registers PARAMS ((int)); -static int kcore_xfer_kmem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *)); +static int kcore_xfer_kmem PARAMS ((CORE_ADDR, char *, int, int, struct mem_attrib *attrib, struct target_ops *)); static int xfer_umem PARAMS ((CORE_ADDR, char *, int, int)); @@ -250,7 +255,7 @@ static void kcore_close (quitting) int quitting; { - inferior_pid = 0; /* Avoid confusion from thread stuff */ + inferior_ptid = null_ptid; /* Avoid confusion from thread stuff */ if (core_kd) { @@ -426,11 +431,12 @@ ksym_maxuseraddr() } static int -kcore_xfer_kmem (memaddr, myaddr, len, write, target) +kcore_xfer_kmem (memaddr, myaddr, len, write, attrib, target) CORE_ADDR memaddr; char *myaddr; int len; int write; + struct mem_attrib *attrib; struct target_ops *target; { int ns; @@ -1018,9 +1024,14 @@ kernel_core_file_hook (fd, addr, buf, len) static struct target_ops kcore_ops; +#else +int kernel_debugging = 0; +#endif + void _initialize_kcorelow() { +#if __FreeBSD_version >= 500032 && defined(i386) kcore_ops.to_shortname = "kcore"; kcore_ops.to_longname = "Kernel core dump file"; kcore_ops.to_doc = @@ -1042,4 +1053,5 @@ _initialize_kcorelow() add_target (&kcore_ops); add_com ("proc", class_obscure, set_proc_cmd, "Set current process context"); add_com ("cpu", class_obscure, set_cpu_cmd, "Set current cpu"); +#endif } -- cgit v1.1