* hppa-tdep.c (skip_trampoline_code): Handle argument relocation

        stubs which return directly to the caller rather than to the stub
        itself.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b0176741f6b34d5946f03ec51bf1947de12c6bf..be7922f7c1ff21000323e28720d231a7e49317a1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 12 10:46:27 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+       * hppa-tdep.c (skip_trampoline_code): Handle argument relocation
+       stubs which return directly to the caller rather than to the stub
+       itself.
+
 Wed May 11 20:11:51 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * c-exp.y (yyerror): Display a more informative error message.

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index b55f40f9c40904300f854c44b668efffaf704b6a..b999384649df83df9601091dcdba68521f9877bf 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1622,9 +1622,10 @@ skip_trampoline_code (pc, name)
            }
        }
 
-      /* Does it look like bl X,rp?  Another way to do a branch from the
-        stub to the actual function.  */
-      else if ((curr_inst & 0xffe0e000) == 0xe8400000)
+      /* Does it look like bl X,%rp or bl X,%r0?  Another way to do a
+        branch from the stub to the actual function.  */
+      else if ((curr_inst & 0xffe0e000) == 0xe8400000
+              || (curr_inst & 0xffe0e000) == 0xe8000000)
        return (loc + extract_17 (curr_inst) + 8) & ~0x3;
 
       /* Does it look like bv (rp)?   Note this depends on the