From 7a8f494c7b171f6cbad20a14ef03a5d7acaa6ccb Mon Sep 17 00:00:00 2001 From: Pedro Franco de Carvalho Date: Thu, 22 Mar 2018 10:22:45 -0300 Subject: [PATCH] ppc: Fix stwux and stdux masks in skip_prologue This patch merges the masks for matching the stwux and stdux instructions in rs6000-tdep.c:skip_prologue into a single mask that only matches these two instructions. Commit 72dd273062 fixed the warning described in PR tdep/18295, this patch addresses the comment in the same PR indicating that the mask was too permissive. gdb/Changelog: PR tdep/18295 * rs6000-tdep.c (skip_prologue): Match both stwux and stdux a single mask. --- gdb/ChangeLog | 6 ++++++ gdb/rs6000-tdep.c | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cf996bcc87..ef11361356 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-03-22 Pedro Franco de Carvalho + + PR tdep/18295 + * rs6000-tdep.c (skip_prologue): Match both stwux and stdux + a single mask. + 2018-03-22 Pedro Franco de Carvalho * rs6000-tdep.c (store_insn_p): New function. diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index d61fe58d22..37cbcb672b 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1889,8 +1889,8 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, offset = fdata->offset; continue; } - else if ((op & 0xfc1f016e) == 0x7c01016e) - { /* stwux rX,r1,rY */ + else if ((op & 0xfc1f07fa) == 0x7c01016a) + { /* stwux rX,r1,rY || stdux rX,r1,rY */ /* No way to figure out what r1 is going to be. */ fdata->frameless = 0; offset = fdata->offset; @@ -1903,13 +1903,6 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, offset = fdata->offset; continue; } - else if ((op & 0xfc1f016a) == 0x7c01016a) - { /* stdux rX,r1,rY */ - /* No way to figure out what r1 is going to be. */ - fdata->frameless = 0; - offset = fdata->offset; - continue; - } else if ((op & 0xffff0000) == 0x38210000) { /* addi r1,r1,SIMM */ fdata->frameless = 0; -- 2.34.1