From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7051 invoked by alias); 12 Apr 2007 23:05:35 -0000 Received: (qmail 7041 invoked by uid 22791); 12 Apr 2007 23:05:35 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.29.150) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 13 Apr 2007 00:05:32 +0100 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.8/8.13.8) with ESMTP id l3CN5Td9118838 for ; Thu, 12 Apr 2007 23:05:29 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.3) with ESMTP id l3CN5SRJ4141246 for ; Fri, 13 Apr 2007 01:05:28 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l3CN5SJV032299 for ; Fri, 13 Apr 2007 01:05:28 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id l3CN5S9S032295 for ; Fri, 13 Apr 2007 01:05:28 +0200 Message-Id: <200704122305.l3CN5S9S032295@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 13 Apr 2007 01:05:28 +0200 Subject: [commit] Remove config/m68k/tm-monitor.h To: gdb-patches@sourceware.org Date: Thu, 12 Apr 2007 23:05:00 -0000 From: "Ulrich Weigand" X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-04/txt/msg00183.txt.bz2 Hello, this patch removes the last remaining m68k TM file, tm-monitor.h. The file contained two definitions: #define BELIEVE_PCC_PROMOTION 1 is superfluous anyway due to the set_gdbarch_believe_pcc_promotion (gdbarch, 1); call in m68k_gdbarch_init. #define DECR_PC_AFTER_BREAK 0 *does* change the default behaviour of set_gdbarch_decr_pc_after_break (gdbarch, 2); set in m68k_gdbarch_init. That default is used for the Linux and *BSD targets. The patch moves the call from m68k_gdbarch_init to m68kbsd_init_abi and m68k_linux_init_abi. Then, the #define becomes superfluous as well. The patch should not change the behaviour on any m68k target. Tested by making sure m68k-elf, m68k-linux, and m68k-netbsd cross-GDBs still build. Committed to mainline. Bye, Ulrich ChangeLog: * 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. diff -urNp gdb-orig/gdb/config/m68k/monitor.mt gdb-head/gdb/config/m68k/monitor.mt --- gdb-orig/gdb/config/m68k/monitor.mt 2007-03-29 23:18:07.855028000 +0200 +++ gdb-head/gdb/config/m68k/monitor.mt 2007-03-29 23:20:44.551039144 +0200 @@ -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 -urNp gdb-orig/gdb/config/m68k/tm-monitor.h gdb-head/gdb/config/m68k/tm-monitor.h --- gdb-orig/gdb/config/m68k/tm-monitor.h 2007-03-29 23:18:18.043077000 +0200 +++ gdb-head/gdb/config/m68k/tm-monitor.h 1970-01-01 01:00:00.000000000 +0100 @@ -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 -urNp gdb-orig/gdb/m68kbsd-tdep.c gdb-head/gdb/m68kbsd-tdep.c --- gdb-orig/gdb/m68kbsd-tdep.c 2007-03-29 23:18:07.847029000 +0200 +++ gdb-head/gdb/m68kbsd-tdep.c 2007-03-29 23:20:44.542040512 +0200 @@ -193,6 +193,8 @@ m68kbsd_init_abi (struct gdbarch_info in 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 -urNp gdb-orig/gdb/m68klinux-tdep.c gdb-head/gdb/m68klinux-tdep.c --- gdb-orig/gdb/m68klinux-tdep.c 2007-03-29 23:18:07.851029000 +0200 +++ gdb-head/gdb/m68klinux-tdep.c 2007-03-29 23:20:44.546039904 +0200 @@ -294,6 +294,8 @@ m68k_linux_init_abi (struct gdbarch_info 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. */ diff -urNp gdb-orig/gdb/m68k-tdep.c gdb-head/gdb/m68k-tdep.c --- gdb-orig/gdb/m68k-tdep.c 2007-03-29 23:18:07.803036000 +0200 +++ gdb-head/gdb/m68k-tdep.c 2007-03-29 23:20:44.501046744 +0200 @@ -1168,7 +1168,6 @@ m68k_gdbarch_init (struct gdbarch_info i 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); -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com