public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] [PowerPC] Fix stwux and stdux masks in skip_prologue
@ 2018-03-16 18:13 Pedro Franco de Carvalho
  2018-03-16 20:05 ` Ulrich Weigand
  0 siblings, 1 reply; 3+ messages in thread
From: Pedro Franco de Carvalho @ 2018-03-16 18:13 UTC (permalink / raw)
  To: gdb-patches; +Cc: uweigand

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 gdb/18295, this
patch addresses the comment in the same PR indicating that the mask
was too permissive.

gdb/Changelog:

2018-mm-dd  Pedro Franco de Carvalho  <pedromfc@linux.vnet.ibm.com>

	* rs6000-tdep.c (skip_prologue): Match both stwux and stdux
          with a single mask.
---
 gdb/rs6000-tdep.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index a5b70917b7..2b60196247 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1857,8 +1857,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;
@@ -1871,13 +1871,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.13.6

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] [PowerPC] Fix stwux and stdux masks in skip_prologue
  2018-03-16 18:13 [PATCH] [PowerPC] Fix stwux and stdux masks in skip_prologue Pedro Franco de Carvalho
@ 2018-03-16 20:05 ` Ulrich Weigand
  2018-03-22 13:31   ` Pedro Franco de Carvalho
  0 siblings, 1 reply; 3+ messages in thread
From: Ulrich Weigand @ 2018-03-16 20:05 UTC (permalink / raw)
  To: Pedro Franco de Carvalho; +Cc: gdb-patches

Pedro Franco de Carvalho wrote:

> 2018-mm-dd  Pedro Franco de Carvalho  <pedromfc@linux.vnet.ibm.com>
> 
> 	* rs6000-tdep.c (skip_prologue): Match both stwux and stdux
>           with a single mask.

This is OK.

Thanks,
Ulrich

-- 
  Dr. Ulrich Weigand
  GNU/Linux compilers and toolchain
  Ulrich.Weigand@de.ibm.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] [PowerPC] Fix stwux and stdux masks in skip_prologue
  2018-03-16 20:05 ` Ulrich Weigand
@ 2018-03-22 13:31   ` Pedro Franco de Carvalho
  0 siblings, 0 replies; 3+ messages in thread
From: Pedro Franco de Carvalho @ 2018-03-22 13:31 UTC (permalink / raw)
  To: Ulrich Weigand; +Cc: gdb-patches

Ulrich Weigand <uweigand@de.ibm.com> writes:

> This is OK.

Checked in! Thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-03-22 13:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-16 18:13 [PATCH] [PowerPC] Fix stwux and stdux masks in skip_prologue Pedro Franco de Carvalho
2018-03-16 20:05 ` Ulrich Weigand
2018-03-22 13:31   ` Pedro Franco de Carvalho

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).