From patchwork Thu Jun 8 12:57:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 20849 Received: (qmail 84627 invoked by alias); 8 Jun 2017 12:57:17 -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 84604 invoked by uid 89); 8 Jun 2017 12:57:16 -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= X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0061.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Jun 2017 12:57:14 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0104.eurprd08.prod.outlook.com (10.160.211.22) 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 12:57:15 +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 12:57:15 +0000 From: Alan Hayward To: Pedro Alves CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Remove MAX_REGISTER_SIZE from mi/mi-main.c Date: Thu, 8 Jun 2017 12:57:15 +0000 Message-ID: References: <4AA96E9D-7905-4D03-9424-2BC71D117CE2@arm.com> <0fd04925-3200-53b9-5a7d-904ea028c3b0@redhat.com> In-Reply-To: <0fd04925-3200-53b9-5a7d-904ea028c3b0@redhat.com> authentication-results: redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0104; 7:HM1/w28soB6WQ+xHUh/JsXPwi0PUlUMlUtRZacGNv5fvrh++cfmdtQar8ZTO0+8DlPivp2sBwZJ9m56nxU6Q0noBZSknrB9KrQtc9CZCyKmnRy7I7xBcpeiBuagGzr4b6xKSCFgz9JaDyCO8fGfUAUdmCkldq9SuYgzRuYOXINXffqMXWdIX9xK09sibt8cujezlDOYPmtSR2KE1+aN2kFiedkrYPFRIa/G40X7Z9gXKXYTopo46NWChYZQO+x4fqJ9/I1hHoJBbx9f3XmM0hOoCeVZ9xcaApBweE+LIXPGEV8B6DE1sICOzvGKlegwIr/BCVJzh1x8SQyGJQkVssg== x-ms-traffictypediagnostic: AM3PR08MB0104: x-ms-office365-filtering-correlation-id: 4f283b26-5f24-4924-1f30-08d4ae6de337 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081); SRVR:AM3PR08MB0104; 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)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123560025)(20161123555025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR08MB0104; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR08MB0104; x-forefront-prvs: 0332AACBC3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39840400002)(39450400003)(39860400002)(39400400002)(39410400002)(24454002)(377454003)(377424004)(3280700002)(2900100001)(6916009)(82746002)(76176999)(99286003)(50986999)(83716003)(2950100002)(6512007)(229853002)(54906002)(66066001)(53936002)(7736002)(189998001)(72206003)(8676002)(6436002)(5250100002)(478600001)(14454004)(2906002)(8936002)(6506006)(36756003)(81166006)(6486002)(38730400002)(305945005)(3660700001)(33656002)(110136004)(6246003)(575784001)(5660300001)(3846002)(86362001)(53546009)(25786009)(54356999)(102836003)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0104; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <658E9C1358985E4EAD2040E4AB2D053A@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jun 2017 12:57:15.0899 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0104 > On 8 Jun 2017, at 10:55, Pedro Alves wrote: > > On 06/08/2017 10:42 AM, Alan Hayward wrote: > >> /* 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; >> } >> > > Use value_contents_eq? That simplifies things! Updated using value_contents_eq. 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..9cbd3a454d20b4429725a00328840e4b4cce47f9 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,17 @@ 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); + prev_value = prev_regs->cooked_read_value (regnum); + this_value = this_regs->cooked_read_value (regnum); - if (this_status != prev_status) - return 1; - else if (this_status == REG_VALID) - return memcmp (prev_buffer, this_buffer, - register_size (gdbarch, regnum)) != 0; - else - return 0; + ret = value_contents_eq (prev_value, 0, this_value, 0, + 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