ChangeLog:

	* regformats/reg-ppc.dat: Rename "ps" to "msr".
	* regformats/reg-ppc64.dat: Likewise.

gdbserver/ChangeLog:

	* configure.srv [powerpc64-*-linux*]: Add all files mentioned for
	powerpc-*-linux* to srv_regobj and reg_xmlfiles.
	* linux-ppc-low.c (ppc_get_pc): Support bi-arch operation.
	(ppc_set_pc): Likewise.
	(ppc_arch_setup): New function.
	(ppc_fill_gregset): Call ppc_collect_ptrace_register instead
	of collect_register.
	(the_low_target): Use ppc_arch_setup as arch_setup initializer.

6 files changed, 82 insertions, 30 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 63ca32550c9..39bda0b9b19 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-28  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* regformats/reg-ppc.dat: Rename "ps" to "msr".
+	* regformats/reg-ppc64.dat: Likewise.
+
+2008-02-28  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* features/Makefile (%.dat): Emit xmltarget statement.
 
 	* regformats/regdat.sh: Support xmltarget and xmlarch statments.
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 84df67f93b8..a59668cc644 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,16 @@
 2008-02-28  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* configure.srv [powerpc64-*-linux*]: Add all files mentioned for
+	powerpc-*-linux* to srv_regobj and reg_xmlfiles.
+	* linux-ppc-low.c (ppc_get_pc): Support bi-arch operation.
+	(ppc_set_pc): Likewise.
+	(ppc_arch_setup): New function.
+	(ppc_fill_gregset): Call ppc_collect_ptrace_register instead
+	of collect_register.
+	(the_low_target): Use ppc_arch_setup as arch_setup initializer.	
+
+2008-02-28  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* configure.srv [powerpc64-*-linux*]: Use linux-ppc-low.o
 	instead of linux-ppc64-low.o.
 	* linux-ppc64-low.c: Remove file.
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 543533343fe..c5e555298f6 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -106,12 +106,17 @@ case "${target}" in
 			srv_linux_usrregs=yes
 			srv_linux_thread_db=yes
 			;;
-  powerpc64-*-linux*)	srv_regobj="reg-ppc64.o powerpc-64.o"
+  powerpc64-*-linux*)	srv_regobj="reg-ppc.o powerpc-32.o powerpc-e500.o"
+			srv_regobj="${srv_regobj} reg-ppc64.o powerpc-64.o"
 			srv_tgtobj="linux-low.o linux-ppc-low.o"
-			srv_xmlfiles="rs6000/powerpc-64.xml"
+			srv_xmlfiles="rs6000/powerpc-32.xml"
 			srv_xmlfiles="${srv_xmlfiles} rs6000/power-altivec.xml"
-			srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
+			srv_xmlfiles="${srv_xmlfiles} rs6000/power-core.xml"
 			srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu.xml"
+			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-e500.xml"
+			srv_xmlfiles="${srv_xmlfiles} rs6000/power-spe.xml"
+			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-64.xml"
+			srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
 			srv_linux_usrregs=yes
 			srv_linux_regsets=yes
 			srv_linux_thread_db=yes
diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index a1ade344336..8eb6b1f6ab7 100644
--- a/gdb/gdbserver/linux-ppc-low.c
+++ b/gdb/gdbserver/linux-ppc-low.c
@@ -138,18 +138,65 @@ ppc_supply_ptrace_register (int regno, const char *buf)
 static CORE_ADDR
 ppc_get_pc (void)
 {
-  unsigned long pc;
-
-  collect_register_by_name ("pc", &pc);
-  return (CORE_ADDR) pc;
+  if (register_size (0) == 4)
+    {
+      unsigned int pc;
+      collect_register_by_name ("pc", &pc);
+      return (CORE_ADDR) pc;
+    }
+  else
+    {
+      unsigned long pc;
+      collect_register_by_name ("pc", &pc);
+      return (CORE_ADDR) pc;
+    }
 }
 
 static void
 ppc_set_pc (CORE_ADDR pc)
 {
-  unsigned long newpc = pc;
+  if (register_size (0) == 4)
+    {
+      unsigned int newpc = pc;
+      supply_register_by_name ("pc", &newpc);
+    }
+  else
+    {
+      unsigned long newpc = pc;
+      supply_register_by_name ("pc", &newpc);
+    }
+}
+
+static void
+ppc_arch_setup (void)
+{
+#ifdef __powerpc64__
+  long msr;
 
-  supply_register_by_name ("pc", &newpc);
+  /* On a 64-bit host, assume 64-bit inferior process.  */
+#ifdef __ALTIVEC__
+  init_registers_powerpc_64 ();
+#else
+  init_registers_ppc64 ();
+#endif
+
+  /* Only if the high bit of the MSR is set, we actually have
+     a 64-bit inferior.  */
+  collect_register_by_name ("msr", &msr);
+  if (msr < 0)
+    return;
+#endif
+
+  /* OK, we have a 32-bit inferior.  */
+#ifdef __ALTIVEC__
+  init_registers_powerpc_32 ();
+#else
+#ifdef __SPE__
+  init_registers_powerpc_e500 ();
+#else
+  init_registers_ppc ();
+#endif
+#endif
 }
 
 /* Correct in either endianness.
@@ -179,10 +226,10 @@ static void ppc_fill_gregset (void *buf)
   int i;
 
   for (i = 0; i < 32; i++)
-    collect_register (i, (char *) buf + ppc_regmap[i]);
+    ppc_collect_ptrace_register (i, (char *) buf + ppc_regmap[i]);
 
   for (i = 64; i < 70; i++)
-    collect_register (i, (char *) buf + ppc_regmap[i]);
+    ppc_collect_ptrace_register (i, (char *) buf + ppc_regmap[i]);
 }
 
 #ifdef __ALTIVEC__
@@ -285,23 +332,7 @@ struct regset_info target_regsets[] = {
 };
 
 struct linux_target_ops the_low_target = {
-#ifdef __powerpc64__
-#ifdef __ALTIVEC__
-  init_registers_powerpc_64,
-#else
-  init_registers_ppc64,
-#endif
-#else
-#ifdef __ALTIVEC__
-  init_registers_powerpc_32,
-#else
-#ifdef __SPE__
-  init_registers_powerpc_e500,
-#else
-  init_registers_ppc,
-#endif
-#endif
-#endif
+  ppc_arch_setup,
   ppc_num_regs,
   ppc_regmap,
   ppc_cannot_fetch_register,
diff --git a/gdb/regformats/reg-ppc.dat b/gdb/regformats/reg-ppc.dat
index d7f9b88c355..2337d45d7e0 100644
--- a/gdb/regformats/reg-ppc.dat
+++ b/gdb/regformats/reg-ppc.dat
@@ -67,7 +67,7 @@ expedite:r1,pc
 64:f31
 
 32:pc
-32:ps
+32:msr
 
 32:cr
 32:lr
diff --git a/gdb/regformats/reg-ppc64.dat b/gdb/regformats/reg-ppc64.dat
index 281432ade47..16d7440d9ec 100644
--- a/gdb/regformats/reg-ppc64.dat
+++ b/gdb/regformats/reg-ppc64.dat
@@ -67,7 +67,7 @@ expedite:r1,pc
 64:f31
 
 64:pc
-64:ps
+64:msr
 
 32:cr
 64:lr