/* S390 native-dependent code for GDB, the GNU debugger.
- Copyright (C) 2001-2018 Free Software Foundation, Inc.
+ Copyright (C) 2001-2019 Free Software Foundation, Inc.
Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
for IBM Deutschland Entwicklung GmbH, IBM Corporation.
#include <elf.h>
#include <algorithm>
#include "inf-ptrace.h"
+#include "linux-tdep.h"
/* Per-thread arch-specific data. */
int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *)
override;
int region_ok_for_hw_watchpoint (CORE_ADDR, int) override;
- bool have_continuable_watchpoint () { return 1; }
bool stopped_by_watchpoint () override;
- bool watchpoint_addr_within_range (CORE_ADDR, CORE_ADDR, int) override;
int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
struct expression *) override;
int remove_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
pswa = extract_unsigned_integer ((const gdb_byte *) regp
+ S390_PSWA_OFFSET, 8, byte_order);
store_unsigned_integer (buf, 4, byte_order, (pswm >> 32) | 0x80000);
- regcache_raw_supply (regcache, S390_PSWM_REGNUM, buf);
+ regcache->raw_supply (S390_PSWM_REGNUM, buf);
store_unsigned_integer (buf, 4, byte_order,
(pswa & 0x7fffffff) | (pswm & 0x80000000));
- regcache_raw_supply (regcache, S390_PSWA_REGNUM, buf);
+ regcache->raw_supply (S390_PSWA_REGNUM, buf);
return;
}
#endif
if (regno == -1 || regno == S390_PSWM_REGNUM)
{
pswm &= 0x80000000;
- regcache_raw_collect (regcache, S390_PSWM_REGNUM, buf);
+ regcache->raw_collect (S390_PSWM_REGNUM, buf);
pswm |= (extract_unsigned_integer (buf, 4, byte_order)
& 0xfff7ffff) << 32;
}
if (regno == -1 || regno == S390_PSWA_REGNUM)
{
- regcache_raw_collect (regcache, S390_PSWA_REGNUM, buf);
+ regcache->raw_collect (S390_PSWA_REGNUM, buf);
pswa = extract_unsigned_integer (buf, 4, byte_order);
pswm ^= (pswm ^ pswa) & 0x80000000;
pswa &= 0x7fffffff;
s390_inferior_tid (void)
{
/* GNU/Linux LWP ID's are process ID's. */
- int tid = ptid_get_lwp (inferior_ptid);
+ int tid = inferior_ptid.lwp ();
if (tid == 0)
- tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */
+ tid = inferior_ptid.pid (); /* Not a threaded program. */
return tid;
}
void
s390_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum)
{
- pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
+ pid_t tid = get_ptrace_pid (regcache->ptid ());
if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
fetch_regs (regcache, tid);
void
s390_linux_nat_target::store_registers (struct regcache *regcache, int regnum)
{
- pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
+ pid_t tid = get_ptrace_pid (regcache->ptid ());
if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
store_regs (regcache, tid, regnum);
/* GDB core assumes the child inherits the watchpoints/hw breakpoints of
the parent. So copy the debug state from parent to child. */
- parent_pid = ptid_get_pid (parent->ptid);
+ parent_pid = parent->ptid.pid ();
parent_state = s390_get_debug_reg_state (parent_pid);
child_state = s390_get_debug_reg_state (child_pid);
s390_linux_nat_target::stopped_by_watchpoint ()
{
struct s390_debug_reg_state *state
- = s390_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ = s390_get_debug_reg_state (inferior_ptid.pid ());
per_lowcore_bits per_lowcore;
ptrace_area parea;
s390_linux_nat_target::low_prepare_to_resume (struct lwp_info *lp)
{
int tid;
- pid_t pid = ptid_get_pid (ptid_of_lwp (lp));
+ pid_t pid = ptid_of_lwp (lp).pid ();
per_struct per_info;
ptrace_area parea;
lp_priv->per_info_changed = 0;
- tid = ptid_get_lwp (ptid_of_lwp (lp));
+ tid = ptid_of_lwp (lp).lwp ();
if (tid == 0)
tid = pid;
/* Iterator callback for s390_refresh_per_info. */
static int
-s390_refresh_per_info_cb (struct lwp_info *lp, void *arg)
+s390_refresh_per_info_cb (struct lwp_info *lp)
{
s390_mark_per_info_changed (lp);
static int
s390_refresh_per_info (void)
{
- ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ()));
+ ptid_t pid_ptid = ptid_t (current_lwp_ptid ().pid ());
- iterate_over_lwps (pid_ptid, s390_refresh_per_info_cb, NULL);
+ iterate_over_lwps (pid_ptid, s390_refresh_per_info_cb);
return 0;
}
{
s390_watch_area area;
struct s390_debug_reg_state *state
- = s390_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ = s390_get_debug_reg_state (inferior_ptid.pid ());
area.lo_addr = addr;
area.hi_addr = addr + len - 1;
unsigned ix;
s390_watch_area *area;
struct s390_debug_reg_state *state
- = s390_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ = s390_get_debug_reg_state (inferior_ptid.pid ());
for (ix = 0;
VEC_iterate (s390_watch_area, state->watch_areas, ix, area);
area.lo_addr = bp_tgt->placed_address = bp_tgt->reqstd_address;
area.hi_addr = area.lo_addr;
- state = s390_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ state = s390_get_debug_reg_state (inferior_ptid.pid ());
VEC_safe_push (s390_watch_area, state->break_areas, &area);
return s390_refresh_per_info ();
struct watch_area *area;
struct s390_debug_reg_state *state;
- state = s390_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ state = s390_get_debug_reg_state (inferior_ptid.pid ());
for (ix = 0;
VEC_iterate (s390_watch_area, state->break_areas, ix, area);
ix++)
that mode, report s390 architecture with 64-bit GPRs. */
#ifdef __s390x__
{
- CORE_ADDR hwcap = 0;
+ CORE_ADDR hwcap = linux_get_hwcap (current_top_target ());
- target_auxv_search (target_stack, AT_HWCAP, &hwcap);
have_regset_tdb = (hwcap & HWCAP_S390_TE)
&& check_regset (tid, NT_S390_TDB, s390_sizeof_tdbregset);
void
_initialize_s390_nat (void)
{
- struct target_ops *t = &the_s390_linux_nat_target;
-
/* Register the target. */
linux_target = &the_s390_linux_nat_target;
- add_target (t);
+ add_inf_child_target (&the_s390_linux_nat_target);
/* A maintenance command to enable showing the PER state. */
add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
projects / deliverable / binutils-gdb.git / blobdiff