From patchwork Thu Jun 8 09:42:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 20847 Received: (qmail 3949 invoked by alias); 8 Jun 2017 09:42:46 -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 3447 invoked by uid 89); 8 Jun 2017 09:42:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2464 X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0079.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.79) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Jun 2017 09:42:44 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0103.eurprd08.prod.outlook.com (10.160.211.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1157.12; Thu, 8 Jun 2017 09:42:45 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::f0a8:fd0f:69e1:e280]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::f0a8:fd0f:69e1:e280%17]) with mapi id 15.01.1157.012; Thu, 8 Jun 2017 09:42:45 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PATCH] Remove MAX_REGISTER_SIZE from mi/mi-main.c Date: Thu, 8 Jun 2017 09:42:44 +0000 Message-ID: <4AA96E9D-7905-4D03-9424-2BC71D117CE2@arm.com> authentication-results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0103; 7:CFRq2p3l1jPDRcvyucdGMih9zmcZZXjez7MHcDK2Pqopx7/c4+xCO0HzxgdPcmIcTzcGwWQw+MYr/a1gWL8VafJJgBBrFi5bh4iINrFyw/IkUy7aDvgZSRn3dypNWKQdeppnWk43ryDsshMmTWaqH1dF/bUkxuY5dkjv3x1h/e2SsFnezfqMK3KK9R4e0UaMXxTHIe2UB4Pvvs1IcOUW/tbjcgGZoVPBWpq+dFtpPkQHtun2g96v8zqktwrYAJvYGRpprlSUyiL9eEp25DMm/Lcgts/K8BqbjKPIPCXKiBDS205ulqDhs+u7Esfu24VZ8cgOZMkVrWzc/fNGhDsgEA== x-ms-traffictypediagnostic: AM3PR08MB0103: x-ms-office365-filtering-correlation-id: 36b7b3be-eb53-4b74-6426-08d4ae52b743 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081)(201702281549075); SRVR:AM3PR08MB0103; nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123562025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR08MB0103; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR08MB0103; x-forefront-prvs: 0332AACBC3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39400400002)(39840400002)(39410400002)(39450400003)(377424004)(6436002)(6506006)(36756003)(8936002)(25786009)(6486002)(81166006)(5660300001)(189998001)(5250100002)(14454004)(2501003)(8676002)(66066001)(478600001)(2351001)(38730400002)(72206003)(110136004)(305945005)(4326008)(7736002)(50986999)(3280700002)(2900100001)(5640700003)(3660700001)(33656002)(99286003)(3846002)(86362001)(83716003)(2906002)(53936002)(102836003)(82746002)(6512007)(6916009)(54356999)(575784001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0103; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <65997967AD39784A9D1579903AADCED9@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jun 2017 09:42:44.9299 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0103 Updated register_changed_p() to use cooked_read_value(). I considered moving this function into regcache as: int regcache::register_cooked_compare (int regnum, struct regcache *prev_regs) Decided not to because nothing else needs it. Would be happy to change. Tested on a --enable-targets=all build No regressions in gdb.mi/*.exp Also tested with board files unix and native-gdbserver. Ok to commit? Alan. 2017-06-08 Alan Hayward * mi/mi-main.c (register_changed_p): Use cooked_read_value diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index bdc5dda30537c7e5797fb8c44b689a63c5c0f4b8..38d737f49f35953c7f5a9c957e918606baac63e3 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1111,10 +1111,8 @@ register_changed_p (int regnum, struct regcache *prev_regs, struct regcache *this_regs) { struct gdbarch *gdbarch = get_regcache_arch (this_regs); - gdb_byte prev_buffer[MAX_REGISTER_SIZE]; - gdb_byte this_buffer[MAX_REGISTER_SIZE]; - enum register_status prev_status; - enum register_status this_status; + struct value *prev_value, *this_value; + int ret; /* First time through or after gdbarch change consider all registers as changed. */ @@ -1122,16 +1120,28 @@ register_changed_p (int regnum, struct regcache *prev_regs, return 1; /* Get register contents and compare. */ - prev_status = regcache_cooked_read (prev_regs, regnum, prev_buffer); - this_status = regcache_cooked_read (this_regs, regnum, this_buffer); - - if (this_status != prev_status) - return 1; - else if (this_status == REG_VALID) - return memcmp (prev_buffer, this_buffer, - register_size (gdbarch, regnum)) != 0; + prev_value = prev_regs->cooked_read_value (regnum); + this_value = this_regs->cooked_read_value (regnum); + gdb_assert (prev_value != NULL); + gdb_assert (this_value != NULL); + + if (value_optimized_out (prev_value) != value_optimized_out (this_value) + || value_entirely_available (prev_value) + != value_entirely_available (this_value)) + ret = 1; + if (value_optimized_out (prev_value) + || !value_entirely_available (prev_value)) + ret = 0; else - return 0; + ret = memcmp (value_contents_all (prev_value), + value_contents_all (this_value), + register_size (gdbarch, regnum)) != 0; + + release_value (prev_value); + release_value (this_value); + value_free (prev_value); + value_free (this_value); + return ret; } /* Return a list of register number and value pairs. The valid