diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/amd64-windows-nat.c | 92 | ||||
| -rw-r--r-- | gdb/amd64-windows-tdep.c | 41 | ||||
| -rw-r--r-- | gdb/config/djgpp/fnchange.lst | 2 | ||||
| -rw-r--r-- | gdb/config/i386/mingw64.mh | 2 | ||||
| -rw-r--r-- | gdb/config/i386/nm-cygwin64.h | 36 | ||||
| -rw-r--r-- | gdb/configure.host | 4 | ||||
| -rw-r--r-- | gdb/configure.tgt | 6 |
8 files changed, 190 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6b719e..17712e4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2009-10-11 Joel Brobecker <brobecker@adacore.com> + * amd64-windows-nat.c, amd64-windows-tdep.c: New files. + * config/i386/mingw64.mh, config/i386/nm-cygwin64.h: New files. + * configure.host, configure.tgt: Add handling for x86_64/windows. + * config/djgpp/fnchange.lst: Add entries for amd64-windows-nat.c + and amd64-windows-tdep.c. + +2009-10-11 Joel Brobecker <brobecker@adacore.com> + * win32-tdep.h, win32-tdep.c: New files. * i386-cygwin-tdep.h: Delete. * i386-cygwin-tdep.c: Include win32-tdep.h instead of diff --git a/gdb/amd64-windows-nat.c b/gdb/amd64-windows-nat.c new file mode 100644 index 0000000..88815a9 --- /dev/null +++ b/gdb/amd64-windows-nat.c @@ -0,0 +1,92 @@ +/* Copyright (C) 2008, 2009 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 3 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, see <http://www.gnu.org/licenses/>. */ + +#include "defs.h" +#include "win32-nat.h" + +#include <windows.h> + +#define context_offset(x) (offsetof (CONTEXT, x)) +static const int mappings[] = +{ + context_offset (Rax), + context_offset (Rbx), + context_offset (Rcx), + context_offset (Rdx), + context_offset (Rsi), + context_offset (Rdi), + context_offset (Rbp), + context_offset (Rsp), + context_offset (R8), + context_offset (R9), + context_offset (R10), + context_offset (R11), + context_offset (R12), + context_offset (R13), + context_offset (R14), + context_offset (R15), + context_offset (Rip), + context_offset (EFlags), + context_offset (SegCs), + context_offset (SegSs), + context_offset (SegDs), + context_offset (SegEs), + context_offset (SegFs), + context_offset (SegGs), + context_offset (FloatSave.FloatRegisters[0]), + context_offset (FloatSave.FloatRegisters[1]), + context_offset (FloatSave.FloatRegisters[2]), + context_offset (FloatSave.FloatRegisters[3]), + context_offset (FloatSave.FloatRegisters[4]), + context_offset (FloatSave.FloatRegisters[5]), + context_offset (FloatSave.FloatRegisters[6]), + context_offset (FloatSave.FloatRegisters[7]), + context_offset (FloatSave.ControlWord), + context_offset (FloatSave.StatusWord), + context_offset (FloatSave.TagWord), + context_offset (FloatSave.ErrorSelector), + context_offset (FloatSave.ErrorOffset), + context_offset (FloatSave.DataSelector), + context_offset (FloatSave.DataOffset), + context_offset (FloatSave.ErrorSelector) + /* XMM0-7 */ , + context_offset (Xmm0), + context_offset (Xmm1), + context_offset (Xmm2), + context_offset (Xmm3), + context_offset (Xmm4), + context_offset (Xmm5), + context_offset (Xmm6), + context_offset (Xmm7), + context_offset (Xmm8), + context_offset (Xmm9), + context_offset (Xmm10), + context_offset (Xmm11), + context_offset (Xmm12), + context_offset (Xmm13), + context_offset (Xmm14), + context_offset (Xmm15), + /* MXCSR */ + context_offset (FloatSave.MxCsr) +}; +#undef context_offset + +void +_initialize_amd64_windows_nat (void) +{ + win32_set_context_register_offsets (mappings); +} diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c new file mode 100644 index 0000000..fc224a8 --- /dev/null +++ b/gdb/amd64-windows-tdep.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>. */ + +#include "defs.h" +#include "osabi.h" +#include "amd64-tdep.h" +#include "solib.h" +#include "solib-target.h" + +static void +amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + amd64_init_abi (info, gdbarch); + + /* On Windows, "long"s are only 32bit. */ + set_gdbarch_long_bit (gdbarch, 32); + + set_solib_ops (gdbarch, &solib_target_so_ops); +} + +void +_initialize_amd64_windows_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, GDB_OSABI_CYGWIN, + amd64_windows_init_abi); +} + diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst index 70c2327..cf19ca5 100644 --- a/gdb/config/djgpp/fnchange.lst +++ b/gdb/config/djgpp/fnchange.lst @@ -83,6 +83,8 @@ @V@/gdb/ChangeLog-2008 @V@/gdb/ChangeLog.008 @V@/gdb/ChangeLog-3.x @V@/gdb/ChangeLog.3-x @V@/gdb/ada-exp.tab.c @V@/gdb/ada-exp_tab.c +@V@/gdb/amd64-windows-nat.c @V@/gdb/a64w-nat.c +@V@/gdb/amd64-windows-tdep.c @V@/gdb/a64w-tdep.c @V@/gdb/amd64fbsd-nat.c @V@/gdb/a64fb-nat.c @V@/gdb/amd64fbsd-tdep.c @V@/gdb/a64fb-tdep.c @V@/gdb/amd64nbsd-nat.c @V@/gdb/a64nb-nat.c diff --git a/gdb/config/i386/mingw64.mh b/gdb/config/i386/mingw64.mh new file mode 100644 index 0000000..6da61e5 --- /dev/null +++ b/gdb/config/i386/mingw64.mh @@ -0,0 +1,2 @@ +NATDEPFILES= i386-nat.o win32-nat.o amd64-windows-nat.o +NAT_FILE=nm-cygwin64.h diff --git a/gdb/config/i386/nm-cygwin64.h b/gdb/config/i386/nm-cygwin64.h new file mode 100644 index 0000000..71b2682 --- /dev/null +++ b/gdb/config/i386/nm-cygwin64.h @@ -0,0 +1,36 @@ +/* Copyright 2008, 2009 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 3 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, see <http://www.gnu.org/licenses/>. */ + +#define ADD_SHARED_SYMBOL_FILES dll_symbol_command +void dll_symbol_command (char *, int); + +#define I386_USE_GENERIC_WATCHPOINTS + +#include "i386/nm-i386.h" + +/* Support for hardware-assisted breakpoints and watchpoints. */ + +#define I386_DR_LOW_SET_CONTROL(VAL) cygwin_set_dr7 (VAL) +extern void cygwin_set_dr7 (unsigned); + +#define I386_DR_LOW_SET_ADDR(N,ADDR) cygwin_set_dr (N,ADDR) +extern void cygwin_set_dr (int, CORE_ADDR); + +#define I386_DR_LOW_RESET_ADDR(N) + +#define I386_DR_LOW_GET_STATUS() cygwin_get_dr6 () +extern unsigned cygwin_get_dr6 (void); diff --git a/gdb/configure.host b/gdb/configure.host index b9ed7ae..1d6218f 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -171,7 +171,9 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu) gdb_host=nbsd64 ;; x86_64-*-openbsd*) gdb_host=obsd64 ;; - +x86_64-*-mingw*) gdb_host=mingw64 + gdb_host_obs=mingw-hdep.o + ;; m32r*-*-linux*) gdb_host=linux ;; xtensa*-*-linux*) gdb_host=linux ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index f2b8ffb..f5a4357 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -522,6 +522,12 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \ bsd-uthread.o corelow.o solib.o solib-svr4.o" ;; +x86_64-*-mingw*) + # Target: MingW/amd64 + gdb_target_obs="amd64-tdep.o amd64-windows-tdep.o \ + i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \ + solib-target.o win32-tdep.o" + ;; x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu) # Target: NetBSD/amd64 gdb_target_obs="amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o \ |