Commit 296cfb88 authored by Giancarlo Frix's avatar Giancarlo Frix Committed by Joel Brobecker
Browse files

s390: Fix BC instruction breakpoint handling

This fixes a long-lived bug in the s390 port.

When trying to step over a breakpoint set on a BC (branch on condition)
instruction with displaced stepping on IBM Z, gdb would incorrectly
adjust the pc regardless of whether or not the branch was taken. Since
the branch target is an absolute address, this would cause the inferior
to jump around wildly whenever the branch was taken, either crashing it
or causing it to behave unpredictably.

It turns out that the logic to handle BC instructions correctly was in
the code, but that the enum value representing its opcode has always
been incorrect.

This patch corrects the enum value to the actual opcode, fixing the
stepping problem. The enum value is also used in the prologue analysis
code, so this also fixes a minor bug where more of the prologue would
be read than was necessary.

gdb/ChangeLog:

        PR breakpoints/27009
        * s390-tdep.h (op_bc): Correct BC opcode value.
parent 63c457b9
2020-12-06 Giancarlo Frix <gfrix@rocketsoftware.com> (tiny change)
PR breakpoints/27009
* s390-tdep.h (op_bc): Correct BC opcode value.
2020-12-06 Joel Brobecker <brobecker@adacore.com>
* gmp-utils.h (gdb_mpz::safe_export): New private method.
......
......@@ -117,7 +117,7 @@ enum
op_basr = 0x0d,
op_bas = 0x4d,
op_bcr = 0x07,
op_bc = 0x0d,
op_bc = 0x47,
op_bctr = 0x06,
op_bctgr = 0xb946,
op_bct = 0x46,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment