Re: [patch] mips-tdep: info registers

[Aleksandar Ristovski <aristovski@qnx.com>]

[-- Attachment #1: Type: text/plain, Size: 762 bytes --]

Aleksandar Ristovski wrote:
> Joel Brobecker wrote:
>>> The problem is, this doesn't do what you want it to do.  It looks up
>>> GDB internal register number 1.  That just happens, at the moment,
>>> to match up with the raw register backing $at.  But it might change
>>> in the future.  It's not "the register named $1", which is what a
>>> MIPS user should expect.
>>
>> I agree, now, that we shouldn't have this feature. I can have a look
>> at removing it...
>>
> 
> Joel, the attached removes numeric value syntax, but allows it for mips; 
> mips will explicitly map regno to raw regno (which is currently 1-1).
> 
> I will let you take it from here.
> 
> 
> Thanks,
> 
> Aleksandar Ristovski
> QNX Software Systems
> 

Reposting a diff generated with -up.

[-- Attachment #2: mips-tdep.c-info-registers-20090223.diff --]
[-- Type: text/x-patch, Size: 2469 bytes --]

Index: gdb/infcmd.c
===================================================================
RCS file: /cvs/src/src/gdb/infcmd.c,v
retrieving revision 1.231
diff -u -p -r1.231 infcmd.c
--- gdb/infcmd.c	25 Jan 2009 23:35:51 -0000	1.231
+++ gdb/infcmd.c	23 Feb 2009 18:21:54 -0000
@@ -1948,21 +1948,6 @@ registers_info (char *addr_exp, int fpre
 	  }
       }
 
-      /* A register number?  (how portable is this one?).  */
-      {
-	char *endptr;
-	int regnum = strtol (start, &endptr, 0);
-	if (endptr == end
-	    && regnum >= 0
-	    && regnum < gdbarch_num_regs (gdbarch)
-			+ gdbarch_num_pseudo_regs (gdbarch))
-	  {
-	    gdbarch_print_registers_info (gdbarch, gdb_stdout,
-					  frame, regnum, fpregs);
-	    continue;
-	  }
-      }
-
       /* A register group?  */
       {
 	struct reggroup *group;
Index: gdb/mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.490
diff -u -p -r1.490 mips-tdep.c
--- gdb/mips-tdep.c	22 Feb 2009 01:02:17 -0000	1.490
+++ gdb/mips-tdep.c	23 Feb 2009 18:21:57 -0000
@@ -440,13 +440,25 @@ mips_register_name (struct gdbarch *gdba
     "t8", "t9", "k0", "k1", "gp", "sp", "s8", "ra"
   };
 
+  static char *mips_gpr_numeric_names[] = {
+    "0", "1", "2", "3", "4", "5", "6", "7",
+    "8", "9", "10", "11", "12", "13", "14", "15",
+    "16", "17", "18", "19", "20", "21", "22", "23",
+    "24", "25", "26", "27", "28", "29", "30", "31"
+  };
+
   enum mips_abi abi = mips_abi (gdbarch);
 
   /* Map [gdbarch_num_regs .. 2*gdbarch_num_regs) onto the raw registers, 
      but then don't make the raw register names visible.  */
   int rawnum = regno % gdbarch_num_regs (gdbarch);
   if (regno < gdbarch_num_regs (gdbarch))
-    return "";
+    {
+      if (regno >= 0)
+	return mips_gpr_numeric_names [regno];
+      else
+	return "";
+    }
 
   /* The MIPS integer registers are always mapped from 0 to 31.  The
      names of the registers (which reflects the conventions regarding
@@ -4601,7 +4613,9 @@ mips_print_registers_info (struct gdbarc
 {
   if (regnum != -1)		/* do one specified register */
     {
-      gdb_assert (regnum >= gdbarch_num_regs (gdbarch));
+      if (regnum < gdbarch_num_regs (gdbarch)
+	  && regnum >= 0)
+	regnum += gdbarch_num_regs (gdbarch); /* Print pseudo register.  */
       if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
 	error (_("Not a valid register for the current processor type"));