r1849

[dslinux_amadeus at dslinux.in-berlin.de]

Author: amadeus
Date: 2007-07-27 19:36:00 +0200 (Fri, 27 Jul 2007)
New Revision: 1849

Log:
Apply patches from Philippe GOETZ

Modified: trunk/user/gdbserver/linux-arm-low.c
===================================================================
--- trunk/user/gdbserver/linux-arm-low.c	2007-07-27 17:35:19 UTC (rev 1848)
+++ trunk/user/gdbserver/linux-arm-low.c	2007-07-27 17:36:00 UTC (rev 1849)
@@ -35,12 +35,11 @@
 #include <sys/reg.h>
 #endif
 
-#define arm_num_regs 26
+#define arm_num_regs 17
 
 static int arm_regmap[] = {
   0, 4, 8, 12, 16, 20, 24, 28,
   32, 36, 40, 44, 48, 52, 56, 60,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1,
   64
 };
 

Modified: trunk/user/gdbserver/linux-low.c
===================================================================
--- trunk/user/gdbserver/linux-low.c	2007-07-27 17:35:19 UTC (rev 1848)
+++ trunk/user/gdbserver/linux-low.c	2007-07-27 17:36:00 UTC (rev 1849)
@@ -1627,7 +1627,15 @@
       return 1;
     }
 #endif
- return 0;
+#ifdef __arm__
+  int pid = get_thread_process (current_inferior)->head.id;
+
+  *text_p = ptrace (PTRACE_PEEKUSER, pid, (long)18*4, 0);
+  *data_p = ptrace (PTRACE_PEEKUSER, pid, (long)20*4, 0);
+  return 1;
+#else
+  return 0;
+#endif
 }
 #endif