From patchwork Wed May 30 19:03:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27585 Received: (qmail 48511 invoked by alias); 30 May 2018 19:06:27 -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 48265 invoked by uid 89); 30 May 2018 19:06:25 -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=Sign X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 May 2018 19:06:21 +0000 Received: from ESESSHC021.ericsson.se (Unknown_Domain [153.88.183.81]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id D4.8D.13413.A26FE0B5; Wed, 30 May 2018 21:06:19 +0200 (CEST) Received: from ESESBMB502.ericsson.se (153.88.183.169) by ESESSHC021.ericsson.se (153.88.183.81) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 30 May 2018 21:04:27 +0200 Received: from ESESBMB503.ericsson.se (153.88.183.170) by ESESBMB502.ericsson.se (153.88.183.169) 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:27 +0200 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB503.ericsson.se (153.88.183.170) 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:27 +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:24 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed 08/15] Remove regcache_raw_write_part Date: Wed, 30 May 2018 15:03:46 -0400 Message-ID: <1527707033-27183-9-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:stk297dAMxX6k7+Gm9AOIH9qM44gDHmht0XDwmVddBPG/IEgB/CIZNJxJlzhIxqm4I3r5PPhbusGuP3jFSDtYLE/5z1oBH+NsNmJHFLGbWvpdCD6dXxQmnbr5FF8nP344RvppvB2CtGcn+PEtjHtEBvHZ4h1lIQvHTln+DIZGSh2acXajPRyHZn1FL1/9/CwO9dYck/TF5KBrQPGUU9A3osWtqYrjhpjOeiijH2dNr9criQYTQKa2dQqPSAA//si; 25:EtfV6bDvuI5RxTc2LZLo3bsJtm6xkfs4mDajP7HqQOCrlaQXqCZnWbs9yyfTK3LsZfeEAmmKWjwpu2cbxmvSB1T5xS1f6ScnkvGTkd80fzF7WTr0r5zb4pPfp8D8X2S28+PE6Ddnx8WlZjPWuRGQFpUhdv0hoBMkM+9rwI+k33E4nXrrQ+umgghd/qfQ8D362wZQh0q00j7Hhcp5AHDSmnAivfZv6s93pPvW5WLPpH67E7TcbiYV0bPjdFfeOXSjugvbgW5pNlzO3KotShOLtrDSnzTss5TJz44zX0FAS+46+uGpgzEDYs5WruU2i5TOr8uYHpSVuIRHksGPQ7q4+w==; 31:7EewFFAVD0Pl7vpEkl/gjFxu0sLbRBScCJnf6c8q/jJenxTtB5seaTOjbdqX6JHpF6XqU0ZoQ2Saanelpw0zrwJN0dE++a26A/28qsYSJAbBzp7oOJt9zC7U2s+egnIIgI1SWYfAj4Iwjc5t9G3AtzNCyOGaiUGTBL4Zsp/kxlWluMn+78KpCuWujmFG52JkA9l1CCVVycq0M6bvJKtu4QntdlLXHCxNpOpIcUx+lRc= X-MS-TrafficTypeDiagnostic: BYAPR15MB2392: X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 20:W5NTyjDBTmWfDgnEpYlXx6GAuDk1SMDGmr/KMafz7raA8HhnebA/IknVM2QQ/LlsGi9C9Sf4HMV5RoEU/aEEQlfwVWeiHczYQaGKDhPxPGcWbnpk1sd4wR6ZR6w635wzZRBGSNNIUtfzrHcxsg0XPic04KizPDzrhfZl0CK2rsXouHpIqMTkCY8aQfEdBAaWBkLFSw7Kn8U39zi9OKY9s6DWc5+M+4NtxZJSme/l9MlqTGBFCv7kHFFWX3OulZ86f+sbrAdcJn1gCtOSkT9UC6klcIBnSQLfs1Um/1awwwK6HS33Rp+2DHqDye/e9IyBiHVYMlOKdjxtGZBSC5gYN2YUbyyUS/akPhUM3QxhayrrwxOY3Z3q9vvJJJSzb4aLCqdGEYEOdpJl+t+MsRg1oobpUB6caV9tu/C8ztg+e0tsKV1lx5F5IgNDOwpubM9ZMRkbDnZDnzTTTwSFxs2IqK44kLEYpFY4DzbMinpE44u8wYAhR8u5XmfOjrOAmlvr; 4:1N+8Ww+1dOtv3r2u+rROBIz2xJhV9l6HAzb4j0xQcBgDuRkcHCgf7uijEC6blzLyMbbHLDC2IUA+uUfyY0UzbvB+HvCtkIDqiBI0sRck2nfo690AGyM92YMPFiV+p0MyJ7uXxLocCOY9xwBRrnQ3smX8tiu8a96vIMs7v/tBXC6xuatkxVri3KNgPlxtX1QudODfemqCB0ogRoYSfIQ2zblRcG/1XCEml0rDjqP1TxDss2dERo0Av3qVjJdLb7DBRoKwBHkp8TRrZVVYCMj2SIk9Unxpteaiy3nMKiev3FkRBZVDMa0rOtVobQchv3c7 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:MugUzXW+qVho6WxtRUvA8gbBNbxEyzFVyrsn/npqg?= =?us-ascii?Q?i7/kWy3/iUbWbclEgMUpOyq6OeeCgfT17JMhpRSgOenaZstZ+SeksMoLYR62?= =?us-ascii?Q?jEPrFJcJsBTZvR4cAnzCviAPqraa4JUWgdCfpvJLwCeyY9FokZQX+o9jSbxD?= =?us-ascii?Q?On6bos/1J5pRVPvdNZnjaUpK5LEkq2S7ajfTDz+hOkic3YtzOTKUE5rMRdkp?= =?us-ascii?Q?bNeopirFRvs/vDXAU3y+Ca9mmMUuEdM867DmpihaXC8Dh7djVtnLe3GbUWRm?= =?us-ascii?Q?vqhGP7FBXJCB/2tsS34dcpyephPe4JmnHjJFa/SAp6Ct4AVdmIDnXmkkF8Eq?= =?us-ascii?Q?3hnRRiJubzPVj2UoOLbJTGj+VPBwH1FSKlvJczpPw3EOq02kUsrS0wgOc8hj?= =?us-ascii?Q?4585th/5Mv3IPL/71+YFt5VSnFmGY5ACKesj/VMZhryujkYHfVpqN8S6/+5b?= =?us-ascii?Q?jesrfZayJdFDqQVxexXtMxHLCQK4Gw6OkZqYhpgWqHuwzMpEfwFBkvB1Bs8C?= =?us-ascii?Q?5aIUy5RpvnjZ0DSpnziEESswSJ3xxwHzwQomtzdimxQWoU8vS4btgQ630vsr?= =?us-ascii?Q?Gh6uOrST2bWuE3VRicpeSI7T9Giwahe1styTEaujOsXf4MMXA6KK3JHAC5vr?= =?us-ascii?Q?L9tZ4krgac3CdBAUVrW9IacVQBRsSxrEISpL8sbcI7NudDqX3Xorq8OvL4NZ?= =?us-ascii?Q?E4Ld3QnnQafbj4xFuWZAVBM/EmYq3+o1599KMPQpBYfoyikVIzHTwObrC63e?= =?us-ascii?Q?L7sN8NXSsx7XGeng4XmjDGuNZx8sVSVHlqRi0QfIB+NdblwmPk1Zsd+/+eBg?= =?us-ascii?Q?5ybusrxTPyYq1p+rDVg06Ho/eHjLbjTNz4MhdvbibZy8iQVxIsTHknhji/DW?= =?us-ascii?Q?60KtFY8Rh3lr9XIdCg6rN22dz8IQOv1hkF7CE6bhfmPmL1P2U/w1uPJVa3z3?= =?us-ascii?Q?E/5VJLoryZaxtj0dFq+9esPrE7qio5t1tXaoErmLCk0ooGgtTaJUt2YrfXuM?= =?us-ascii?Q?/M42yDT5e6k+GQjoU9u/w6jeHtL+tGogtlbVbChtLEv0TM2lMpxHD0tB9KnA?= =?us-ascii?Q?bF8UQfcpRUYPPw++S0C+JvsmH0y12uqHf3rGaFYZen9gssHAjSfA6Zu6dEee?= =?us-ascii?Q?7H4wC3AyNydKN9dwYtBOJcgu3+vuZhvI37HwrOq/X8hV5BVTRgzwHPWhtwLg?= =?us-ascii?Q?BRM3IXWq+YstH7S3tpqpNmyyeifhEai7vcRqxZc5bM/x7MwKqgYFuT1F2X2Y?= =?us-ascii?Q?Lm53dkG6Hm2c7Ja7+xhreayTMhUfe/kEFWlwk59Im15/jmP/x2wDLSZJEjtP?= =?us-ascii?Q?2bmESzRcU0Qex+GQWtIlM/3zKWzpUX0ngfRN/ZT+Vlh?= X-Microsoft-Antispam-Message-Info: gruyJTXCuXjI4P5g/doiHI5kaWqZJQLmF07+8cCeGdM9J7EulM+AxDVypbTSaSRLnRvkgQLQjftKLEPnn/ufXv0R+IHzMeIt+v7DtKYIrlt7LClAyFHsw+0hgAyZxJ7A4AfClafmeyeRRZlahY2LKQji/EgQ+YJHcXt2v/5LhK2Vf0/ylN3R1Yj4mQptMRWI X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 6:9nBI74HPuNipA/lK5NppkAy+/Y5ObH2HvYBInDMq127UaGFvkP3G5sHezHJ+uwwjBmjRs4GJFGU6gdVqlr2g+iwXNggvpHOGp1b4C9j9tkKtrRgqv0lTgaXlpI1Tcdbs+VngHuS/sSPvW9/U6VzVPBvfldstlSjuoKWmANCOOewWVR0l7HQ/j7rwqmWFLbB7roof9THRujgx8AZQvGGDq///3wkGGwRJBhUMFbmRLBYWIzTnNKTgo1MgeNtFAtnOuQrEiWm7jW4pW5SZIJjKlJFdJDz8jYa5mkAQkWKXJQotMjVsiTg6KOcFIHjOJmiSKTmYnX3HdOCGFRsi+/p6tBM6vGeG3AxinnAWV5kdg+sqYOuP7DmwX5sxf60PaNw+8cJtfVssOaw4yjJcqwgZYpgC8Wt3/ZvLOoyzNosvXq9IH/qOJQQ90RmWPr8sdOTBNza8Gwc1KvCtTJ3ezWRWYg==; 5:kwjTHvoXL7WVUr99zsrNzwU7rTNa+LromQY4F9mZ8zZwS98DAkbZqtCgK9DdV930ttWuHDgoGOJYsfLGOD4PpQeI+lSXqkOfJB8MzL4rM4gQ1j53Xnl6ycRWZ8c6avOrLGBXWgMPlb5ZLf4ZdVEIkz9z2K0gbhdNZ2j83jIMdfs=; 24:95ARRRVE3jjynkATvzKpz63A8SfGc2URcr61Yx7FeyoTiUbFS04bZKnevS7f9peKdRsSkgIU6DRruIB9Gp49gAtp+0iBfm5W3+LmkBhGmds= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 7:/jaFDSgxrx8GUK87H656yDrRO8nTnDeyF1UUzXExP6BkxcQsuw5QbI0ly6x7Kp70na7hoZre75IiIWs5JJK505JxcW47J8kvjfN3vVSCBfYLbll9UiOtWVxW/bdEC0W/nLi1W7kmbc1TbdVjKOhnOWjfiaKYrBXzWG1w+IpTgBmBNtLO5HMQbm8Yf3Dbgp0ew0Mu7HE8EMKIkFs0hVAF3Z2JFdjsnYR2pw9yKCT1rM9ImyPOZap9W2WcGRIwc/YM X-MS-Office365-Filtering-Correlation-Id: dc29f282-c004-42dc-de49-08d5c6602939 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 19:04:24.9861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc29f282-c004-42dc-de49-08d5c6602939 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_raw_write_part, update callers to use regcache::raw_write_part instead. gdb/ChangeLog: * regcache.h (regcache_raw_write_part): Remove, update callers to use regcache::raw_write_part instead. * regcache.c (regcache_raw_write_part): Remove. --- gdb/ChangeLog | 6 ++++++ gdb/amd64-tdep.c | 6 +++--- gdb/amd64-windows-tdep.c | 2 +- gdb/i386-tdep.c | 6 +++--- gdb/m68hc11-tdep.c | 5 ++--- gdb/m68k-tdep.c | 5 ++--- gdb/mips-tdep.c | 2 +- gdb/mn10300-tdep.c | 5 ++--- gdb/regcache.c | 7 +------ gdb/regcache.h | 9 ++------- gdb/rs6000-tdep.c | 5 ++--- gdb/xtensa-tdep.c | 2 +- 12 files changed, 26 insertions(+), 34 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e7a57c0..d1ae322 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2018-05-30 Simon Marchi + * regcache.h (regcache_raw_write_part): Remove, update callers + to use regcache::raw_write_part instead. + * regcache.c (regcache_raw_write_part): Remove. + +2018-05-30 Simon Marchi + * regcache.h (regcache_raw_read_part): Remove, update callers to use readable_regcache::raw_read_part instead. * regcache.c (regcache_raw_read_part): Remove. diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index dfd1118..9a1e68e 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -847,8 +847,8 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function, regcache->raw_read_part (regnum, offset, std::min (len, 8), readbuf + i * 8); if (writebuf) - regcache_raw_write_part (regcache, regnum, offset, std::min (len, 8), - writebuf + i * 8); + regcache->raw_write_part (regnum, offset, std::min (len, 8), + writebuf + i * 8); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -956,7 +956,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs, gdb_assert (regnum != -1); memset (buf, 0, sizeof buf); memcpy (buf, valbuf + j * 8, std::min (len, 8)); - regcache_raw_write_part (regcache, regnum, offset, 8, buf); + regcache->raw_write_part (regnum, offset, 8, buf); } } } diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index bf351ee..7e0c086 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -331,7 +331,7 @@ amd64_windows_return_value (struct gdbarch *gdbarch, struct value *function, if (readbuf) regcache->raw_read_part (regnum, 0, len, readbuf); if (writebuf) - regcache_raw_write_part (regcache, regnum, 0, len, writebuf); + regcache->raw_write_part (regnum, 0, len, writebuf); return RETURN_VALUE_REGISTER_CONVENTION; } } diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 353fb89..cdb5fc8 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -2880,12 +2880,12 @@ i386_store_return_value (struct gdbarch *gdbarch, struct type *type, int high_size = register_size (gdbarch, HIGH_RETURN_REGNUM); if (len <= low_size) - regcache_raw_write_part (regcache, LOW_RETURN_REGNUM, 0, len, valbuf); + regcache->raw_write_part (LOW_RETURN_REGNUM, 0, len, valbuf); else if (len <= (low_size + high_size)) { regcache->raw_write (LOW_RETURN_REGNUM, valbuf); - regcache_raw_write_part (regcache, HIGH_RETURN_REGNUM, 0, - len - low_size, valbuf + low_size); + regcache->raw_write_part (HIGH_RETURN_REGNUM, 0, len - low_size, + valbuf + low_size); } else internal_error (__FILE__, __LINE__, diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c index 064bf5e..1490ee2 100644 --- a/gdb/m68hc11-tdep.c +++ b/gdb/m68hc11-tdep.c @@ -1259,11 +1259,10 @@ m68hc11_store_return_value (struct type *type, struct regcache *regcache, /* First argument is passed in D and X registers. */ if (len <= 2) - regcache_raw_write_part (regcache, HARD_D_REGNUM, 2 - len, len, valbuf); + regcache->raw_write_part (HARD_D_REGNUM, 2 - len, len, valbuf); else if (len <= 4) { - regcache_raw_write_part (regcache, HARD_X_REGNUM, 4 - len, - len - 2, valbuf); + regcache->raw_write_part (HARD_X_REGNUM, 4 - len, len - 2, valbuf); regcache->raw_write (HARD_D_REGNUM, valbuf + (len - 2)); } else diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 31c2771..432c37c 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -329,11 +329,10 @@ m68k_store_return_value (struct type *type, struct regcache *regcache, int len = TYPE_LENGTH (type); if (len <= 4) - regcache_raw_write_part (regcache, M68K_D0_REGNUM, 4 - len, len, valbuf); + regcache->raw_write_part (M68K_D0_REGNUM, 4 - len, len, valbuf); else if (len <= 8) { - regcache_raw_write_part (regcache, M68K_D0_REGNUM, 8 - len, - len - 4, valbuf); + regcache->raw_write_part (M68K_D0_REGNUM, 8 - len, len - 4, valbuf); regcache->raw_write (M68K_D1_REGNUM, valbuf + (len - 4)); } else diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 926b084..64b8da7 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -780,7 +780,7 @@ mips_pseudo_register_write (struct gdbarch *gdbarch, register_size (gdbarch, cookednum)) { if (gdbarch_tdep (gdbarch)->mips64_transfers_32bit_regs_p) - regcache_raw_write_part (regcache, rawnum, 0, 4, buf); + regcache->raw_write_part (rawnum, 0, 4, buf); else { /* Sign extend the shortened version of the register prior diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index caaf8d4..edc99a2 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -182,13 +182,12 @@ mn10300_store_return_value (struct gdbarch *gdbarch, struct type *type, regsz = register_size (gdbarch, reg); if (len <= regsz) - regcache_raw_write_part (regcache, reg, 0, len, valbuf); + regcache->raw_write_part (reg, 0, len, valbuf); else if (len <= 2 * regsz) { regcache->raw_write (reg, valbuf); gdb_assert (regsz == register_size (gdbarch, reg + 1)); - regcache_raw_write_part (regcache, reg+1, 0, - len - regsz, valbuf + regsz); + regcache->raw_write_part (reg + 1, 0, len - regsz, valbuf + regsz); } else internal_error (__FILE__, __LINE__, diff --git a/gdb/regcache.c b/gdb/regcache.c index 051bd48..371322d 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -873,12 +873,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf return read_part (regnum, offset, len, buf, true); } -void -regcache_raw_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf) -{ - regcache->raw_write_part (regnum, offset, len, buf); -} +/* See regcache.h. */ void regcache::raw_write_part (int regnum, int offset, int len, diff --git a/gdb/regcache.h b/gdb/regcache.h index 4865d89..af3adf8 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -50,13 +50,6 @@ extern void regcache_raw_write_unsigned (struct regcache *regcache, extern LONGEST regcache_raw_get_signed (struct regcache *regcache, int regnum); -/* Partial transfer of raw registers. These perform read, modify, - write style operations. The read variant returns the status of the - register. */ - -void regcache_raw_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf); - void regcache_invalidate (struct regcache *regcache, int regnum); /* Transfer of pseudo-registers. The read variants return a register @@ -333,6 +326,8 @@ public: void raw_collect_integer (int regnum, gdb_byte *addr, int addr_len, bool is_signed) const; + /* Partial transfer of raw registers. Perform read, modify, write style + operations. */ void raw_write_part (int regnum, int offset, int len, const gdb_byte *buf); void cooked_write_part (int regnum, int offset, int len, diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 594f3c4..2523ff6 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2744,9 +2744,8 @@ efpr_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, int offset = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG ? 0 : 8; /* Write the portion that overlaps the VMX register. */ - regcache_raw_write_part (regcache, tdep->ppc_vr0_regnum + reg_index, - offset, register_size (gdbarch, reg_nr), - buffer); + regcache->raw_write_part (tdep->ppc_vr0_regnum + reg_index, offset, + register_size (gdbarch, reg_nr), buffer); } static enum register_status diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index bee4969..3785c44 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -1646,7 +1646,7 @@ xtensa_store_return_value (struct type *type, for (; len > 0; len -= 4, areg++, valbuf += 4) { if (len < 4) - regcache_raw_write_part (regcache, areg, offset, len, valbuf); + regcache->raw_write_part (areg, offset, len, valbuf); else regcache->raw_write (areg, valbuf); }