From d39fdc61d86ddb43fff4e1e8d6408d0346439536 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 8 May 2004 16:10:07 +0000 Subject: [PATCH] * delta68-nat.c: Remove file. * m68k-tdep.c (delta68_in_sigtramp, delta68_frame_args_address) (delta68_frame_saved_pc, delta68_frame_num_args): Remove functions. * Makefile.in (ALLDEPFILES): Remove delta68-nat.c. (delta68-nat.o): Remove dependency. --- gdb/ChangeLog | 6 ++++ gdb/Makefile.in | 3 +- gdb/delta68-nat.c | 90 ----------------------------------------------- gdb/m68k-tdep.c | 56 ----------------------------- 4 files changed, 7 insertions(+), 148 deletions(-) delete mode 100644 gdb/delta68-nat.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b332c70778..a5e77c5f2b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-05-08 Mark Kettenis + * delta68-nat.c: Remove file. + * m68k-tdep.c (delta68_in_sigtramp, delta68_frame_args_address) + (delta68_frame_saved_pc, delta68_frame_num_args): Remove functions. + * Makefile.in (ALLDEPFILES): Remove delta68-nat.c. + (delta68-nat.o): Remove dependency. + * m68k-tdep.c (m68k_frameless_function_invocation): Remove function. (m68k_gdbarch_init): Don't set diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9e66d735635..7ea6b7a6241 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1324,7 +1324,7 @@ ALLDEPFILES = \ avr-tdep.c \ coff-solib.c \ core-regset.c core-aout.c corelow.c \ - dcache.c delta68-nat.c dpx2-nat.c exec.c fork-child.c \ + dcache.c dpx2-nat.c exec.c fork-child.c \ glibc-tdep.c \ go32-nat.c h8300-tdep.c \ hppa-tdep.c hppa-hpux-tdep.c \ @@ -1698,7 +1698,6 @@ dbxread.o: dbxread.c $(defs_h) $(gdb_string_h) $(gdb_obstack_h) \ $(cp_abi_h) $(gdb_assert_h) $(aout_aout64_h) $(aout_stab_gnu_h) dcache.o: dcache.c $(defs_h) $(dcache_h) $(gdbcmd_h) $(gdb_string_h) \ $(gdbcore_h) $(target_h) -delta68-nat.o: delta68-nat.c $(defs_h) demangle.o: demangle.c $(defs_h) $(command_h) $(gdbcmd_h) $(demangle_h) \ $(gdb_string_h) dictionary.o: dictionary.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ diff --git a/gdb/delta68-nat.c b/gdb/delta68-nat.c deleted file mode 100644 index e74a51bf048..00000000000 --- a/gdb/delta68-nat.c +++ /dev/null @@ -1,90 +0,0 @@ -/* Functions specific to running gdb native on a Motorola Delta Series sysV68. - Copyright 1993, 1996, 1998, 2000 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 /* for MAXSIG in sys/user.h */ -#include /* for ushort in sys/dir.h */ -#include /* for struct direct in sys/user.h */ -#include - -#include - -#if !defined (offsetof) -#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) -#endif - -/* Return the address in the core dump or inferior of register REGNO. - BLOCKEND is the address of the end of the user structure. */ - -CORE_ADDR -register_addr (int regno, CORE_ADDR blockend) -{ - static int sysv68reg[] = - {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1, 15, 16}; - - if (regno >= 0 && regno < sizeof (sysv68reg) / sizeof (sysv68reg[0])) - return blockend + sysv68reg[regno] * 4; - else if (regno < FPC_REGNUM) - return offsetof (struct user, u_fpu.regs.reg[regno - FP0_REGNUM][0]); - else if (regno == FPC_REGNUM) - return offsetof (struct user, u_fpu.regs.control); - else if (regno == FPS_REGNUM) - return offsetof (struct user, u_fpu.regs.status); - else if (regno == FPI_REGNUM) - return offsetof (struct user, u_fpu.regs.iaddr); - else - { - fprintf_unfiltered (gdb_stderr, "\ -Internal error: invalid register number %d in REGISTER_U_ADDR\n", - regno); - return blockend; - } -} - -CORE_ADDR kernel_u_addr; - -/* Read the value of the u area from the kernel. */ -void -_initialize_delta68_nat (void) -{ - struct nlist nl[2]; - - nl[0].n_name = "u"; - nl[1].n_name = NULL; - if (nlist ("/sysV68", nl) == 0 && nl[0].n_scnum != 0) - kernel_u_addr = nl[0].n_value; - else - { - perror ("Cannot get kernel u area address"); - exit (1); - } -} - -clear_insn_cache (void) -{ -#ifdef MCT_TEXT /* in sys/signal.h on sysV68 R3V7.1 */ - memctl (0, 4096, MCT_TEXT); -#endif -} - -kernel_u_size (void) -{ - return sizeof (struct user); -} diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index aab2c33ec53..d860cfb8ebc 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -327,62 +327,6 @@ m68k_svr4_return_value (struct gdbarch *gdbarch, struct type *type, return RETURN_VALUE_REGISTER_CONVENTION; } -int -delta68_in_sigtramp (CORE_ADDR pc, char *name) -{ - if (name != NULL) - return strcmp (name, "_sigcode") == 0; - else - return 0; -} - -CORE_ADDR -delta68_frame_args_address (struct frame_info *frame_info) -{ - /* we assume here that the only frameless functions are the system calls - or other functions who do not put anything on the stack. */ - if (get_frame_type (frame_info) == SIGTRAMP_FRAME) - return get_frame_base (frame_info) + 12; - else if (legacy_frameless_look_for_prologue (frame_info)) - { - /* Check for an interrupted system call */ - if (get_next_frame (frame_info) && (get_frame_type (get_next_frame (frame_info)) == SIGTRAMP_FRAME)) - return get_frame_base (get_next_frame (frame_info)) + 16; - else - return get_frame_base (frame_info) + 4; - } - else - return get_frame_base (frame_info); -} - -CORE_ADDR -delta68_frame_saved_pc (struct frame_info *frame_info) -{ - return read_memory_unsigned_integer (delta68_frame_args_address (frame_info) - + 4, 4); -} - -int -delta68_frame_num_args (struct frame_info *fi) -{ - int val; - CORE_ADDR pc = DEPRECATED_FRAME_SAVED_PC (fi); - int insn = read_memory_unsigned_integer (pc, 2); - val = 0; - if (insn == 0047757 || insn == 0157374) /* lea W(sp),sp or addaw #W,sp */ - val = read_memory_integer (pc + 2, 2); - else if ((insn & 0170777) == 0050217 /* addql #N, sp */ - || (insn & 0170777) == 0050117) /* addqw */ - { - val = (insn >> 9) & 7; - if (val == 0) - val = 8; - } - else if (insn == 0157774) /* addal #WW, sp */ - val = read_memory_integer (pc + 2, 4); - val >>= 2; - return val; -} static CORE_ADDR m68k_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, -- 2.30.2