gdb/python: print name of unwinder that claimed frame in debug message

[deliverable/binutils-gdb.git] / gdb / tramp-frame.c

diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 54878b712664ad94646caa11772b08fbf5c402d6..b13ca51482221760bfa840abe097bca8b910d57e 100644 (file)
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -1,6 +1,6 @@
 /* Signal trampoline unwinder, for GDB the GNU Debugger.
 
-   Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2004-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -26,7 +26,6 @@
 #include "target.h"
 #include "trad-frame.h"
 #include "frame-base.h"
-#include "gdb_assert.h"
 
 struct frame_data
 {
@@ -44,7 +43,8 @@ static struct trad_frame_cache *
 tramp_frame_cache (struct frame_info *this_frame,
                   void **this_cache)
 {
-  struct tramp_frame_cache *tramp_cache = (*this_cache);
+  struct tramp_frame_cache *tramp_cache
+    = (struct tramp_frame_cache *) *this_cache;
 
   if (tramp_cache->trad_cache == NULL)
     {
@@ -87,6 +87,10 @@ tramp_frame_start (const struct tramp_frame *tramp,
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   int ti;
 
+  /* Check if we can use this trampoline.  */
+  if (tramp->validate && !tramp->validate (tramp, this_frame, &pc))
+    return 0;
+
   /* Search through the trampoline for one that matches the
      instruction sequence around PC.  */
   for (ti = 0; tramp->insn[ti].bytes != TRAMP_SENTINEL_INSN; ti++)
@@ -98,14 +102,15 @@ tramp_frame_start (const struct tramp_frame *tramp,
        {
          gdb_byte buf[sizeof (tramp->insn[0])];
          ULONGEST insn;
+         size_t insn_size = tramp->insn_size;
 
          if (tramp->insn[i].bytes == TRAMP_SENTINEL_INSN)
            return func;
          if (!safe_frame_unwind_memory (this_frame,
-                                        func + i * tramp->insn_size,
-                                        buf, tramp->insn_size))
+                                        func + i * insn_size,
+                                        {buf, insn_size}))
            break;
-         insn = extract_unsigned_integer (buf, tramp->insn_size, byte_order);
+         insn = extract_unsigned_integer (buf, insn_size, byte_order);
          if (tramp->insn[i].bytes != (insn & tramp->insn[i].mask))
            break;
        }