Use frame_unwind_register_value in frame_unwind_register_unsigned

gdb:

2017-04-05  Yao Qi  <yao.qi@linaro.org>

	* frame.c (frame_unwind_register_unsigned): Call
	frame_unwind_register_value.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 92f5b2294d975ec5481cc83810a136210b0313bb..c3999b67c4412fa2c55f1d1829d0495e429eaa72 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05  Yao Qi  <yao.qi@linaro.org>
+
+       * frame.c (frame_unwind_register_unsigned): Call
+       frame_unwind_register_value.
+
 2017-04-05  Yao Qi  <yao.qi@linaro.org>
 
        * gdb.threads/thread-specific-bp.exp (check_thread_specific_breakpoint):

diff --git a/gdb/frame.c b/gdb/frame.c
index 05a3be400c35ada0de48fd529e9cc83e0eaa941d..d4fc456e2a8c9cf25ab426a9a17fe2ec83c015d1 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1270,10 +1270,27 @@ frame_unwind_register_unsigned (struct frame_info *frame, int regnum)
   struct gdbarch *gdbarch = frame_unwind_arch (frame);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   int size = register_size (gdbarch, regnum);
-  gdb_byte buf[MAX_REGISTER_SIZE];
+  struct value *value = frame_unwind_register_value (frame, regnum);
 
-  frame_unwind_register (frame, regnum, buf);
-  return extract_unsigned_integer (buf, size, byte_order);
+  gdb_assert (value != NULL);
+
+  if (value_optimized_out (value))
+    {
+      throw_error (OPTIMIZED_OUT_ERROR,
+                  _("Register %d was not saved"), regnum);
+    }
+  if (!value_entirely_available (value))
+    {
+      throw_error (NOT_AVAILABLE_ERROR,
+                  _("Register %d is not available"), regnum);
+    }
+
+  ULONGEST r = extract_unsigned_integer (value_contents_all (value), size,
+                                        byte_order);
+
+  release_value (value);
+  value_free (value);
+  return r;
 }
 
 ULONGEST