2001-11-30 Pierre Muller <muller@ics.u-strasbg.fr>

	* findvar.c (locate_var_value): Specify in which register a register
	variable is stored.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3cdd070244dc788e9878131495fb6f29d2da3ebe..732be2559d9ef56451ce15ae73fb1380b6d6e330 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+       * findvar.c (locate_var_value): Specify in which register a register
+       variable is stored.
+
 2001-11-30  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * win32-nat.c (mappings): Correct position of XMM registers,

diff --git a/gdb/findvar.c b/gdb/findvar.c
index b9b9be47b3659a991b75144c361e35f078577787..5f5766cac3c8b321367e6c602b6f9a6bb87cced5 100644 (file)
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -29,6 +29,7 @@
 #include "inferior.h"
 #include "target.h"
 #include "gdb_string.h"
+#include "gdb_assert.h"
 #include "floatformat.h"
 #include "symfile.h"           /* for overlay functions */
 #include "regcache.h"
@@ -869,9 +870,21 @@ locate_var_value (register struct symbol *var, struct frame_info *frame)
   switch (VALUE_LVAL (lazy_value))
     {
     case lval_register:
+       gdb_assert (REGISTER_NAME (VALUE_REGNO (lazy_value)) != NULL
+                   && *REGISTER_NAME (VALUE_REGNO (lazy_value)) != '\0');
+      error("Address requested for identifier "
+           "\"%s\" which is in register $%s",
+            SYMBOL_SOURCE_NAME (var), 
+           REGISTER_NAME (VALUE_REGNO (lazy_value)));
+      break;
+
     case lval_reg_frame_relative:
-      error ("Address requested for identifier \"%s\" which is in a register.",
-            SYMBOL_SOURCE_NAME (var));
+       gdb_assert (REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value)) != NULL
+                   && *REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value)) != '\0');
+      error("Address requested for identifier "
+           "\"%s\" which is in frame register $%s",
+            SYMBOL_SOURCE_NAME (var), 
+           REGISTER_NAME (VALUE_FRAME_REGNUM (lazy_value)));
       break;
 
     default: