X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fm68k-bsd-tdep.c;h=f18f33dc7e4dbe51aa489e32e5541292b906959b;hb=a350efd4fb368a35ada608f6bc26ccd3bed0ae6b;hp=0d2a4e9577f8512a7e739608f8699d8236c068e0;hpb=03b62bbbce3dc5f15131d9e78f77d035cd1cffb3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m68k-bsd-tdep.c b/gdb/m68k-bsd-tdep.c index 0d2a4e9577..f18f33dc7e 100644 --- a/gdb/m68k-bsd-tdep.c +++ b/gdb/m68k-bsd-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for Motorola 68000 BSD's. - Copyright (C) 2004-2016 Free Software Foundation, Inc. + Copyright (C) 2004-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -58,7 +58,7 @@ m68kbsd_supply_fpregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *fpregs, size_t len) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); const gdb_byte *regs = (const gdb_byte *) fpregs; int i; @@ -67,8 +67,7 @@ m68kbsd_supply_fpregset (const struct regset *regset, for (i = M68K_FP0_REGNUM; i <= M68K_PC_REGNUM; i++) { if (regnum == i || regnum == -1) - regcache_raw_supply (regcache, i, - regs + m68kbsd_fpreg_offset (gdbarch, i)); + regcache->raw_supply (i, regs + m68kbsd_fpreg_offset (gdbarch, i)); } } @@ -89,7 +88,7 @@ m68kbsd_supply_gregset (const struct regset *regset, for (i = M68K_D0_REGNUM; i <= M68K_PC_REGNUM; i++) { if (regnum == i || regnum == -1) - regcache_raw_supply (regcache, i, regs + i * 4); + regcache->raw_supply (i, regs + i * 4); } if (len >= M68KBSD_SIZEOF_GREGS + M68KBSD_SIZEOF_FPREGS) @@ -124,65 +123,13 @@ m68kbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, void *cb_data, const struct regcache *regcache) { - cb (".reg", M68KBSD_SIZEOF_GREGS, &m68kbsd_gregset, NULL, cb_data); - cb (".reg2", M68KBSD_SIZEOF_FPREGS, &m68kbsd_fpregset, NULL, cb_data); + cb (".reg", M68KBSD_SIZEOF_GREGS, M68KBSD_SIZEOF_GREGS, &m68kbsd_gregset, + NULL, cb_data); + cb (".reg2", M68KBSD_SIZEOF_FPREGS, M68KBSD_SIZEOF_FPREGS, &m68kbsd_fpregset, + NULL, cb_data); } -/* Signal trampolines. */ - -static void -m68kobsd_sigtramp_cache_init (const struct tramp_frame *self, - struct frame_info *this_frame, - struct trad_frame_cache *this_cache, - CORE_ADDR func) -{ - CORE_ADDR addr, base, pc; - int regnum; - - base = get_frame_register_unsigned (this_frame, M68K_SP_REGNUM); - - /* The 'addql #4,%sp' instruction at offset 8 adjusts the stack - pointer. Adjust the frame base accordingly. */ - pc = get_frame_register_unsigned (this_frame, M68K_PC_REGNUM); - if ((pc - func) > 8) - base -= 4; - - /* Get frame pointer, stack pointer, program counter and processor - state from `struct sigcontext'. */ - addr = get_frame_memory_unsigned (this_frame, base + 8, 4); - trad_frame_set_reg_addr (this_cache, M68K_FP_REGNUM, addr + 8); - trad_frame_set_reg_addr (this_cache, M68K_SP_REGNUM, addr + 12); - trad_frame_set_reg_addr (this_cache, M68K_PC_REGNUM, addr + 20); - trad_frame_set_reg_addr (this_cache, M68K_PS_REGNUM, addr + 24); - - /* The sc_ap member of `struct sigcontext' points to additional - hardware state. Here we find the missing registers. */ - addr = get_frame_memory_unsigned (this_frame, addr + 16, 4) + 4; - for (regnum = M68K_D0_REGNUM; regnum < M68K_FP_REGNUM; regnum++, addr += 4) - trad_frame_set_reg_addr (this_cache, regnum, addr); - - /* Construct the frame ID using the function start. */ - trad_frame_set_id (this_cache, frame_id_build (base, func)); -} - -static const struct tramp_frame m68kobsd_sigtramp = { - SIGTRAMP_FRAME, - 2, - { - { 0x206f, -1 }, { 0x000c, -1}, /* moveal %sp@(12),%a0 */ - { 0x4e90, -1 }, /* jsr %a0@ */ - { 0x588f, -1 }, /* addql #4,%sp */ - { 0x4e41, -1 }, /* trap #1 */ - { 0x2f40, -1 }, { 0x0004, -1 }, /* moveal %d0,%sp@(4) */ - { 0x7001, -1 }, /* moveq #SYS_exit,%d0 */ - { 0x4e40, -1 }, /* trap #0 */ - { TRAMP_SENTINEL_INSN, -1 } - }, - m68kobsd_sigtramp_cache_init -}; - - static void m68kbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -195,30 +142,6 @@ m68kbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_iterate_over_regset_sections (gdbarch, m68kbsd_iterate_over_regset_sections); -} - -/* OpenBSD and NetBSD a.out. */ - -static void -m68kbsd_aout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -{ - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - - m68kbsd_init_abi (info, gdbarch); - - tdep->struct_return = reg_struct_return; - - tramp_frame_prepend_unwinder (gdbarch, &m68kobsd_sigtramp); -} - -/* NetBSD ELF. */ - -static void -m68kbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -{ - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - - m68kbsd_init_abi (info, gdbarch); /* NetBSD ELF uses the SVR4 ABI. */ m68k_svr4_init_abi (info, gdbarch); @@ -228,43 +151,11 @@ m68kbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_solib_svr4_fetch_link_map_offsets (gdbarch, svr4_ilp32_fetch_link_map_offsets); } - - -static enum gdb_osabi -m68kbsd_aout_osabi_sniffer (bfd *abfd) -{ - if (strcmp (bfd_get_target (abfd), "a.out-m68k-netbsd") == 0 - || strcmp (bfd_get_target (abfd), "a.out-m68k4k-netbsd") == 0) - return GDB_OSABI_NETBSD_AOUT; - - return GDB_OSABI_UNKNOWN; -} - -static enum gdb_osabi -m68kbsd_core_osabi_sniffer (bfd *abfd) -{ - if (strcmp (bfd_get_target (abfd), "netbsd-core") == 0) - return GDB_OSABI_NETBSD_AOUT; - - return GDB_OSABI_UNKNOWN; -} - - -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_m68kbsd_tdep (void); +void _initialize_m68kbsd_tdep (); void -_initialize_m68kbsd_tdep (void) +_initialize_m68kbsd_tdep () { - gdbarch_register_osabi_sniffer (bfd_arch_m68k, bfd_target_aout_flavour, - m68kbsd_aout_osabi_sniffer); - - /* BFD doesn't set a flavour for NetBSD style a.out core files. */ - gdbarch_register_osabi_sniffer (bfd_arch_m68k, bfd_target_unknown_flavour, - m68kbsd_core_osabi_sniffer); - - gdbarch_register_osabi (bfd_arch_m68k, 0, GDB_OSABI_NETBSD_AOUT, - m68kbsd_aout_init_abi); - gdbarch_register_osabi (bfd_arch_m68k, 0, GDB_OSABI_NETBSD_ELF, - m68kbsd_elf_init_abi); + gdbarch_register_osabi (bfd_arch_m68k, 0, GDB_OSABI_NETBSD, + m68kbsd_init_abi); }