/* Target-dependent code for GNU/Linux on Nios II.
- Copyright (C) 2012-2016 Free Software Foundation, Inc.
+ Copyright (C) 2012-2020 Free Software Foundation, Inc.
Contributed by Mentor Graphics, Inc.
This file is part of GDB.
#include "linux-tdep.h"
#include "glibc-tdep.h"
#include "nios2-tdep.h"
-
-#include "features/nios2-linux.c"
+#include "gdbarch.h"
/* Core file and register set support. */
if (regnum == -1 || regnum == regno)
{
if (reg_offsets[regno] != -1)
- regcache_raw_supply (regcache, regno,
- gregs + 4 * reg_offsets[regno]);
+ regcache->raw_supply (regno, gregs + 4 * reg_offsets[regno]);
else
- regcache_raw_supply (regcache, regno, zero_buf);
+ regcache->raw_supply (regno, zero_buf);
}
}
if (regnum == -1 || regnum == regno)
{
if (reg_offsets[regno] != -1)
- regcache_raw_collect (regcache, regno,
- gregs + 4 * reg_offsets[regno]);
+ regcache->raw_collect (regno, gregs + 4 * reg_offsets[regno]);
}
}
void *cb_data,
const struct regcache *regcache)
{
- cb (".reg", NIOS2_GREGS_SIZE, &nios2_core_regset, NULL, cb_data);
+ cb (".reg", NIOS2_GREGS_SIZE, NIOS2_GREGS_SIZE, &nios2_core_regset, NULL,
+ cb_data);
}
/* Initialize a trad-frame cache corresponding to the tramp-frame.
SIGTRAMP_FRAME,
4,
{
- { MATCH_R1_MOVI | SET_IW_I_B (2) | SET_IW_I_IMM16 (139), -1 },
- { MATCH_R1_TRAP | SET_IW_R_IMM5 (0), -1},
+ { MATCH_R1_MOVI | SET_IW_I_B (2) | SET_IW_I_IMM16 (139), ULONGEST_MAX },
+ { MATCH_R1_TRAP | SET_IW_R_IMM5 (0), ULONGEST_MAX},
{ TRAMP_SENTINEL_INSN }
},
nios2_linux_rt_sigreturn_init
SIGTRAMP_FRAME,
4,
{
- { MATCH_R2_MOVI | SET_IW_F2I16_B (2) | SET_IW_F2I16_IMM16 (139), -1 },
- { MATCH_R2_TRAP | SET_IW_X2L5_IMM5 (0), -1},
+ { MATCH_R2_MOVI | SET_IW_F2I16_B (2) | SET_IW_F2I16_IMM16 (139), ULONGEST_MAX },
+ { MATCH_R2_TRAP | SET_IW_X2L5_IMM5 (0), ULONGEST_MAX},
{ TRAMP_SENTINEL_INSN }
},
nios2_linux_rt_sigreturn_init
return pc + op->size;
}
+/* Return true if PC is a kernel helper, a function mapped by the kernel
+ into user space on an unwritable page. Currently the only such function
+ is __kuser_cmpxchg at 0x1004. See arch/nios2/kernel/entry.S in the Linux
+ kernel sources and sysdeps/unix/sysv/linux/nios2/atomic-machine.h in
+ GLIBC. */
+static bool
+nios2_linux_is_kernel_helper (CORE_ADDR pc)
+{
+ return pc == 0x1004;
+}
+
/* Hook function for gdbarch_register_osabi. */
static void
&nios2_r1_linux_rt_sigreturn_tramp_frame);
tdep->syscall_next_pc = nios2_linux_syscall_next_pc;
+ tdep->is_kernel_helper = nios2_linux_is_kernel_helper;
/* Index of target address word in glibc jmp_buf. */
tdep->jb_pc = 10;
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-
-extern initialize_file_ftype _initialize_nios2_linux_tdep;
-
+void _initialize_nios2_linux_tdep ();
void
-_initialize_nios2_linux_tdep (void)
+_initialize_nios2_linux_tdep ()
{
const struct bfd_arch_info *arch_info;
arch_info = arch_info->next)
gdbarch_register_osabi (bfd_arch_nios2, arch_info->mach,
GDB_OSABI_LINUX, nios2_linux_init_abi);
-
- initialize_tdesc_nios2_linux ();
}