* dwarf2loc.c (dwarf2_evaluate_loc_desc): Invoke DWARF2_REG_TO_REGNUM

	on the DWARF2 register number prior to fetching a register.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cfbd9ce..31199e7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-22  Kevin Buettner  <kevinb@redhat.com>
+
+       * dwarf2loc.c (dwarf2_evaluate_loc_desc): Invoke DWARF2_REG_TO_REGNUM
+       on the DWARF2 register number prior to fetching a register.
+
 2003-04-22  J. Brobecker  <brobecker@gnat.com>
 
        * config/pa/tm-hppa.h (SOFT_FLOAT): Delete this macro.

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 8927e87..c236c11 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -223,7 +223,10 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
   result = dwarf_expr_fetch (ctx, 0);
 
   if (ctx->in_reg)
-    retval = value_from_register (SYMBOL_TYPE (var), result, frame);
+    {
+      int regnum = DWARF2_REG_TO_REGNUM (result);
+      retval = value_from_register (SYMBOL_TYPE (var), regnum, frame);
+    }
   else
     {
       retval = allocate_value (SYMBOL_TYPE (var));