[RFA/commit] rs6000-tdep.c:skip_prologue avoid negative left shift

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[RFA/commit] rs6000-tdep.c:skip_prologue avoid negative left shift

Joel Brobecker
the rs6000-tdep.c::skip_prologue function has the following code:

          unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);

          /* Not a recognized prologue instruction.
             Handle optimizer code motions into the prologue by continuing
             the search if we have no valid frame yet or if the return
             address is not yet saved in the frame.  Also skip instructions
             if some of the GPRs expected to be saved are not yet saved.  */
          if (fdata->frameless == 0 && fdata->nosavedpc == 0
              && (fdata->gpr_mask & all_mask) == all_mask)
            break;

The problem is that fdata->saved_gpr is initialized to -1, and so,
if no instruction is found in the function's prologue that causes us
to set that field to a non-negative value, the sanitizer crashes
with the following message:

    rs6000-tdep.c:1965:34: runtime error: shift exponent -1 is negative

This patch fixes the issue the by only doing the shift if saved_gpr
is not negative. When saved_gpr is negative, we actually don't need
the shift.

gdb/ChangeLog:

        * rs6000-tdep.c (skip_prologue): Fix potential negative left
        shifting.

Tested on ppc-linux native.
Also tested on ppc-elf (baremetal) using AdaCore's testsuite.

I will commit in a couple of weeks unless there are objections.

Thanks,
--
Joel

---
 gdb/rs6000-tdep.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index ce01be5..45dffbe 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1962,16 +1962,19 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 
       else
  {
-  unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);
-
   /* Not a recognized prologue instruction.
      Handle optimizer code motions into the prologue by continuing
      the search if we have no valid frame yet or if the return
      address is not yet saved in the frame.  Also skip instructions
      if some of the GPRs expected to be saved are not yet saved.  */
   if (fdata->frameless == 0 && fdata->nosavedpc == 0
-      && (fdata->gpr_mask & all_mask) == all_mask)
-    break;
+      && fdata->saved_gpr != -1)
+    {
+      unsigned int all_mask = ~((1U << fdata->saved_gpr) - 1);
+
+      if ((fdata->gpr_mask & all_mask) == all_mask)
+ break;
+    }
 
   if (op == 0x4e800020 /* blr */
       || op == 0x4e800420) /* bctr */
--
2.1.4

Reply | Threaded
Open this post in threaded view
|

Re: [RFA/commit] rs6000-tdep.c:skip_prologue avoid negative left shift

Kevin Buettner
On Fri, 12 Oct 2018 18:26:46 -0400
Joel Brobecker <[hidden email]> wrote:

> gdb/ChangeLog:
>
>         * rs6000-tdep.c (skip_prologue): Fix potential negative left
>         shifting.

LGTM.

Kevin
Reply | Threaded
Open this post in threaded view
|

Re: [RFA/commit] rs6000-tdep.c:skip_prologue avoid negative left shift

Joel Brobecker
> > gdb/ChangeLog:
> >
> >         * rs6000-tdep.c (skip_prologue): Fix potential negative left
> >         shifting.
>
> LGTM.

Thanks Kevin. I finally took the time to push this patch in.

--
Joel