* dwarf2-frame.c: Include "value.h".

	(read_reg): Use unpack_long and register_type.
	* Makefile.in (dwarf2-frame.o): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab781a41e07d352203e3f4b4e25c4750951a1ec4..9e216662f919e467723c6ae4a3dfcaf64581ba49 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * dwarf2-frame.c: Include "value.h".
+       (read_reg): Use unpack_long and register_type.
+       * Makefile.in (dwarf2-frame.o): Update.
+
 2006-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * remote-rdp.c: Deleted.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5491351a5b0c5da2d09062dd8ba63254371906fe..5af00a71e54609666ebff28168e4e36029181581 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1926,7 +1926,8 @@ dwarf2expr.o: dwarf2expr.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(value_h) \
 dwarf2-frame.o: dwarf2-frame.c $(defs_h) $(dwarf2expr_h) $(elf_dwarf2_h) \
        $(frame_h) $(frame_base_h) $(frame_unwind_h) $(gdbcore_h) \
        $(gdbtypes_h) $(symtab_h) $(objfiles_h) $(regcache_h) \
-       $(gdb_assert_h) $(gdb_string_h) $(complaints_h) $(dwarf2_frame_h)
+       $(gdb_assert_h) $(gdb_string_h) $(complaints_h) $(dwarf2_frame_h) \
+       $(value_h)
 dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_out_h) $(value_h) $(frame_h) \
        $(gdbcore_h) $(target_h) $(inferior_h) $(ax_h) $(ax_gdb_h) \
        $(regcache_h) $(objfiles_h) $(exceptions_h) $(elf_dwarf2_h) \

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 3f7fbfe047cdb5336832303a07ef53f3e96c7bda..a11aac9ce4009ee3d7981063c54587ed2708652f 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -32,6 +32,7 @@
 #include "symtab.h"
 #include "objfiles.h"
 #include "regcache.h"
+#include "value.h"
 
 #include "gdb_assert.h"
 #include "gdb_string.h"
@@ -218,7 +219,13 @@ read_reg (void *baton, int reg)
 
   buf = alloca (register_size (gdbarch, regnum));
   frame_unwind_register (next_frame, regnum, buf);
-  return extract_typed_address (buf, builtin_type_void_data_ptr);
+
+  /* Convert the register to an integer.  This returns a LONGEST
+     rather than a CORE_ADDR, but unpack_pointer does the same thing
+     under the covers, and this makes more sense for non-pointer
+     registers.  Maybe read_reg and the associated interfaces should
+     deal with "struct value" instead of CORE_ADDR.  */
+  return unpack_long (register_type (gdbarch, regnum), buf);
 }
 
 static void