2001-11-29 Elena Zannoni <ezannoni@redhat.com>

	* Makefile.in (ppc-linux-nat.o): Add dependency on ppc-tdep.h.

	* ppc-tdep.h (PPC_GPLAST_REGNUM): Define.

	* ppc-linux-nat.c: Include ppc-tdep.h.
	(ppc_register_u_addr): Don't use the static array regmap[],
	dynamically define the mapping instead.
	(supply_gregset): Ditto.
	(fill_gregset): Ditto.
	(COPY_REG): Delete macro defintion.
	(regmap): Delete array.

4 files changed, 80 insertions, 24 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 823cee6..0bac755 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2001-11-29  Elena Zannoni  <ezannoni@redhat.com>
+
+	* Makefile.in (ppc-linux-nat.o): Add dependency on ppc-tdep.h.
+
+	* ppc-tdep.h (PPC_GPLAST_REGNUM): Define.
+
+	* ppc-linux-nat.c: Include ppc-tdep.h.
+	(ppc_register_u_addr): Don't use the static array regmap[],
+	dynamically define the mapping instead.
+	(supply_gregset): Ditto.
+	(fill_gregset): Ditto.
+	(COPY_REG): Delete macro defintion.
+	(regmap): Delete array.
+
 2001-11-29  Jim Blandy  <jimb@redhat.com>
 
 	Tighten up GDB's support for returning structs by value.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 691d665..1ac2076 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1818,7 +1818,7 @@ ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) $(gdb_string_h) $(frame_h) \
 	$(objfiles_h) $(gdb_stabs_h) $(serial_h) ocd.h $(regcache_h)
 
 ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdbcore_h) $(frame_h) \
-	$(inferior_h) $(target_h) $(regcache_h)
+	$(inferior_h) $(target_h) $(regcache_h) ppc-tdep.h
 
 ppc-linux-tdep.o: ppc-linux-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	$(target_h) ppc-tdep.h $(regcache_h) $(value_h)
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 13eb839..5701476 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -35,6 +35,7 @@
 
 /* Prototypes for supply_gregset etc. */
 #include "gregset.h"
+#include "ppc-tdep.h"
 
 int
 kernel_u_size (void)
@@ -42,21 +43,49 @@ kernel_u_size (void)
   return (sizeof (struct user));
 }
 
-static int regmap[] =
-{PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7,
- PT_R8, PT_R9, PT_R10, PT_R11, PT_R12, PT_R13, PT_R14, PT_R15,
- PT_R16, PT_R17, PT_R18, PT_R19, PT_R20, PT_R21, PT_R22, PT_R23,
- PT_R24, PT_R25, PT_R26, PT_R27, PT_R28, PT_R29, PT_R30, PT_R31,
- PT_FPR0, PT_FPR0 + 2, PT_FPR0 + 4, PT_FPR0 + 6, PT_FPR0 + 8, PT_FPR0 + 10, PT_FPR0 + 12, PT_FPR0 + 14,
- PT_FPR0 + 16, PT_FPR0 + 18, PT_FPR0 + 20, PT_FPR0 + 22, PT_FPR0 + 24, PT_FPR0 + 26, PT_FPR0 + 28, PT_FPR0 + 30,
- PT_FPR0 + 32, PT_FPR0 + 34, PT_FPR0 + 36, PT_FPR0 + 38, PT_FPR0 + 40, PT_FPR0 + 42, PT_FPR0 + 44, PT_FPR0 + 46,
- PT_FPR0 + 48, PT_FPR0 + 50, PT_FPR0 + 52, PT_FPR0 + 54, PT_FPR0 + 56, PT_FPR0 + 58, PT_FPR0 + 60, PT_FPR0 + 62,
- PT_NIP, PT_MSR, PT_CCR, PT_LNK, PT_CTR, PT_XER, PT_MQ};
+/* *INDENT-OFF* */
+/* registers layout, as presented by the ptrace interface:
+PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7,
+PT_R8, PT_R9, PT_R10, PT_R11, PT_R12, PT_R13, PT_R14, PT_R15,
+PT_R16, PT_R17, PT_R18, PT_R19, PT_R20, PT_R21, PT_R22, PT_R23,
+PT_R24, PT_R25, PT_R26, PT_R27, PT_R28, PT_R29, PT_R30, PT_R31,
+PT_FPR0, PT_FPR0 + 2, PT_FPR0 + 4, PT_FPR0 + 6, PT_FPR0 + 8, PT_FPR0 + 10, PT_FPR0 + 12, PT_FPR0 + 14,
+PT_FPR0 + 16, PT_FPR0 + 18, PT_FPR0 + 20, PT_FPR0 + 22, PT_FPR0 + 24, PT_FPR0 + 26, PT_FPR0 + 28, PT_FPR0 + 30,
+PT_FPR0 + 32, PT_FPR0 + 34, PT_FPR0 + 36, PT_FPR0 + 38, PT_FPR0 + 40, PT_FPR0 + 42, PT_FPR0 + 44, PT_FPR0 + 46,
+PT_FPR0 + 48, PT_FPR0 + 50, PT_FPR0 + 52, PT_FPR0 + 54, PT_FPR0 + 56, PT_FPR0 + 58, PT_FPR0 + 60, PT_FPR0 + 62,
+PT_NIP, PT_MSR, PT_CCR, PT_LNK, PT_CTR, PT_XER, PT_MQ */
+/* *INDENT_ON * */
 
 int 
-ppc_register_u_addr (int ustart, int regnum)
+ppc_register_u_addr (int ustart, int regno)
 {
-  return (ustart + 4 * regmap[regnum]);
+  int u_addr = -1;
+
+  /* General purpose registers occupy 1 slot each in the buffer */
+  if (regno >= PPC_GP0_REGNUM && regno <= PPC_GPLAST_REGNUM )
+    u_addr =  (ustart + (PT_R0 + regno) * 4);
+
+  /* Floating point regs: 2 slots each */
+  if (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM)
+    u_addr = (ustart + (PT_FPR0 + (regno - FP0_REGNUM) * 2) * 4);
+
+  /* UISA special purpose registers: 1 slot each */
+  if (regno == PC_REGNUM)
+    u_addr = ustart + PT_NIP * 4;
+  if (regno == PPC_LR_REGNUM)
+    u_addr = ustart + PT_LNK * 4;
+  if (regno == PPC_CR_REGNUM)
+    u_addr = ustart + PT_CCR * 4;
+  if (regno == PPC_XER_REGNUM)
+    u_addr = ustart + PT_XER * 4;
+  if (regno == PPC_CTR_REGNUM)
+    u_addr = ustart + PT_CTR * 4;
+  if (regno == PPC_MQ_REGNUM)
+    u_addr = ustart + PT_MQ * 4;
+  if (regno == PPC_PS_REGNUM)
+    u_addr = ustart + PT_MSR * 4;
+
+  return u_addr;
 }
 
 void
@@ -68,8 +97,13 @@ supply_gregset (gdb_gregset_t *gregsetp)
   for (regi = 0; regi < 32; regi++)
     supply_register (regi, (char *) (regp + regi));
 
-  for (regi = FIRST_UISA_SP_REGNUM; regi <= LAST_UISA_SP_REGNUM; regi++)
-    supply_register (regi, (char *) (regp + regmap[regi]));
+  supply_register (PC_REGNUM, (char *) (regp + PT_NIP));
+  supply_register (PPC_LR_REGNUM, (char *) (regp + PT_LNK));
+  supply_register (PPC_CR_REGNUM, (char *) (regp + PT_CCR));
+  supply_register (PPC_XER_REGNUM, (char *) (regp + PT_XER));
+  supply_register (PPC_CTR_REGNUM, (char *) (regp + PT_CTR));
+  supply_register (PPC_MQ_REGNUM, (char *) (regp + PT_MQ));
+  supply_register (PPC_PS_REGNUM, (char *) (regp + PT_MSR));
 }
 
 void
@@ -78,19 +112,26 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno)
   int regi;
   elf_greg_t *regp = (elf_greg_t *) gregsetp;
 
-#define COPY_REG(_idx_,_regi_) \
-  if ((regno == -1) || regno == _regi_) \
-    regcache_collect (_regi_, regp + _idx_)
-
   for (regi = 0; regi < 32; regi++)
     {
-      COPY_REG (regmap[regi], regi);
+      if ((regno == -1) || regno == regi)
+        regcache_collect (regi, regp + PT_R0 + regi);
     }
 
-  for (regi = FIRST_UISA_SP_REGNUM; regi <= LAST_UISA_SP_REGNUM; regi++)
-    {
-      COPY_REG (regmap[regi], regi);
-    }
+  if ((regno == -1) || regno == PC_REGNUM)
+    regcache_collect (PC_REGNUM, regp + PT_NIP);
+  if ((regno == -1) || regno == PPC_LR_REGNUM)
+    regcache_collect (PPC_LR_REGNUM, regp + PT_LNK);
+  if ((regno == -1) || regno == PPC_CR_REGNUM)
+    regcache_collect (PPC_CR_REGNUM, regp + PT_CCR);
+  if ((regno == -1) || regno == PPC_XER_REGNUM)
+    regcache_collect (PPC_XER_REGNUM, regp + PT_XER);
+  if ((regno == -1) || regno == PPC_CTR_REGNUM)
+    regcache_collect (PPC_CTR_REGNUM, regp + PT_CTR);
+  if ((regno == -1) || regno == PPC_MQ_REGNUM)
+    regcache_collect (PPC_MQ_REGNUM, regp + PT_MQ);
+  if ((regno == -1) || regno == PPC_PS_REGNUM)
+    regcache_collect (PPC_PS_REGNUM, regp + PT_MSR);
 }
 
 void
diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
index b06e64e..e855223 100644
--- a/gdb/ppc-tdep.h
+++ b/gdb/ppc-tdep.h
@@ -46,6 +46,7 @@ CORE_ADDR rs6000_frame_chain (struct frame_info *);
 /* Some important register numbers. */
 
 #define	PPC_GP0_REGNUM 0		/* GPR register 0 */
+#define	PPC_GPLAST_REGNUM 31		/* GPR register 31 */
 #define	PPC_TOC_REGNUM 2		/* TOC register */
 #define PPC_PS_REGNUM 65		/* Processor (or machine) status (%msr) */
 #define	PPC_CR_REGNUM 66		/* Condition register */