From patchwork Wed May 30 19:03:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27584 Received: (qmail 45082 invoked by alias); 30 May 2018 19:05:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 44845 invoked by uid 89); 30 May 2018 19:05:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 May 2018 19:05:40 +0000 Received: from ESESSHC004.ericsson.se (Unknown_Domain [153.88.183.30]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 57.B6.10459.AE5FE0B5; Wed, 30 May 2018 21:05:14 +0200 (CEST) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC004.ericsson.se (153.88.183.30) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 30 May 2018 21:04:32 +0200 Received: from ESESBMB505.ericsson.se (153.88.183.172) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 30 May 2018 21:04:31 +0200 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB505.ericsson.se (153.88.183.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Wed, 30 May 2018 21:04:31 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by BYAPR15MB2392.namprd15.prod.outlook.com (2603:10b6:a02:8d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Wed, 30 May 2018 19:04:29 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed 13/15] Remove regcache_cooked_write_part Date: Wed, 30 May 2018 15:03:51 -0400 Message-ID: <1527707033-27183-14-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1527707033-27183-1-git-send-email-simon.marchi@ericsson.com> References: <1527707033-27183-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: SN6PR0102CA0010.prod.exchangelabs.com (2603:10b6:805:1::23) To BYAPR15MB2392.namprd15.prod.outlook.com (2603:10b6:a02:8d::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR15MB2392; X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 3:4MAYHLUpwrczTMUdH6wbL/kfJw0UIbaQXtrFYj15m1arz9T7a7WugsfiK5QohMh3zztoZsnpfli01GaFmoC/600eCX5kM1Suxb+vdSVhKLp5d5TeUS5mDZNj8DsoThfoF8WaSizk1TR9Nqoqkr2w03zbOQZMI+tBHglj9IxWRBFTd6U/gcrpfgnuuhjgpGrCe4wnYo5GHueBs7jkWjKNbT1ksZEMJEU6z/SwYDF6ENQBssE7HYR6aDrQX19ba2WM; 25:TZgGbxFfAhfYScz0M04TNjnHE0RlNi7lPkKgVCyPs4Nlw+7xk4Z3xtdeJEO1cMZjT9SgTYnyLf6whZ52QjC68nAhENAFhWwFcejI2yIiZ52R8iX6jNf4nnsdCquq6IiCxUdQic0SrIhMo6NyQMLe0Va0jgUwXRw6BY76gWD37jFrXocIjB6SjR2y/4/payVC54xSzeUqphHl4eKeJDb14j1KB1fwY3xmVVXr5Mgg3Rm6VpcW3o+pCqsauZElGMUZoxPGm7f+dIoNu6oxpY0EpR5KSd4N5TSG2o6biRa8Ow/4s0SepXOp8IntmSjyvAU++93Zv8rqZemsmJO9yjftPA==; 31:HpaEbPUqZ+CbB0uL4VvUPImdcgI4EXT2ZxW09EblsnNH28Ze0ngLowB5HXeSp4bpcYPsFkA0JcK9rN9Rpxkcd8VipWeMT/DKbbF4V0A+Qv7WaceANzXWgSTGXG+brGWaNiu3bup/8+lukVzLaPuZ2oskurem6IxbsIzivzmjezgEn85aIo0Tc5NU2SzYNP/DNdJaf8m3TYfyPDm+TVezXHgRFvncg5L4yl/CmvitNN8= X-MS-TrafficTypeDiagnostic: BYAPR15MB2392: X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 20:ieONSBBwuDBc3p1yw4Ttn7miqhkEv0a0YVo8rHSCRJHEUOf7VJNmV2K2lo3esELQeC6Iu5r8gPniQLy04vLvy55ysZKFiQ49n2UZ2+ooXIxFDzyQ2nSjwKc2ij0SssDCVGuNYgefa2VpnZuWedXiPeJhuLkh/3FBUWAM2Udr2XmJ2yDxaJ1mObub8c+4aImZLslZVVfPZeUR0uU+7VOml3a125E5hWtF3qKUXlVByQnwQyW7PXcE6hCHGT4QNj/MpWiR/Et6k2aU9Rlf4rN8z/DpJHI1TIwPWCnBNMNqHAfZeOnXaNo1112CbtbbJKgNE/whs5+2lHfUHc4MhvvOIZqblYilU5ESIzCTxWHovSBDg4zMYVTLxURA5GqwJ9CjLG1djimDnEZsBWItKY/37t3c3FrCLbxMfaKZXIpoGmmeUPZQmzu3sDyDbR41e8vFkWHWvGT3c/ScB2gv9h0oI/QUtA/1hQVEQXrMZdx18enLI48K345G9kYwzl2Jd0+b; 4:xeSS/6WUOvSjM+paRmDUE9bi4dofb0XvCdjuUqxqv5hju6rYNlRZatASewzrolVmfdTCuODjemxhyhC5zTY4Bo+sOiomAW7WtATb8DCxBZ5EzuibdzPeRL1lDh81QXJ2KgCmQ4qq24PHr3thp47C7KqQ8TlfJ2YIT/MyTWLwmHQmgTh5lANTQjkUX5DaCJ7pJqIK8m9uu4jxlM2YookxXZOIuhWq6AbI6HlDgneYgBlUnixSfb6WUC2UX87BmX8XKwY2v2YiFxUrDIbpdZVjz6pjoHGLyIPEHGp90lUTQaoLYwsWNOGVwqUpLQAgyDvH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BYAPR15MB2392; BCL:0; PCL:0; RULEID:; SRVR:BYAPR15MB2392; X-Forefront-PRVS: 0688BF9B46 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(366004)(39860400002)(39380400002)(376002)(54534003)(199004)(189003)(50226002)(6512007)(486006)(8936002)(81156014)(6486002)(25786009)(26005)(68736007)(8676002)(81166006)(51416003)(86362001)(575784001)(52116002)(956004)(2616005)(44832011)(76176011)(476003)(446003)(11346002)(6666003)(6916009)(305945005)(386003)(6506007)(47776003)(53936002)(2906002)(36756003)(7736002)(97736004)(4326008)(16526019)(5660300001)(186003)(6116002)(3846002)(316002)(16586007)(2361001)(2351001)(48376002)(478600001)(105586002)(59450400001)(107886003)(50466002)(66066001)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR15MB2392; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BYAPR15MB2392; 23:MgsyfZS/Npx+eht19kCaY0ursICRg012wj4kQX+/y?= =?us-ascii?Q?/snuK4FtcVAVODo1IXeKj+tZhRAHdHlDNaQW5bJJ6bXCkhDr/d2KNk3ucQB9?= =?us-ascii?Q?/mNxqrgnz2+WNSWZU+jZ8S3RC/sCDu67MOHFSvXB3ccD5Wm8mgVIdoDck6IB?= =?us-ascii?Q?WLtE8lkjfivu33h867rc/v7s+DqbDxihMLmlnzJd6hBj2w18RPHyJEdmA6QY?= =?us-ascii?Q?JCDQWy971SJogNm56GrvKJQZ+da/p9lL6hdBSc31i275AhuIi01ZufLDXIrk?= =?us-ascii?Q?yxrPHY4wIEeB5MFG88xj8NK3yGib7q8g5p7WVn8Gfcoi+oX/gx8pqg8HM1t9?= =?us-ascii?Q?wbvf7jg+dB3QIf3Q8wLGwEHP5SatWk59j9QzXGcUR3W8BeKTTWSWftWhCQxL?= =?us-ascii?Q?cRnHJq+Pp5OKY/tCA5GAgabA7O17ew8DDCwWXY9bsb4D+QUE8oTGN6efH9e1?= =?us-ascii?Q?yqEv/iDOAXPBSzl/8PVt/3AlF9EK/gvNrJw0zi9cqxwQzpmNEKJkZxOcIFPj?= =?us-ascii?Q?KTMltZ0xu8jSm+4MHB2BsXLZOYuHvW7Fvjoc7UQlF81Aj0SYrfsvhyHH2w+r?= =?us-ascii?Q?cHRxJlBfQjMQLJBoxcB2odqpq20H/RH91C7d6yUyNih1feKNyBKV3dGZ+CcE?= =?us-ascii?Q?aVhu+gfPb2FY+2A06U5ShT2n97O2iesOqTijgPKCASpUKpJKoZRpftzZvSYq?= =?us-ascii?Q?q9CxZ8dQXbFtOHK5ANXRt/bNu375jc5yp17g6o+4prh1JD+EBSWPp010pVOQ?= =?us-ascii?Q?AQypyltNJZzKWjTmEGg4wZ1U1x946jGl2drMxydrW0h29rnFdIosXxtKdyLj?= =?us-ascii?Q?8ojr4aRWCbO2j0LtXvBolNeRe99LbGdGNr8z8eDrBN8GkHKDb1/KPazBe46G?= =?us-ascii?Q?w5vZ36eRW4/PKdxZ6AcKJOK2E2/8R0vtfNk0rkMzsr9JqsNUW5OkzfEB0iIa?= =?us-ascii?Q?sGc+DBdsHZpxQDxb8jk19qCyXvjfEvpJYMuzCljqzlnsp0GJrQ02RWHtjZgf?= =?us-ascii?Q?VCsH5K06NtqTKfw/JwlH1vnaVrpivS59hRL4iyBr91MnJp6fPvY2gMmveqAL?= =?us-ascii?Q?T61e7i0lvX+SB7fmZVBEwk+EGZ0OMK3eaz9VjH+oL9ek9BTOUO2fEXNJCPfG?= =?us-ascii?Q?3DuVVBL5a626bxsGcHokZxVn6gngei+1sT7W+/leG8IcV1k/F/V6UAH7A78w?= =?us-ascii?Q?Ft+KoJ1HMUtJghgrn84BuwDDCrPNqfQrfkRRtMAOrVqCr2m6o5EF0tN9XNYX?= =?us-ascii?Q?rXzLe/ZWLsLLuubDLS5z+nSbPyGEf9hYwdWLgeEFTmbxtUJlQp4hBp9fHInA?= =?us-ascii?Q?Rh7qcEIzE2IrlhoUqJzdjsqqyqF++WSanNRPPG+2em1?= X-Microsoft-Antispam-Message-Info: ilZ/ocqgJ3KtmOO29JD3Pbo7xNDmDxghlL7v5xzRl8CWwnYu54RDoyzdJkW3fMQOR0y6J/8O/gP4qc97M7boYR+GGP5NAI9jS+bHynQY4qzQYgDlDY1dcDzuopSz8B5xdM8k7vjopJTmanBdwqqfN+CZov+MZfup1NhE9h5fso9dSBJwPA81QodtidDJ2+OP X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 6:t4fUUDxseIpIFKEbGjClqs1yvkrxle39mdF5dSoK+lcrXqr8BlJ7xBEfSdJFtOPrc6G4zT9NgH1wbbV+ZJMTT1bsIlX9NGL0EEshvL7q43EWyMa7b0tNicdk/si+io4cHsnrp2koHw9JFblj3hMH9Rhqt8iXTcLikJtHi3XY05GKlhJ7atJTllo99X7lUZg9/3dnhSg6aKBYqTV9ydF+WXjVgx6jau6ehI3itOhqXSwxAVzhkzt3rwHXhgdUq1P7GF98yeqsxYXpbHZ186FchrWqKy3AOorTrTtr0a2ncnVmSuAHAX0FuRxt5/4CZe5UWamf3dmzeKUHRdriAWadIu1GuAbtyZ7NpOUL3fVJBarhW2MRjEsLBfuNXHxvTFD9or3GoBOE+YOnRoOArhXnKC0neACcG1LpKyWCUlRAkK+rnubfEfS3TjeuBx7GxLABS28tsOC4CzgldJPWbRgLQA==; 5:xeMzHXdxftUouLzgki9Fda3mz9rysf3zBs/pMxXD54oTayGGfqSJmylT05/6smNkHx5VCscZXL+Gu52eNtRVQfuqR7HQ7gw8SATQ0OUt+kiBUzn4OmJ2lQlsIZ1sC9HI2e1zGmWQk+TDh6zzNvLbRvZCtHtVsX0MSB/Of4+L9LY=; 24:OlkD5X6zUNTvYHF6DyYFvDDmhuJFv1uiP7B9XXP7+X9lHHlWgOX2cAX410by93H3UaTLohh2Qy8KRMqvzAKboQhFpqMdwseJ3Irq7lb0X6A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 7:29iSB9woeBG06xN0SHSTDZRkeHU1QIDHiiPsaH/e0uoCdGsxv6KqpedoM4z8H9yqhu1NxJts9OftBWN70ER2h4vifGe3UJTnkGddewuK9sufbMT6dz0VhY6vMrR2700SkZjmXkUHyOu+O+2Hevzse20Uu0QlFne4iQ75w86EVbG70i2kpfmVWHnpy+vrhbYbzethBJthVj4B4gOaOD26LcMkv20zQlI82jSsUnPeOOSfvjGuWinOHTSyj3eXKQat X-MS-Office365-Filtering-Correlation-Id: 83940bbb-4c72-441a-e71d-08d5c6602c09 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 19:04:29.6268 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 83940bbb-4c72-441a-e71d-08d5c6602c09 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2392 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes Remove regcache_cooked_write_part, update callers to use regcache::cooked_write_part. gdb/ChangeLog: * regcache.h (regcache_cooked_write_part): Remove, update callers to use regcache::cooked_write_part. * regcache.c (regcache_cooked_write_part): Remove. --- gdb/ChangeLog | 6 ++++++ gdb/hppa-tdep.c | 15 +++++++-------- gdb/m32c-tdep.c | 2 +- gdb/mep-tdep.c | 5 ++--- gdb/mips-tdep.c | 3 +-- gdb/ppc-sysv-tdep.c | 21 ++++++++++----------- gdb/regcache.c | 7 ------- gdb/regcache.h | 8 ++------ gdb/s390-tdep.c | 17 ++++++----------- gdb/score-tdep.c | 4 ++-- gdb/spu-tdep.c | 6 +++--- gdb/tic6x-tdep.c | 17 +++++++---------- 12 files changed, 47 insertions(+), 64 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0f06926..b0fb0c6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2018-05-30 Simon Marchi + * regcache.h (regcache_cooked_write_part): Remove, update + callers to use regcache::cooked_write_part. + * regcache.c (regcache_cooked_write_part): Remove. + +2018-05-30 Simon Marchi + * regcache.h (regcache_cooked_read_part): Remove, update callers to use readable_regcache::cooked_read_part. * regcache.c (regcache_cooked_read_part): Remove. diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 81e8a4c..1ea3670 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -1044,8 +1044,8 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, passed in floating-point registers, are passed in the right halves of the floating point registers; the left halves are unused." */ - regcache_cooked_write_part (regcache, regnum, offset % 8, - len, value_contents (arg)); + regcache->cooked_write_part (regnum, offset % 8, len, + value_contents (arg)); } } } @@ -1086,8 +1086,8 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, regnum = HPPA_ARG0_REGNUM - offset / 8; while (regnum > HPPA_ARG0_REGNUM - 8 && len > 0) { - regcache_cooked_write_part (regcache, regnum, - offset % 8, std::min (len, 8), valbuf); + regcache->cooked_write_part (regnum, offset % 8, std::min (len, 8), + valbuf); offset += std::min (len, 8); valbuf += std::min (len, 8); len -= std::min (len, 8); @@ -1154,8 +1154,7 @@ hppa32_return_value (struct gdbarch *gdbarch, struct value *function, if (readbuf != NULL) regcache->cooked_read_part (reg, 4 - part, part, readbuf); if (writebuf != NULL) - regcache_cooked_write_part (regcache, reg, 4 - part, - part, writebuf); + regcache->cooked_write_part (reg, 4 - part, part, writebuf); reg++; } /* Now transfer the remaining register values. */ @@ -1254,8 +1253,8 @@ hppa64_return_value (struct gdbarch *gdbarch, struct value *function, { while (len > 0) { - regcache_cooked_write_part (regcache, regnum, offset, - std::min (len, 8), writebuf); + regcache->cooked_write_part (regnum, offset, std::min (len, 8), + writebuf); writebuf += std::min (len, 8); len -= std::min (len, 8); regnum++; diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c index b7cba1c..f696568 100644 --- a/gdb/m32c-tdep.c +++ b/gdb/m32c-tdep.c @@ -463,7 +463,7 @@ m32c_part_write (struct m32c_reg *reg, struct regcache *cache, int offset, len; m32c_find_part (reg, &offset, &len); - regcache_cooked_write_part (cache, reg->rx->num, offset, len, buf); + cache->cooked_write_part (reg->rx->num, offset, len, buf); return REG_VALID; } diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c index 1f3f2bb..c8a5ecf 100644 --- a/gdb/mep-tdep.c +++ b/gdb/mep-tdep.c @@ -2139,9 +2139,8 @@ mep_store_return_value (struct gdbarch *arch, else offset = 0; - regcache_cooked_write_part (regcache, MEP_R0_REGNUM, - offset, TYPE_LENGTH (type), - valbuf); + regcache->cooked_write_part (MEP_R0_REGNUM, offset, TYPE_LENGTH (type), + valbuf); } /* Return values larger than a single register are returned in diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index fdf00f0..32b2d40 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -512,8 +512,7 @@ mips_xfer_register (struct gdbarch *gdbarch, struct regcache *regcache, if (in != NULL) regcache->cooked_read_part (reg_num, reg_offset, length, in + buf_offset); if (out != NULL) - regcache_cooked_write_part (regcache, reg_num, reg_offset, length, - out + buf_offset); + regcache->cooked_write_part (reg_num, reg_offset, length, out + buf_offset); if (mips_debug && in != NULL) { int i; diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index b7dfdca..0bac225 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -1286,9 +1286,8 @@ ppc64_sysv_abi_push_val (struct gdbarch *gdbarch, if (len > 0) { if (argpos->regcache && argpos->greg <= 10) - regcache_cooked_write_part (argpos->regcache, - tdep->ppc_gp0_regnum + argpos->greg, - offset, len, val); + argpos->regcache->cooked_write_part + (tdep->ppc_gp0_regnum + argpos->greg, offset, len, val); argpos->greg++; } } @@ -1352,8 +1351,8 @@ ppc64_sysv_abi_push_freg (struct gdbarch *gdbarch, if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) offset = 8 - TYPE_LENGTH (type); - regcache_cooked_write_part (argpos->regcache, regnum, - offset, TYPE_LENGTH (type), val); + argpos->regcache->cooked_write_part (regnum, offset, + TYPE_LENGTH (type), val); } argpos->freg++; @@ -1802,8 +1801,8 @@ ppc64_sysv_abi_return_value_base (struct gdbarch *gdbarch, struct type *valtype, offset = 8 - TYPE_LENGTH (valtype); if (writebuf != NULL) - regcache_cooked_write_part (regcache, regnum, - offset, TYPE_LENGTH (valtype), writebuf); + regcache->cooked_write_part (regnum, offset, TYPE_LENGTH (valtype), + writebuf); if (readbuf != NULL) regcache->cooked_read_part (regnum, offset, TYPE_LENGTH (valtype), readbuf); @@ -1878,8 +1877,8 @@ ppc64_sysv_abi_return_value_base (struct gdbarch *gdbarch, struct type *valtype, offset = 8 - TYPE_LENGTH (valtype); if (writebuf != NULL) - regcache_cooked_write_part (regcache, regnum, - offset, TYPE_LENGTH (valtype), writebuf); + regcache->cooked_write_part (regnum, offset, TYPE_LENGTH (valtype), + writebuf); if (readbuf != NULL) regcache->cooked_read_part (regnum, offset, TYPE_LENGTH (valtype), readbuf); @@ -1983,8 +1982,8 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct value *function, int offset = (register_size (gdbarch, regnum) - TYPE_LENGTH (valtype)); if (writebuf != NULL) - regcache_cooked_write_part (regcache, regnum, - offset, TYPE_LENGTH (valtype), writebuf); + regcache->cooked_write_part (regnum, offset, TYPE_LENGTH (valtype), + writebuf); if (readbuf != NULL) regcache->cooked_read_part (regnum, offset, TYPE_LENGTH (valtype), readbuf); diff --git a/gdb/regcache.c b/gdb/regcache.c index d8fb36e..758f21c 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -872,13 +872,6 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len, } void -regcache_cooked_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf) -{ - regcache->cooked_write_part (regnum, offset, len, buf); -} - -void regcache::cooked_write_part (int regnum, int offset, int len, const gdb_byte *buf) { diff --git a/gdb/regcache.h b/gdb/regcache.h index f1a3b24..064930c 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -62,12 +62,6 @@ extern void regcache_cooked_write_signed (struct regcache *regcache, extern void regcache_cooked_write_unsigned (struct regcache *regcache, int regnum, ULONGEST val); -/* Partial transfer of a cooked register. These perform read, modify, - write style operations. */ - -void regcache_cooked_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf); - /* Special routines to read/write the PC. */ /* For regcache_read_pc see common/common-regcache.h. */ @@ -315,6 +309,8 @@ public: operations. */ void raw_write_part (int regnum, int offset, int len, const gdb_byte *buf); + /* Partial transfer of a cooked register. Perform read, modify, write style + operations. */ void cooked_write_part (int regnum, int offset, int len, const gdb_byte *buf); diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index a894b4b..a3a3cb6 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1723,10 +1723,8 @@ s390_handle_arg (struct s390_arg_state *as, struct value *arg, /* When we store a single-precision value in an FP register, it occupies the leftmost bits. */ if (write_mode) - regcache_cooked_write_part (as->regcache, - S390_F0_REGNUM + as->fr, - 0, length, - value_contents (arg)); + as->regcache->cooked_write_part (S390_F0_REGNUM + as->fr, 0, length, + value_contents (arg)); as->fr += 2; } else @@ -1749,9 +1747,8 @@ s390_handle_arg (struct s390_arg_state *as, struct value *arg, int regnum = S390_V24_REGNUM + use_vr[as->vr] - 24; if (write_mode) - regcache_cooked_write_part (as->regcache, regnum, - 0, length, - value_contents (arg)); + as->regcache->cooked_write_part (regnum, 0, length, + value_contents (arg)); as->vr++; } else @@ -1980,8 +1977,7 @@ s390_register_return_value (struct gdbarch *gdbarch, struct type *type, { /* Float-like value: left-aligned in f0. */ if (in != NULL) - regcache_cooked_write_part (regcache, S390_F0_REGNUM, - 0, length, in); + regcache->cooked_write_part (S390_F0_REGNUM, 0, length, in); else regcache->cooked_read_part (S390_F0_REGNUM, 0, length, out); } @@ -1989,8 +1985,7 @@ s390_register_return_value (struct gdbarch *gdbarch, struct type *type, { /* Vector: left-aligned in v24. */ if (in != NULL) - regcache_cooked_write_part (regcache, S390_V24_REGNUM, - 0, length, in); + regcache->cooked_write_part (S390_V24_REGNUM, 0, length, in); else regcache->cooked_read_part (S390_V24_REGNUM, 0, length, out); } diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c index aa50126..e764c65 100644 --- a/gdb/score-tdep.c +++ b/gdb/score-tdep.c @@ -445,8 +445,8 @@ score_xfer_register (struct regcache *regcache, int regnum, int length, regcache->cooked_read_part (regnum, reg_offset, length, readbuf + buf_offset); if (writebuf != NULL) - regcache_cooked_write_part (regcache, regnum, reg_offset, length, - writebuf + buf_offset); + regcache->cooked_write_part (regnum, reg_offset, length, + writebuf + buf_offset); } static enum return_value_convention diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c index 583cb62..80458ab 100644 --- a/gdb/spu-tdep.c +++ b/gdb/spu-tdep.c @@ -1356,7 +1356,7 @@ spu_value_to_regcache (struct regcache *regcache, int regnum, if (spu_scalar_value_p (type)) { int preferred_slot = len < 4 ? 4 - len : 0; - regcache_cooked_write_part (regcache, regnum, preferred_slot, len, in); + regcache->cooked_write_part (regnum, preferred_slot, len, in); } else { @@ -1368,7 +1368,7 @@ spu_value_to_regcache (struct regcache *regcache, int regnum, } if (len > 0) - regcache_cooked_write_part (regcache, regnum, 0, len, in); + regcache->cooked_write_part (regnum, 0, len, in); } } @@ -1540,7 +1540,7 @@ spu_return_value (struct gdbarch *gdbarch, struct value *function, { case RETURN_VALUE_REGISTER_CONVENTION: if (opencl_vector && TYPE_LENGTH (type) == 2) - regcache_cooked_write_part (regcache, SPU_ARG1_REGNUM, 2, 2, in); + regcache->cooked_write_part (SPU_ARG1_REGNUM, 2, 2, in); else spu_value_to_regcache (regcache, SPU_ARG1_REGNUM, type, in); break; diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c index 274b02f..efb8b05 100644 --- a/gdb/tic6x-tdep.c +++ b/gdb/tic6x-tdep.c @@ -760,8 +760,7 @@ tic6x_store_return_value (struct type *valtype, struct regcache *regcache, if (len <= 4) { if (len < 3 && byte_order == BFD_ENDIAN_BIG) - regcache_cooked_write_part (regcache, TIC6X_A4_REGNUM, 4 - len, len, - valbuf); + regcache->cooked_write_part (TIC6X_A4_REGNUM, 4 - len, len, valbuf); else regcache->cooked_write (TIC6X_A4_REGNUM, valbuf); } @@ -957,8 +956,8 @@ tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function, so, we write the contents in VAL to the lsp of register. */ if (len < 3 && byte_order == BFD_ENDIAN_BIG) - regcache_cooked_write_part (regcache, arg_regs[argreg], - 4 - len, len, val); + regcache->cooked_write_part (arg_regs[argreg], 4 - len, len, + val); else regcache->cooked_write (arg_regs[argreg], val); } @@ -988,16 +987,14 @@ tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function, if (byte_order == BFD_ENDIAN_BIG) { regcache->cooked_write (arg_regs[argreg] + 1, val); - regcache_cooked_write_part (regcache, - arg_regs[argreg], 0, - len - 4, val + 4); + regcache->cooked_write_part (arg_regs[argreg], 0, + len - 4, val + 4); } else { regcache->cooked_write (arg_regs[argreg], val); - regcache_cooked_write_part (regcache, - arg_regs[argreg] + 1, 0, - len - 4, val + 4); + regcache->cooked_write_part (arg_regs[argreg] + 1, 0, + len - 4, val + 4); } } else