From 6259c7e28d3ba78993c89c56eb48d8c0801f372a Mon Sep 17 00:00:00 2001 From: "J.T. Conklin" Date: Wed, 17 Jan 2001 23:07:15 +0000 Subject: [PATCH] * config/m68k/tm-nbsd.h (USE_STRUCT_CONVENTION): Define. * config/m68k/nbsd.mt (TDEPFILES): Add m68knbsd-tdep.o. * m68knbsd-tdep.c: New file. * i386nbsd-tdep.c: Remove #if 0'd out #includes. * m68knbsd-nat.c: #include gdbcore.h. --- gdb/ChangeLog | 10 ++++++++++ gdb/config/m68k/nbsd.mt | 2 +- gdb/config/m68k/tm-nbsd.h | 8 ++++++-- gdb/i386nbsd-tdep.c | 8 -------- gdb/m68knbsd-nat.c | 4 ++-- gdb/m68knbsd-tdep.c | 32 ++++++++++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 gdb/m68knbsd-tdep.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 19cfff74d2f..247497caf79 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2001-01-17 J.T. Conklin + + * config/m68k/tm-nbsd.h (USE_STRUCT_CONVENTION): Define. + * config/m68k/nbsd.mt (TDEPFILES): Add m68knbsd-tdep.o. + * m68knbsd-tdep.c: New file. + + * i386nbsd-tdep.c: Remove #if 0'd out #includes. + + * m68knbsd-nat.c: #include gdbcore.h. + Wed Jan 17 09:41:58 2001 Andrew Cagney * MAINTAINERS: Add J.T. Conklin to Blanket Write Privs. diff --git a/gdb/config/m68k/nbsd.mt b/gdb/config/m68k/nbsd.mt index ce5e4ee3f44..fabc84ba5fb 100644 --- a/gdb/config/m68k/nbsd.mt +++ b/gdb/config/m68k/nbsd.mt @@ -1,5 +1,5 @@ # Target: Motorola m68k running NetBSD -TDEPFILES= m68k-tdep.o solib.o solib-svr4.o +TDEPFILES= m68k-tdep.o m68knbsd-tdep.o solib.o solib-svr4.o TM_FILE= tm-nbsd.h GDBSERVER_DEPFILES= low-nbsd.o diff --git a/gdb/config/m68k/tm-nbsd.h b/gdb/config/m68k/tm-nbsd.h index fa8941755dc..c77027c8cdc 100644 --- a/gdb/config/m68k/tm-nbsd.h +++ b/gdb/config/m68k/tm-nbsd.h @@ -26,8 +26,8 @@ /* Define BPT_VECTOR if it is different than the default. This is the vector number used by traps to indicate a breakpoint. */ - -#define BPT_VECTOR 0x2 +#define BPT_VECTOR 0xf +#define REMOTE_BPT_VECTOR 0xf /* Address of end of stack space. */ #define STACK_END_ADDR USRSTACK @@ -39,4 +39,8 @@ #include "m68k/tm-m68k.h" #include "tm-nbsd.h" +extern use_struct_convention_fn m68knbsd_use_struct_convention; +#define USE_STRUCT_CONVENTION(gcc_p, type) \ + m68knbsd_use_struct_convention(gcc_p, type) + #endif /* TM_NBSD_H */ diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c index 4dfa6272371..18b56059241 100644 --- a/gdb/i386nbsd-tdep.c +++ b/gdb/i386nbsd-tdep.c @@ -21,14 +21,6 @@ #include "defs.h" #include "gdbtypes.h" -#if 0 -#include -#include -#include -#include -#include "inferior.h" -#include "gdbcore.h" /* for registers_fetched() */ -#endif int i386nbsd_use_struct_convention (int gcc_p, struct type *type) diff --git a/gdb/m68knbsd-nat.c b/gdb/m68knbsd-nat.c index 9dc59c0f269..6279f65ef27 100644 --- a/gdb/m68knbsd-nat.c +++ b/gdb/m68knbsd-nat.c @@ -18,13 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "defs.h" #include #include #include #include - -#include "defs.h" #include "inferior.h" +#include "gdbcore.h" void fetch_inferior_registers (int regno) diff --git a/gdb/m68knbsd-tdep.c b/gdb/m68knbsd-tdep.c new file mode 100644 index 00000000000..0b49cac58ee --- /dev/null +++ b/gdb/m68knbsd-tdep.c @@ -0,0 +1,32 @@ +/* Target-dependent code for NetBSD/i386, for GDB. + Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001 + 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 "gdbtypes.h" + +int +m68knbsd_use_struct_convention (int gcc_p, struct type *type) +{ + return !(TYPE_LENGTH (type) == 1 + || TYPE_LENGTH (type) == 2 + || TYPE_LENGTH (type) == 4 + || TYPE_LENGTH (type) == 8); +} -- 2.30.2