From patchwork Wed May 30 19:03:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27583 Received: (qmail 44014 invoked by alias); 30 May 2018 19:05:41 -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 43818 invoked by uid 89); 30 May 2018 19:05:39 -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:37 +0000 Received: from ESESSHC023.ericsson.se (Unknown_Domain [153.88.183.87]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id D4.B6.10459.8E5FE0B5; Wed, 30 May 2018 21:05:12 +0200 (CEST) Received: from ESESBMB502.ericsson.se (153.88.183.169) by ESESSHC023.ericsson.se (153.88.183.87) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 30 May 2018 21:04:28 +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:25 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed 09/15] Remove regcache_invalidate Date: Wed, 30 May 2018 15:03:47 -0400 Message-ID: <1527707033-27183-10-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:ugrJtIvpS3jjvmZ0BfI/i5qcrq7MZfSmr1UriiFdFdag8axzmWGCXqcA7U5YHyYZRE+7XUvzFRzTDolndBUmXSXL5aWxHrkvqk3I2vZI85RslHz51uJp3Z7tKiFnqugx8/24IFmn7aULQjzeUwAB+EcNIzndY/WKXB30rcjgaBPkH2snt6Eo6M5xQQE8/5OCe6K7Wn0zdPOb8L1Qq4b9hjfjJB4MV7jOR9bMw4mRyQEohHc/AAa7rHJvEtKdw51Q; 25:zoaSH1q5B67NefmYx/xRt1PzX1DPnUNPk6U4RTu3wIkC7Xs07Bff+cOATYGZQcsQNzCPVJ4aLtUC7KTQ/z2z7HMGbW5YCGfo9hDD/cWavl+rjV78VovYaTvi/skDNMETOReoQqQI5QZMFp0KRC833kUiclj5qhX62NfcwkQc3O29aEpV9QyazxlLSUw4MSy8JCATmCz6SL/3JrGQdZF9HIZKWC67eAWiTI5obKfAqfdhn3oyoLHCED2zQjnUk9BLs5qowCtFZTtyct9TNdN3gJxgQaALhDPbbNPeQtkgn/TCO2VNjAmdwnBPthb9+CFPaNGJJ8wmbTQw3qaIGQGRtA==; 31:HrULgkUTKrLvLXC3eArBnHQtolQ79H7TueAjmVQNYBOB/vXprOYMEA+iQAZleh4v5FinZBZrMYjk7JROJNhNy7Jwiwp+TeT9P/DvtwE5SrbgBbi3DKabXF1mwmvFepsglaWS+nQ+wWx4fuib3gLR5AoEq/Gy1Tp7xjgIgubpUEWcWp3ZF0vOwUaIDskjkWUvqIqUiFtrPEj7e3xR14OLNy+B3qPsyYniDarKJUTQS6A= X-MS-TrafficTypeDiagnostic: BYAPR15MB2392: X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 20:NVT6xS/0Mc7Vt1OFJwPtXmhhGuX3KBv2Q/Iyj+jzo18EL6vytM9m8C3Pm40BRZV80bb7vBG6kwBNf5meytDboUf+C0zF+6a03nN7O9v28A/srk3CN6eLAywfrdknnocmRI7hI7xc8S+l1WRv+o56N6TY/ELh2xcn8Dvz25Hl/cIp0VqpsgpPIVDlVDhFKUNcDAdG/sSH8sXj6SNeucU9xTMrG5+SECkNbF/56dylfxPl6vl+Y357f32k90r7yF/LdWVKZsUoIwCHB6peF95pjQwNckcG6iFwZi1sKzZeoGnJJlfx4ZYhTzxkGoc1VRE1+EBeJezW2ez6QbLPl4DI4hj+MhvRCxn0xtG1Jv52Gy4hf/S02oIpBBXoOup0eRebtb3Hxt9wi8zUrm9+YTetvn92bVNo2gn7xXdtJpdLWLvcLveKS11c0FE25b+U0YhbtNbc3ZTAyGM1fbc3T0wuaFNyrF9TvBMbkn4mNNzgyQ4JuFJeBDVUq/yULuAdqlJ4; 4:vVb/hAalGr9eQC3vFDuaTlkBA5yZsinsXlqzaaOWSbucNRIGFTwWyTIEuoZyo7zXzQ47TEQAnY+H028lIY21djf3PiplKdTHMT1XAXtZ9FitxxYKdwALfhbLLZeR0Fqv0Z0Nu90deIY58aE1q7PazqQYjFq4AYgANUXOFknsk7mMJ8/isSDM13ArdETpvTTxjvcpACTAC1z6jN0TKMjRFSJ3gKcIBPwARbgf9bpwIvfv7GI386BSESRr/lsd9/ZRCbXoEf6hnGzhkJDVVKHn2xzxI3jwCTyL0Fibd0gFZmNmORjTNCAItRNUdsoyT8zl 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:RL/t7ABjuY7HtyJkNGts2ZYqaQoSdk5Z0/h6wqeVT?= =?us-ascii?Q?UlhadebViEq1C0Cf4V31uBq7C3Lj/H991tnx9iceD5+EelkAwK7iBADLj4du?= =?us-ascii?Q?aiFxuhpZxHgnOUiK1bQvisDxbHj9TpUpxhpGGXZhgruB2PrXWxOy14+fZaDG?= =?us-ascii?Q?G3Aec9ZRNJgsWCsaUmq/0+lWjrvXNbJxWG+KoLNP6zLwGfQwxVWtIrimrVge?= =?us-ascii?Q?Vx425debJRDDuSLivdNGRkxUIhgdPtyhszmq8K6/CWT123KbQZ/sf5bdvCTu?= =?us-ascii?Q?nZub2xYr+k87vczLdvC+CjeKGSzwkNY2ScSSL6Lkh8WODvbDgqWpQOLeeYwt?= =?us-ascii?Q?glYU2KpabnUClvKPZKbjqtwmwXdR8o7jnZItLCzTtV1jXyOze+yJ5l49Ljbr?= =?us-ascii?Q?E3IAiCGeaFiY9FqmIXvLRYwibP2EZrFey9PW8qoOToO7W2JUnogsIII05HDc?= =?us-ascii?Q?o8vS2OMVZi2WquWSI9b/ElRxrIkLwNKhdOj9VAcsWMzk5CRgbiqtlfojnY6f?= =?us-ascii?Q?RjxX2TZfcfrucI4YDG1aPXzruvAgvMn8bE/Fe9xDtHWif2DRsHfve12x/5eu?= =?us-ascii?Q?nKu3jGAwjn+I9Ay+gOOHt47Kc3gSzm4OvA8lali2xmoF47oi+AlYzGLzO6ul?= =?us-ascii?Q?G/tb+SOyEXDQyy3O6JVbWsmPvxsvW9EpxsOrmd/H9LBjQXKm2fFGfBsD9/40?= =?us-ascii?Q?m/pWtQVpRYvfXcAfK5A+TxUcyanBeWNn1F6fAk1k4N7wugHR52mh3Yra4Ono?= =?us-ascii?Q?jf5lZLzv/zUfC69HdgPD0nZ75FvMMX6S3tn2OYHMJnBCyX1K0Fe8B8QDUKBy?= =?us-ascii?Q?X+vUbusqeNnPuznEFQwXRWgCnqRpV2utsiUldVpCirms9nbQk2dsZAhUi2Rh?= =?us-ascii?Q?8A9YPNhjciM4z+PcLe2MQ1mrXggYX+qviE9+I409R3RbbNilBij7w3oNh/UY?= =?us-ascii?Q?014+vfjouQRseI9iuIrvwy/xXKdgdvvFLnF3W80G+dtbAWHbPc5vHUbl1KUt?= =?us-ascii?Q?+d8zMKhqr91rsICVsjaBq01R6ANM+q3hUcqFByje9y8ZB5ChAJSGI2twfBvw?= =?us-ascii?Q?dit730m6lvk1duMNlJaI7xOxPs9lnkqqVqX9qSplTZFY/OCdvi2Dk2eFuF7F?= =?us-ascii?Q?O17vYPUqSfpZ6/GhD8esriD0fIwAzaq/Z3xJA7Dp6m5QURKHxHruLxpvkn16?= =?us-ascii?Q?DbV+zoFFOG21EgbFNOWQyQO6kLRJkGiQAOeo7VnlWZjlqLkooa4BSIlhDr0b?= =?us-ascii?Q?2N1Ad7z/MlRed8gnYT+BjGUrsUXdQ7hSlSjvKp/EaYsBuzF16NDVDYCAh4jt?= =?us-ascii?Q?dIGC2a6PC3yGPwdRZLiFfyxkcStXBrDVl1l5yMIhNNY?= X-Microsoft-Antispam-Message-Info: bMh+Cb3uRWkYTA8l+nc+6Bq6q0jyKwx7v4bFScRIoXQjZb7N015y1/ak7P7yKT6ElS5Tr3lkH+tMw4rv/SFMlSXjspuiu/ZRsozrHTiS/nGZmknHwxkOrLtFzJIhycPTwJeE4eZGHF5Bk6lbJ+s9AbBSoM7I5mcWrx3/aRlbpo+J0hjfzwLhCoptzT7/t/s2 X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 6:RfoU3McurB1BsLn2SCmivgHhiFgUvfwJ4eYl63atx4FvMoBkbMDn5zJd4fGY3qymonQCAxdP+TvJmNc3z+xUP3hM5wHui545Euc60c3lRkGV//Xa2yAg5g3ZDIaIjKJIeqxPaqNnCRvEppZKj9lURRGJgonSwQSPCgB5wMsDT/MdxIgMxt2wF6E0uoS9M1sJTabc4yzkBoyI7orLw8+Be/71/hYGn0h4EKvce4JO9HB2zE7o2l6Tht2bDbs8xBsNPc4d2B5VF0Jt+Elfb0+yPlHBRpmuSAJhOZ5UoBWkg482+UWEQv+9T0JP4NQaYznBRitd+JnHfuplLQmyzpnBp8Z2rvUAttG2Kjo7FWu84kG+TVk8DuYyz+SQlu0izkpBKBD2pUbzy0y5+4MzeT8+a7Jhskd/mpjsZKI2nU22PIveKCtu2hAypipnqLsxZJu6NgPgMQWG3PUTHskgnMrDOw==; 5:VNjU7gdvLSxa041tWAHqTwM2AD7FHiA0Dm9keDfxW0Dt6uPGmlSggNVvDB9vZJnwJh1Dlpin748fdJ5wv8Ku1Df6ScuMRskMdMv7iUjbeGf0n0topPRHDn4glNRAGR6efiIYSbvpxbL9Fay3J90Xiaa4NEW9taVPSInAY62Kv6A=; 24:ahq6ljFhaqfZR5+FlgXKFQ2rsA6xY6NkZ3xf3IZvQgEa6Z6T9Ab5E6JduJJZo2nEy0NYH5WTSHEE4pRLcMs1aFc9q/F3OznR4TQWP0Fb0Ag= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR15MB2392; 7:6eG7YNL9BBlLe+nfIM/kSvI4qqRDn/sqwwC26C2T+f7zyzpzvtvEzGLqs9sn/kGjeV4CSjUyIqOTbW98grF48mAX3fKRXUdko5LClLEWX01EOqEGEhf9KzVl7WDAVW+msUrUVY3qe5UkZOdeLyrM9I1FUq6ekPG7Wh5GsgesF1VJeCZLubZfkCb1FHR/5uYMI93rdyXkJp9tU3r5/1br3/z4FOo67ZqzNnNLNsWQMstEtcgS7THoC6tcpQGZsRP9 X-MS-Office365-Filtering-Correlation-Id: 6694613b-ba43-426d-4e4c-08d5c66029cb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 19:04:25.9392 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6694613b-ba43-426d-4e4c-08d5c66029cb 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_invalidate, update callers to use detached_regcache::invalidate instead. gdb/ChangeLog: * regcache.h (regcache_invalidate): Remove, update callers to use detached_regcache::invalidate instead. * regcache.c (regcache_invalidate): Remove. --- gdb/ChangeLog | 6 ++++++ gdb/record-full.c | 4 ++-- gdb/regcache.c | 9 +-------- gdb/regcache.h | 2 -- gdb/sh-tdep.c | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1ae322..d0cc45a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2018-05-30 Simon Marchi + * regcache.h (regcache_invalidate): Remove, update callers to + use detached_regcache::invalidate instead. + * regcache.c (regcache_invalidate): Remove. + +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. diff --git a/gdb/record-full.c b/gdb/record-full.c index b8460d9..8c0534e 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1609,10 +1609,10 @@ record_full_target::store_registers (struct regcache *regcache, int regno) for (i = 0; i < gdbarch_num_regs (regcache->arch ()); i++) - regcache_invalidate (regcache, i); + regcache->invalidate (i); } else - regcache_invalidate (regcache, regno); + regcache->invalidate (regno); error (_("Process record canceled the operation.")); } diff --git a/gdb/regcache.c b/gdb/regcache.c index 371322d..4dce978 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -238,7 +238,7 @@ public: ~regcache_invalidator () { if (m_regcache != nullptr) - regcache_invalidate (m_regcache, m_regnum); + m_regcache->invalidate (m_regnum); } DISABLE_COPY_AND_ASSIGN (regcache_invalidator); @@ -329,13 +329,6 @@ reg_buffer::get_register_status (int regnum) const } void -regcache_invalidate (struct regcache *regcache, int regnum) -{ - gdb_assert (regcache != NULL); - regcache->invalidate (regnum); -} - -void detached_regcache::invalidate (int regnum) { assert_regnum (regnum); diff --git a/gdb/regcache.h b/gdb/regcache.h index af3adf8..64e4cd7 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -50,8 +50,6 @@ extern void regcache_raw_write_unsigned (struct regcache *regcache, extern LONGEST regcache_raw_get_signed (struct regcache *regcache, int regnum); -void regcache_invalidate (struct regcache *regcache, int regnum); - /* Transfer of pseudo-registers. The read variants return a register status, as an indication of when a ``cooked'' register was constructed from valid, invalid or unavailable ``raw'' diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 7946430..97e4a75 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1703,7 +1703,7 @@ sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, regcache->raw_write (BANK_REGNUM, buffer); for (bregnum = R0_BANK0_REGNUM; bregnum < MACLB_REGNUM; ++bregnum) - regcache_invalidate (regcache, bregnum); + regcache->invalidate (bregnum); } else if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM) {