Re: [RFA 3rd] tell in which register a register var is.

[Pierre Muller <muller@cerbere.u-strasbg.fr>]

At 17:52 30/11/2001 , Andrew Cagney a écrit:
>>2001-11-30 Pierre Muller  <muller@ics.u-strasbg.fr>
>>* findvar.c (locate_var_value): Specify in which register a register
>>         variable is stored.
>
>Yes, ok.
>
>However, can you, as a favour, add the assertion I suggested?  I agree with your logic - it should be ok.  However, I'm currently working on the REGISTER code and would dearly like more assertions so that I can detect earlier my screwups.

   Committed, modifed as Andrew asked for.

Thus I send the patch once more.

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

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


Index: findvar.c
===================================================================
RCS file: /cvs/src/src/gdb/findvar.c,v
retrieving revision 1.25
diff -u -p -r1.25 findvar.c
--- findvar.c   2001/11/10 21:34:56     1.25
+++ findvar.c   2001/12/03 08:38:00
@@ -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
    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:



Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99