From 9418f048b53e5afb8fa000bbb410e92c7eacd084 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 12 Apr 2007 23:03:00 +0000 Subject: [PATCH] * config/m68k/tm-monitor.h: Delete file. * config/m68k/monitor.mt (DEPRECATED_TM_FILE): Remove. * m68k-tdep.c (m68k_gdbarch_init): set_gdbarch_decr_pc_after_break call moved to ... * m68kbsd-tdep.c (m68kbsd_init_abi): ... here and ... * m68klinux-tdep.c (m68k_linux_init_abi): ... here. --- gdb/ChangeLog | 9 +++++++++ gdb/config/m68k/monitor.mt | 1 - gdb/config/m68k/tm-monitor.h | 39 --------------------------------------- gdb/m68k-tdep.c | 1 - gdb/m68kbsd-tdep.c | 2 ++ gdb/m68klinux-tdep.c | 2 ++ 6 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 gdb/config/m68k/tm-monitor.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f0c2734..e04950c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2007-04-12 Ulrich Weigand + + * config/m68k/tm-monitor.h: Delete file. + * config/m68k/monitor.mt (DEPRECATED_TM_FILE): Remove. + * m68k-tdep.c (m68k_gdbarch_init): set_gdbarch_decr_pc_after_break + call moved to ... + * m68kbsd-tdep.c (m68kbsd_init_abi): ... here and ... + * m68klinux-tdep.c (m68k_linux_init_abi): ... here. + 2007-04-12 Luis Machado * gdbarch.sh (software_single_step): Change the return type diff --git a/gdb/config/m68k/monitor.mt b/gdb/config/m68k/monitor.mt index 1ea8faf..2008cee 100644 --- a/gdb/config/m68k/monitor.mt +++ b/gdb/config/m68k/monitor.mt @@ -1,3 +1,2 @@ # Target: Motorola m68k embedded (e.g. bug monitors) TDEPFILES= m68k-tdep.o monitor.o dbug-rom.o dsrec.o -DEPRECATED_TM_FILE= tm-monitor.h diff --git a/gdb/config/m68k/tm-monitor.h b/gdb/config/m68k/tm-monitor.h deleted file mode 100644 index 7ae6cec..0000000 --- a/gdb/config/m68k/tm-monitor.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Target machine definitions for a generic m68k monitor/emulator. - Copyright 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1998, 1999, 2003, 2007 - 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. */ - -/* The definitions here are appropriate for several embedded m68k-based - targets, including IDP (rom68k), BCC (cpu32bug), and EST's emulator. */ - -/* GCC is probably the only compiler used on this configuration. So - get this right even if the code which detects gcc2_compiled. is - still broken. */ - -#define BELIEVE_PCC_PROMOTION 1 - -/* The target system handles breakpoints. */ - -#define DECR_PC_AFTER_BREAK 0 - -/* No float registers. */ - -/*#define NUM_REGS 18 */ - -/* FIXME, should do GET_LONGJMP_TARGET for newlib. */ diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 90cb169..3e9ad8d 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1168,7 +1168,6 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_align (gdbarch, m68k_frame_align); set_gdbarch_believe_pcc_promotion (gdbarch, 1); - set_gdbarch_decr_pc_after_break (gdbarch, 2); set_gdbarch_frame_args_skip (gdbarch, 8); set_gdbarch_dwarf_reg_to_regnum (gdbarch, m68k_dwarf_reg_to_regnum); diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68kbsd-tdep.c index 88b2d2f..01208e5 100644 --- a/gdb/m68kbsd-tdep.c +++ b/gdb/m68kbsd-tdep.c @@ -193,6 +193,8 @@ m68kbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->jb_pc = 5; tdep->jb_elt_size = 4; + set_gdbarch_decr_pc_after_break (gdbarch, 2); + set_gdbarch_regset_from_core_section (gdbarch, m68kbsd_regset_from_core_section); } diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c index a99acc9..4252ecd 100644 --- a/gdb/m68klinux-tdep.c +++ b/gdb/m68klinux-tdep.c @@ -294,6 +294,8 @@ m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->struct_value_regnum = M68K_A1_REGNUM; tdep->struct_return = reg_struct_return; + set_gdbarch_decr_pc_after_break (gdbarch, 2); + frame_unwind_append_sniffer (gdbarch, m68k_linux_sigtramp_frame_sniffer); /* Shared library handling. */ -- 2.7.4