From 0161e4b928b40ff84051a4526f3fd1df1273ae18 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 30 Nov 2011 08:26:06 +0000 Subject: [PATCH] * s390-tdep.c (s390_displaced_step_fixup): Fix processing of LARL instruction. Add more diagnostic output. --- gdb/ChangeLog | 5 +++++ gdb/s390-tdep.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 94120f162a..cecccc83a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-11-30 Ulrich Weigand + + * s390-tdep.c (s390_displaced_step_fixup): Fix processing of LARL + instruction. Add more diagnostic output. + 2011-11-29 Andrey Smirnov * MAINTAINERS (Write After Approval): Add myself to the list. diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 788f8c174d..2e9dd23347 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1370,9 +1370,9 @@ s390_displaced_step_fixup (struct gdbarch *gdbarch, if (debug_displaced) fprintf_unfiltered (gdb_stdlog, - "displaced: (s390) fixup (%s, %s) pc %s amode 0x%x\n", + "displaced: (s390) fixup (%s, %s) pc %s len %d amode 0x%x\n", paddress (gdbarch, from), paddress (gdbarch, to), - paddress (gdbarch, pc), (int) amode); + paddress (gdbarch, pc), insnlen, (int) amode); /* Handle absolute branch and save instructions. */ if (is_rr (insn, op_basr, &r1, &r2) @@ -1428,9 +1428,11 @@ s390_displaced_step_fixup (struct gdbarch *gdbarch, /* Handle LOAD ADDRESS RELATIVE LONG. */ else if (is_ril (insn, op1_larl, op2_larl, &r1, &i2)) { + /* Update PC. */ + regcache_write_pc (regs, from + insnlen); /* Recompute output address in R1. */ regcache_cooked_write_unsigned (regs, S390_R0_REGNUM + r1, - amode | (from + insnlen + i2*2)); + amode | (from + i2 * 2)); } /* If we executed a breakpoint instruction, point PC right back at it. */ @@ -1440,6 +1442,11 @@ s390_displaced_step_fixup (struct gdbarch *gdbarch, /* For any other insn, PC points right after the original instruction. */ else regcache_write_pc (regs, from + insnlen); + + if (debug_displaced) + fprintf_unfiltered (gdb_stdlog, + "displaced: (s390) pc is now %s\n", + paddress (gdbarch, regcache_read_pc (regs))); } /* Normal stack frames. */ -- 2.34.1