X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftramp-frame.c;h=f6a9763565131d31df0ff52bf4a45c9513266842;hb=24e31cf3aa66e20877358040ceb35b87dde66d12;hp=850d372440a86782ba47a8986432b8a8621e9514;hpb=4c38e0a4fcb69f8586d8db0b9cdb8dbab5980811;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 850d372440..f6a9763565 100644
--- 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, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 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,8 +43,9 @@ static struct trad_frame_cache *
 tramp_frame_cache (struct frame_info *this_frame,
 		   void **this_cache)
 {
-  CORE_ADDR pc = get_frame_pc (this_frame);
-  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)
     {
       tramp_cache->trad_cache = trad_frame_cache_zalloc (this_frame);
@@ -64,6 +64,7 @@ tramp_frame_this_id (struct frame_info *this_frame,
 {
   struct trad_frame_cache *trad_cache
     = tramp_frame_cache (this_frame, this_cache);
+
   trad_frame_get_id (trad_cache, this_id);
 }
 
@@ -74,6 +75,7 @@ tramp_frame_prev_register (struct frame_info *this_frame,
 {
   struct trad_frame_cache *trad_cache
     = tramp_frame_cache (this_frame, this_cache);
+
   return trad_frame_get_register (trad_cache, this_frame, prev_regnum);
 }
 
@@ -84,16 +86,23 @@ tramp_frame_start (const struct tramp_frame *tramp,
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   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++)
     {
       CORE_ADDR func = pc - tramp->insn_size * ti;
       int i;
+
       for (i = 0; 1; i++)
 	{
 	  gdb_byte buf[sizeof (tramp->insn[0])];
 	  ULONGEST insn;
+
 	  if (tramp->insn[i].bytes == TRAMP_SENTINEL_INSN)
 	    return func;
 	  if (!safe_frame_unwind_memory (this_frame,
@@ -157,6 +166,7 @@ tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
   unwinder->type = tramp_frame->frame_type;
   unwinder->unwind_data = data;
   unwinder->sniffer = tramp_frame_sniffer;
+  unwinder->stop_reason = default_frame_unwind_stop_reason;
   unwinder->this_id = tramp_frame_this_id;
   unwinder->prev_register = tramp_frame_prev_register;
   frame_unwind_prepend_unwinder (gdbarch, unwinder);