[Patch] Fix multithread debugging problems on s390

["Gerhard Tonn" <TON@de.ibm.com>]

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

Hi,
attached is a patch that fixes the multi-thread debugging problems on s390.
The functions fill_gregset and fill_fpregset were broken, but seem to be
used only since the gdb thread code has been revised in 5.1. I have
attached the fix also as file in case there are any line mangling in the
code below.

2002-07-12  Gerhard Tonn  <ton@de.ibm.com>

            * s390-nat.c (fill_gregset and fill_fpregset):
              Call regcache_collect functions.



I would appreciate, if someone could commit it to trunk and 5.2 branch, if
possible even for 5.2.1

Thanks

--- src/gdb/s390-nat.c  Tue Nov  6 22:18:13 2001
+++ /home/ton/gdb/src/gdb/s390-nat.c      Wed Jul 10 10:15:26 2002
@@ -273,14 +273,23 @@
 void
 fill_gregset (gregset_t * gregsetp, int regno)
 {
+  int regi;
   greg_t *gregp = (greg_t *) gregsetp;

   if (regno >= S390_FIRST_CR && regno <= S390_LAST_CR)
-    supply_register (regno, NULL);
+    ;
   else if (regno != -1)
-    supply_register (regno, (char *) &gregp[regno]);
-  else
-    supply_gregset (gregsetp);
+    regcache_collect (regno, (char *) &gregp[regno]);
+  else {
+    regcache_collect (S390_PSWM_REGNUM, (char *)
&gregp[S390_PSWM_REGNUM]);
+    regcache_collect (S390_PC_REGNUM, (char *) &gregp[S390_PC_REGNUM]);
+    for (regi = 0; regi < S390_NUM_GPRS; regi++)
+      regcache_collect (S390_GP0_REGNUM + regi,
+           (char *) &gregp[S390_GP0_REGNUM + regi]);
+    for (regi = 0; regi < S390_NUM_ACRS; regi++)
+      regcache_collect (S390_FIRST_ACR + regi,
+           (char *) &gregp[S390_FIRST_ACR + regi]);
+  }
 }

 /*  Given a pointer to a floating point register set in /proc format
@@ -291,10 +300,15 @@
 void
 fill_fpregset (fpregset_t * fpregsetp, int regno)
 {
-  if (regno == -1)
-    supply_fpregset (fpregsetp);
+  int regi;
+
+  if (regno == -1) {
+    regcache_collect (S390_FPC_REGNUM, (char *) &fpregsetp->fpc);
+    for (regi = 0; regi < S390_NUM_FPRS; regi++)
+      regcache_collect (S390_FP0_REGNUM + regi, (char *) &fpregsetp->fprs[regi]);
+  }
   else
-    supply_register (regno,
+    regcache_collect (regno,
                 &((char *) fpregsetp)[REGISTER_BYTE (regno) -
                                 REGISTER_BYTE (S390_FPC_REGNUM)]);
 }

(See attached file: gdb-5.2.1-s390.diff)

Regards / Mit freundlichen Gruessen
Gerhard

Gerhard Tonn, Linux for eServer Development, +(49)-7031-16-4716, Lotus Notes: ton@ibmde,
   Internet: ton@de.ibm.com

[-- Attachment #2: gdb-5.2.1-s390.diff --]
[-- Type: application/octet-stream, Size: 1638 bytes --]

--- src/gdb/s390-nat.c	Tue Nov  6 22:18:13 2001
+++ /home/ton/gdb/src/gdb/s390-nat.c	Wed Jul 10 10:15:26 2002
@@ -273,14 +273,23 @@
 void
 fill_gregset (gregset_t * gregsetp, int regno)
 {
+  int regi;
   greg_t *gregp = (greg_t *) gregsetp;
 
   if (regno >= S390_FIRST_CR && regno <= S390_LAST_CR)
-    supply_register (regno, NULL);
+    ;
   else if (regno != -1)
-    supply_register (regno, (char *) &gregp[regno]);
-  else
-    supply_gregset (gregsetp);
+    regcache_collect (regno, (char *) &gregp[regno]);
+  else {
+    regcache_collect (S390_PSWM_REGNUM, (char *) &gregp[S390_PSWM_REGNUM]);
+    regcache_collect (S390_PC_REGNUM, (char *) &gregp[S390_PC_REGNUM]);
+    for (regi = 0; regi < S390_NUM_GPRS; regi++)
+      regcache_collect (S390_GP0_REGNUM + regi,
+		(char *) &gregp[S390_GP0_REGNUM + regi]);
+    for (regi = 0; regi < S390_NUM_ACRS; regi++)
+      regcache_collect (S390_FIRST_ACR + regi,
+		(char *) &gregp[S390_FIRST_ACR + regi]);
+  }
 }
 
 /*  Given a pointer to a floating point register set in /proc format
@@ -291,10 +300,15 @@
 void
 fill_fpregset (fpregset_t * fpregsetp, int regno)
 {
-  if (regno == -1)
-    supply_fpregset (fpregsetp);
+  int regi;
+
+  if (regno == -1) {
+    regcache_collect (S390_FPC_REGNUM, (char *) &fpregsetp->fpc);
+    for (regi = 0; regi < S390_NUM_FPRS; regi++)
+      regcache_collect (S390_FP0_REGNUM + regi, (char *) &fpregsetp->fprs[regi]);
+  }
   else
-    supply_register (regno,
+    regcache_collect (regno,
 		     &((char *) fpregsetp)[REGISTER_BYTE (regno) -
 					   REGISTER_BYTE (S390_FPC_REGNUM)]);
 }