Fix "info frame" in the outermost frame.

[platform/upstream/binutils.git] / gdb / stack.c

diff --git a/gdb/stack.c b/gdb/stack.c
index 9a12eb3..848bcb0 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1408,6 +1408,7 @@ frame_info (char *addr_exp, int from_tty)
   CORE_ADDR frame_pc;
   int frame_pc_p;
   CORE_ADDR caller_pc;
+  volatile struct gdb_exception ex;
 
   fi = parse_frame_specification_1 (addr_exp, "No stack.", &selected_frame_p);
   gdbarch = get_frame_arch (fi);
@@ -1493,11 +1494,29 @@ frame_info (char *addr_exp, int from_tty)
                     sal.line);
   puts_filtered ("; ");
   wrap_here ("    ");
-  printf_filtered ("saved %s ", pc_regname);
-  if (frame_unwind_caller_pc_if_available (fi, &caller_pc))
-    fputs_filtered (paddress (gdbarch, caller_pc), gdb_stdout);
+  printf_filtered ("saved %s = ", pc_regname);
+
+  TRY_CATCH (ex, RETURN_MASK_ERROR)
+    {
+      caller_pc = frame_unwind_caller_pc (fi);
+    }
+  if (ex.reason < 0)
+    {
+      switch (ex.error)
+       {
+       case NOT_AVAILABLE_ERROR:
+         val_print_unavailable (gdb_stdout);
+         break;
+       case OPTIMIZED_OUT_ERROR:
+         val_print_not_saved (gdb_stdout);
+         break;
+       default:
+         fprintf_filtered (gdb_stdout, _("<error: %s>"), ex.message);
+         break;
+       }
+    }
   else
-    fputs_filtered ("<unavailable>", gdb_stdout);
+    fputs_filtered (paddress (gdbarch, caller_pc), gdb_stdout);
   printf_filtered ("\n");
 
   if (calling_frame_info == NULL)