From patchwork Thu Jun 22 13:13:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 21197 Received: (qmail 124938 invoked by alias); 22 Jun 2017 13:13:49 -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 124523 invoked by uid 89); 22 Jun 2017 13:13:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0047.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 22 Jun 2017 13:13:42 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1178.14; Thu, 22 Jun 2017 13:13:38 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::9063:8caa:1bc4:156f]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::9063:8caa:1bc4:156f%14]) with mapi id 15.01.1178.023; Thu, 22 Jun 2017 13:13:38 +0000 From: Alan Hayward To: Yao Qi CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Remove MAX_REGISTER_SIZE from py-unwind.c Date: Thu, 22 Jun 2017 13:13:38 +0000 Message-ID: <82556349-1E8C-44C3-9FC9-68F15E36D4D4@arm.com> References: <86bmpgjso6.fsf@gmail.com> In-Reply-To: <86bmpgjso6.fsf@gmail.com> authentication-results: gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0101; 7:xBFm+ibPu0aAYIqkCMoSp5OkYDo7GBHCXxY67S2znLNNoRtIzp4mCURKujh8eaj2p3+fYtT2plEy1Uv+46MebD77UteUYGAXnkw771kuq4u1CG//FjLl4cCsHzIjPoWOceMQGsnddLK9i4CozMKhizXM+VbSLZcCc+/MJ9fww/nhNCbJoXaeQweTCqYIZ89Fy3a2wD105JvmhnD9OzDU+TSRyK9vDc3UmGjpZ6pmqnIaf6DWd+KZdqjUVyAYrN8swPmymnCUH736OwWYWfrbwUQNN9Zmp8fDDsjbXUbN2gTmu77tyIyq6QbY4V1D1LAbfwr/zntSE2Uh6nvb5lJxx1nnbbpq9VWTwEqnwBFtJratRIxSpN3NnbZT+F+wSl9WisXOeI3TdYhWo6X0mgI+rcX9kvrKyMJiR5lUDWpDHagGiJm8CoMMA0JaSvkhK0jZE0Ug/4L+P9q81fEtaXn0KA55P8PyTyo4/DWqqGS4I3nlzKhkqU75GZ2VlRHZb83bxsnVF5giJGJo38eW19fsheZvGZAipfsRZ24Xx7EFRL9FSGX07Jf/WzPzj9/GRoa/tkD3ROfBCsccXQfjcxVHXkN3//zguir4imBjDBOrUUqLMRP8frIeOTtOieZLd9eaTVpMyoAoYC9WxT5KMCqyMRkN7Xzu5VjduJpfgCVj+ETp7nWNa+26rsFvEAUaX/pr8y/1fsxuoD3CPygh/U/W7C2jBRcLSuIKxGgz4VOLGOf6owBIp91nk5MNKrnMGnAn7+1Hojt/pK1Bs3+FEObipZbYq5X3SfwwftwwnniwdkA= x-ms-office365-filtering-correlation-id: a4575bc0-f281-4cbf-5f54-08d4b9707f4d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081)(201702281549075); SRVR:AM3PR08MB0101; x-ms-traffictypediagnostic: AM3PR08MB0101: 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)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR08MB0101; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR08MB0101; x-forefront-prvs: 03468CBA43 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39400400002)(39410400002)(39450400003)(39840400002)(39860400002)(24454002)(305945005)(36756003)(66066001)(7736002)(6486002)(229853002)(478600001)(2906002)(2950100002)(6916009)(3280700002)(86362001)(1411001)(3660700001)(14454004)(72206003)(81166006)(8936002)(81156014)(189998001)(99286003)(6506006)(8676002)(54906002)(6512007)(3846002)(25786009)(5660300001)(4326008)(102836003)(6116002)(2900100001)(83716003)(33656002)(6436002)(6246003)(110136004)(38730400002)(5250100002)(53936002)(76176999)(54356999)(82746002)(39060400002)(50986999)(53546010); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0101; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <649D3BDAD698324080068C384C91E345@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2017 13:13:38.7929 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0101 X-IsSubscribed: yes > On 22 Jun 2017, at 10:08, Yao Qi wrote: > > Alan Hayward writes: > >> cached_frame >> - = ((cached_frame_info *) >> - xmalloc (sizeof (*cached_frame) >> - + reg_count * sizeof (cached_frame->reg[0]))); >> + = ((cached_frame_info *) xmalloc (sizeof (*cached_frame))); > > Use XNEW, the code can be shorter, > >> @@ -601,6 +591,13 @@ static void >> pyuw_dealloc_cache (struct frame_info *this_frame, void *cache) >> { >> TRACE_PY_UNWIND (3, "%s: enter", __FUNCTION__); >> + cached_frame_info *cached_frame = (cached_frame_info *) cache; >> + >> + for (int i = 0; cached_frame->reg_count; i++) >> + { >> + xfree (cached_frame->reg[i].data); >> + } > > No need to use braces. > > Otherwise, patch is good to me. > > -- > Yao (齐尧) Ok, pushed with changes as suggested. Patch below. Thanks, Alan. diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index a5c2873697944c1293fdd9f8265dde078378e6c2..da1703ecf2b843d9a6790f095e64c2915280ae35 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -73,15 +73,6 @@ typedef struct /* The data we keep for a frame we can unwind: frame ID and an array of (register_number, register_value) pairs. */ -struct reg_info -{ - /* Register number. */ - int number; - - /* Register data bytes pointer. */ - gdb_byte data[MAX_REGISTER_SIZE]; -}; - typedef struct { /* Frame ID. */ @@ -93,7 +84,7 @@ typedef struct /* Length of the `reg' array below. */ int reg_count; - struct reg_info reg[]; + cached_reg_t reg[]; } cached_frame_info; extern PyTypeObject pending_frame_object_type @@ -483,14 +474,14 @@ pyuw_prev_register (struct frame_info *this_frame, void **cache_ptr, int regnum) { cached_frame_info *cached_frame = (cached_frame_info *) *cache_ptr; - struct reg_info *reg_info = cached_frame->reg; - struct reg_info *reg_info_end = reg_info + cached_frame->reg_count; + cached_reg_t *reg_info = cached_frame->reg; + cached_reg_t *reg_info_end = reg_info + cached_frame->reg_count; TRACE_PY_UNWIND (1, "%s (frame=%p,...,reg=%d)\n", __FUNCTION__, this_frame, regnum); for (; reg_info < reg_info_end; ++reg_info) { - if (regnum == reg_info->number) + if (regnum == reg_info->num) return frame_unwind_got_bytes (this_frame, regnum, reg_info->data); } @@ -566,10 +557,7 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame, saved_reg *reg; int i; - cached_frame - = ((cached_frame_info *) - xmalloc (sizeof (*cached_frame) - + reg_count * sizeof (cached_frame->reg[0]))); + cached_frame = XNEW (cached_frame_info); cached_frame->gdbarch = gdbarch; cached_frame->frame_id = unwind_info->frame_id; cached_frame->reg_count = reg_count; @@ -580,13 +568,14 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame, struct value *value = value_object_to_value (reg->value); size_t data_size = register_size (gdbarch, reg->number); - cached_frame->reg[i].number = reg->number; + cached_frame->reg[i].num = reg->number; /* `value' validation was done before, just assert. */ gdb_assert (value != NULL); gdb_assert (data_size == TYPE_LENGTH (value_type (value))); gdb_assert (data_size <= MAX_REGISTER_SIZE); + cached_frame->reg[i].data = (gdb_byte *) xmalloc (data_size); memcpy (cached_frame->reg[i].data, value_contents (value), data_size); } } @@ -601,6 +590,11 @@ static void pyuw_dealloc_cache (struct frame_info *this_frame, void *cache) { TRACE_PY_UNWIND (3, "%s: enter", __FUNCTION__); + cached_frame_info *cached_frame = (cached_frame_info *) cache; + + for (int i = 0; cached_frame->reg_count; i++) + xfree (cached_frame->reg[i].data); + xfree (cache); } diff --git a/gdb/regcache.h b/gdb/regcache.h index b2e8a749d486608a90a82583ed8c74ad681baccb..4af9fbdcdbcdb508a76d758e705b9fb5008291af 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -232,6 +232,14 @@ enum regcache_dump_what regcache_dump_remote }; +/* A (register_number, register_value) pair. */ + +typedef struct cached_reg +{ + int num; + gdb_byte *data; +} cached_reg_t; + /* The register cache for storing raw register values. */ class regcache diff --git a/gdb/remote.c b/gdb/remote.c index b66ecee7f6db8e2a691b9e12f6ce314da22d69eb..8e8ee6f8705069a3f69fd8c883b7ea37db5de851 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6311,12 +6311,6 @@ remote_console_output (char *msg) gdb_flush (gdb_stdtarg); } -typedef struct cached_reg -{ - int num; - gdb_byte *data; -} cached_reg_t; - DEF_VEC_O(cached_reg_t); typedef struct stop_reply