[PATCH 2/8] gdb/s390: Fill write_guessed_tracepoint_pc hook.

Marcin Kościelnicki
2016-01-24T12:12:31Z

gdb/ChangeLog:

* s390-linux-tdep.c (s390_write_guessed_tracepoint_pc): New function.
(s390_gdbarch_init): Fill write_guessed_tracepoint_pc hook.
---
gdb/ChangeLog | 5 +++++
gdb/s390-linux-tdep.c | 17 +++++++++++++++++
2 files changed, 22 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 983a243..9e92ae3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-01-24 Marcin KoÅ›cielnicki <koriakin@0x04.net>

+ * s390-linux-tdep.c (s390_write_guessed_tracepoint_pc): New function.
+ (s390_gdbarch_init): Fill write_guessed_tracepoint_pc hook.
+
+2016-01-24 Marcin KoÅ›cielnicki <koriakin@0x04.net>
+
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* gdbarch.sh: Add write_guessed_tracepoint_pc hook.
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index e827684..c4d25d2 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -167,6 +167,22 @@ s390_write_pc (struct regcache *regcache, CORE_ADDR pc)
regcache_cooked_write_unsigned (regcache, S390_SYSTEM_CALL_REGNUM, 0);
}

+static void
+s390_write_guessed_tracepoint_pc (struct regcache *regcache, CORE_ADDR pc)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ int sz = register_size (gdbarch, S390_PSWA_REGNUM);
+ gdb_byte *reg = (gdb_byte *) alloca (sz);
+
+ /* 31-bit PSWA needs high bit set. */
+ if (tdep->abi == ABI_LINUX_S390)
+ pc |= 0x80000000;
+
+ store_unsigned_integer (reg, sz, gdbarch_byte_order (gdbarch), pc);
+ regcache_raw_supply (regcache, S390_PSWA_REGNUM, reg);
+}
+

/* DWARF Register Mapping. */

@@ -7857,6 +7873,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
s390_iterate_over_regset_sections);
set_gdbarch_cannot_store_register (gdbarch, s390_cannot_store_register);
set_gdbarch_write_pc (gdbarch, s390_write_pc);
+ set_gdbarch_write_guessed_tracepoint_pc (gdbarch, s390_write_guessed_tracepoint_pc);
set_gdbarch_pseudo_register_read (gdbarch, s390_pseudo_register_read);
set_gdbarch_pseudo_register_write (gdbarch, s390_pseudo_register_write);
set_tdesc_pseudo_register_name (gdbarch, s390_pseudo_register_name);
--
2.7.0