From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20426 invoked by alias); 15 Jul 2002 10:06:41 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 20417 invoked from network); 15 Jul 2002 10:06:39 -0000 Received: from unknown (HELO d12lmsgate-2.de.ibm.com) (195.212.91.200) by sources.redhat.com with SMTP; 15 Jul 2002 10:06:39 -0000 Received: from d12relay02.de.ibm.com (d12relay02.de.ibm.com [9.165.215.23]) by d12lmsgate-2.de.ibm.com (8.12.3/8.12.3) with ESMTP id g6FA6bMi018220 for ; Mon, 15 Jul 2002 12:06:37 +0200 Received: from d12ml015.de.ibm.com (d12ml015_cs0 [9.165.223.40]) by d12relay02.de.ibm.com (8.11.1m3/NCO/VER6.2) with ESMTP id g6FA6ar107212 for ; Mon, 15 Jul 2002 12:06:36 +0200 Importance: Normal Sensitivity: To: gdb-patches@sources.redhat.com Message-ID: From: "Gerhard Tonn" Date: Mon, 15 Jul 2002 07:17:00 -0000 Subject: Re: [Patch] Fix multithread debugging problems on s390 MIME-Version: 1.0 Content-type: multipart/mixed; Boundary="0__=4EBBE164DFA40E4E8f9e8a93df938690918c4EBBE164DFA40E4E" Content-Disposition: inline X-SW-Source: 2002-07/txt/msg00317.txt.bz2 --0__=4EBBE164DFA40E4E8f9e8a93df938690918c4EBBE164DFA40E4E Content-type: text/plain; charset=us-ascii Content-length: 2454 Attached is the revised patch. I have made both functions more consistent. The CR registers are not part of gregsetp but included in the register cache. They are probably not needed at all, I will cleanup that later, when I will have got a more detailed understanding of gdb. diff -urN gdb-5.2/gdb/s390-nat.c gdb-5.2-s390/gdb/s390-nat.c --- gdb-5.2/gdb/s390-nat.c Tue Nov 6 23:18:13 2001 +++ gdb-5.2-s390/gdb/s390-nat.c Mon Jul 15 11:48:10 2002 @@ -273,14 +273,22 @@ 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); + if (regno < 0) + { + regcache_collect (S390_PSWM_REGNUM, &gregp[S390_PSWM_REGNUM]); + regcache_collect (S390_PC_REGNUM, &gregp[S390_PC_REGNUM]); + for (regi = 0; regi < S390_NUM_GPRS; regi++) + regcache_collect (S390_GP0_REGNUM + regi, + &gregp[S390_GP0_REGNUM + regi]); + for (regi = 0; regi < S390_NUM_ACRS; regi++) + regcache_collect (S390_FIRST_ACR + regi, + &gregp[S390_FIRST_ACR + regi]); + } + else if (regno >= S390_PSWM_REGNUM && regno <= S390_LAST_ACR) + regcache_collect (regno, &gregp[regno]); } /* Given a pointer to a floating point register set in /proc format @@ -291,12 +299,18 @@ void fill_fpregset (fpregset_t * fpregsetp, int regno) { - if (regno == -1) - supply_fpregset (fpregsetp); - else - supply_register (regno, - &((char *) fpregsetp)[REGISTER_BYTE (regno) - - REGISTER_BYTE (S390_FPC_REGNUM)]); + int regi; + + if (regno < 0) + { + regcache_collect (S390_FPC_REGNUM, &fpregsetp->fpc); + for (regi = 0; regi < S390_NUM_FPRS; regi++) + regcache_collect (S390_FP0_REGNUM + regi, &fpregsetp->fprs[regi]); + } + else if (regno == S390_FPC_REGNUM) + regcache_collect (S390_FPC_REGNUM, &fpregsetp->fpc); + else if (regno >= S390_FP0_REGNUM && regno <= S390_FPLAST_REGNUM) + regcache_collect (regno, &fpregsetp->fprs[regno - S390_FP0_REGNUM]); } (See attached file: gdb-5.2.1-s390-1.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 --0__=4EBBE164DFA40E4E8f9e8a93df938690918c4EBBE164DFA40E4E Content-type: application/octet-stream; name="gdb-5.2.1-s390-1.diff" Content-Disposition: attachment; filename="gdb-5.2.1-s390-1.diff" Content-transfer-encoding: base64 Content-length: 2660 ZGlmZiAtdXJOIGdkYi01LjIvZ2RiL3MzOTAtbmF0LmMgZ2RiLTUuMi1zMzkw L2dkYi9zMzkwLW5hdC5jDQotLS0gZ2RiLTUuMi9nZGIvczM5MC1uYXQuYwlU dWUgTm92ICA2IDIzOjE4OjEzIDIwMDENCisrKyBnZGItNS4yLXMzOTAvZ2Ri L3MzOTAtbmF0LmMJTW9uIEp1bCAxNSAxMTo0ODoxMCAyMDAyDQpAQCAtMjcz LDE0ICsyNzMsMjIgQEANCiB2b2lkDQogZmlsbF9ncmVnc2V0IChncmVnc2V0 X3QgKiBncmVnc2V0cCwgaW50IHJlZ25vKQ0KIHsNCisgIGludCByZWdpOw0K ICAgZ3JlZ190ICpncmVncCA9IChncmVnX3QgKikgZ3JlZ3NldHA7DQogDQot ICBpZiAocmVnbm8gPj0gUzM5MF9GSVJTVF9DUiAmJiByZWdubyA8PSBTMzkw X0xBU1RfQ1IpDQotICAgIHN1cHBseV9yZWdpc3RlciAocmVnbm8sIE5VTEwp Ow0KLSAgZWxzZSBpZiAocmVnbm8gIT0gLTEpDQotICAgIHN1cHBseV9yZWdp c3RlciAocmVnbm8sIChjaGFyICopICZncmVncFtyZWdub10pOw0KLSAgZWxz ZQ0KLSAgICBzdXBwbHlfZ3JlZ3NldCAoZ3JlZ3NldHApOw0KKyAgaWYgKHJl Z25vIDwgMCkgDQorICAgIHsNCisgICAgICByZWdjYWNoZV9jb2xsZWN0IChT MzkwX1BTV01fUkVHTlVNLCAmZ3JlZ3BbUzM5MF9QU1dNX1JFR05VTV0pOw0K KyAgICAgIHJlZ2NhY2hlX2NvbGxlY3QgKFMzOTBfUENfUkVHTlVNLCAmZ3Jl Z3BbUzM5MF9QQ19SRUdOVU1dKTsNCisgICAgICBmb3IgKHJlZ2kgPSAwOyBy ZWdpIDwgUzM5MF9OVU1fR1BSUzsgcmVnaSsrKQ0KKyAgICAgICAgcmVnY2Fj aGVfY29sbGVjdCAoUzM5MF9HUDBfUkVHTlVNICsgcmVnaSwNCisJCQkgICZn cmVncFtTMzkwX0dQMF9SRUdOVU0gKyByZWdpXSk7DQorICAgICAgZm9yIChy ZWdpID0gMDsgcmVnaSA8IFMzOTBfTlVNX0FDUlM7IHJlZ2krKykNCisgICAg ICAgIHJlZ2NhY2hlX2NvbGxlY3QgKFMzOTBfRklSU1RfQUNSICsgcmVnaSwN CisJCQkgICZncmVncFtTMzkwX0ZJUlNUX0FDUiArIHJlZ2ldKTsNCisgICAg fQ0KKyAgZWxzZSBpZiAocmVnbm8gPj0gUzM5MF9QU1dNX1JFR05VTSAmJiBy ZWdubyA8PSBTMzkwX0xBU1RfQUNSKQ0KKyAgICByZWdjYWNoZV9jb2xsZWN0 IChyZWdubywgJmdyZWdwW3JlZ25vXSk7DQogfQ0KIA0KIC8qICBHaXZlbiBh IHBvaW50ZXIgdG8gYSBmbG9hdGluZyBwb2ludCByZWdpc3RlciBzZXQgaW4g L3Byb2MgZm9ybWF0DQpAQCAtMjkxLDEyICsyOTksMTggQEANCiB2b2lkDQog ZmlsbF9mcHJlZ3NldCAoZnByZWdzZXRfdCAqIGZwcmVnc2V0cCwgaW50IHJl Z25vKQ0KIHsNCi0gIGlmIChyZWdubyA9PSAtMSkNCi0gICAgc3VwcGx5X2Zw cmVnc2V0IChmcHJlZ3NldHApOw0KLSAgZWxzZQ0KLSAgICBzdXBwbHlfcmVn aXN0ZXIgKHJlZ25vLA0KLQkJICAgICAmKChjaGFyICopIGZwcmVnc2V0cClb UkVHSVNURVJfQllURSAocmVnbm8pIC0NCi0JCQkJCSAgIFJFR0lTVEVSX0JZ VEUgKFMzOTBfRlBDX1JFR05VTSldKTsNCisgIGludCByZWdpOw0KKw0KKyAg aWYgKHJlZ25vIDwgMCkgDQorICAgIHsNCisgICAgICByZWdjYWNoZV9jb2xs ZWN0IChTMzkwX0ZQQ19SRUdOVU0sICZmcHJlZ3NldHAtPmZwYyk7DQorICAg ICAgZm9yIChyZWdpID0gMDsgcmVnaSA8IFMzOTBfTlVNX0ZQUlM7IHJlZ2kr KykNCisgICAgICAgIHJlZ2NhY2hlX2NvbGxlY3QgKFMzOTBfRlAwX1JFR05V TSArIHJlZ2ksICZmcHJlZ3NldHAtPmZwcnNbcmVnaV0pOw0KKyAgICB9DQor ICBlbHNlIGlmIChyZWdubyA9PSBTMzkwX0ZQQ19SRUdOVU0pDQorICAgIHJl Z2NhY2hlX2NvbGxlY3QgKFMzOTBfRlBDX1JFR05VTSwgJmZwcmVnc2V0cC0+ ZnBjKTsNCisgIGVsc2UgaWYgKHJlZ25vID49IFMzOTBfRlAwX1JFR05VTSAm JiByZWdubyA8PSBTMzkwX0ZQTEFTVF9SRUdOVU0pDQorICAgIHJlZ2NhY2hl X2NvbGxlY3QgKHJlZ25vLCAmZnByZWdzZXRwLT5mcHJzW3JlZ25vIC0gUzM5 MF9GUDBfUkVHTlVNXSk7DQogfQ0KIA0KIA0K --0__=4EBBE164DFA40E4E8f9e8a93df938690918c4EBBE164DFA40E4E--