From 21ad8dc3de5b5e42eb546ef58ddec70a0bd7a1f7 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 19 Oct 2003 10:39:50 +0000 Subject: [PATCH] * amd64fbsd-nat.c (fetch_inferior_registers, store_inferior_registers): Remove functions. * config/i386/fbsd64.mh (NATDEPFILES): Add amd64bsd-nat.o. --- gdb/ChangeLog | 6 ++++ gdb/amd64fbsd-nat.c | 71 --------------------------------------- gdb/config/i386/fbsd64.mh | 2 +- 3 files changed, 7 insertions(+), 72 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 43f715658d..a2d47ff07c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-10-19 Mark Kettenis + + * amd64fbsd-nat.c (fetch_inferior_registers, + store_inferior_registers): Remove functions. + * config/i386/fbsd64.mh (NATDEPFILES): Add amd64bsd-nat.o. + 2003-10-18 Mark Kettenis Add NetBSD/amd64 native configuration: diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c index 9317108f7f..2354fa361b 100644 --- a/gdb/amd64fbsd-nat.c +++ b/gdb/amd64fbsd-nat.c @@ -141,77 +141,6 @@ fill_fpregset (fpregset_t *fpregsetp, int regnum) { x86_64_fill_fxsave ((char *) fpregsetp, regnum); } - -/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this - for all registers (including the floating point registers). */ - -void -fetch_inferior_registers (int regnum) -{ - if (regnum == -1 || amd64_native_gregset_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - amd64_supply_native_gregset (current_regcache, ®s, -1); - if (regnum != -1) - return; - } - - if (regnum == -1 || regnum >= FP0_REGNUM) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); - - x86_64_supply_fxsave (current_regcache, -1, &fpregs); - } -} - -/* Store register REGNUM back into the inferior. If REGNUM is -1, do - this for all registers (including the floating point registers). */ - -void -store_inferior_registers (int regnum) -{ - if (regnum == -1 || amd64_native_gregset_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); - - amd64_collect_native_gregset (current_regcache, ®s, regnum); - - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); - - if (regnum != -1) - return; - } - - if (regnum == -1 || regnum >= FP0_REGNUM) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); - - x86_64_fill_fxsave ((char *) &fpregs, regnum); - - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); - } -} /* Provide a prototype to silence -Wmissing-prototypes. */ diff --git a/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh index 7e42aaa2cd..af8ac4ed77 100644 --- a/gdb/config/i386/fbsd64.mh +++ b/gdb/config/i386/fbsd64.mh @@ -4,4 +4,4 @@ XM_FILE= xm-i386.h NAT_FILE= nm-fbsd64.h # NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make. -NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o core-regset.o amd64-nat.o amd64fbsd-nat.o gcore.o fbsd-proc.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o core-regset.o amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o gcore.o fbsd-proc.o