From patchwork Tue Apr 4 10:16:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 19820 Received: (qmail 54692 invoked by alias); 4 Apr 2017 10:16:36 -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 54626 invoked by uid 89); 4 Apr 2017 10:16:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0054.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Apr 2017 10:16:33 +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.1005.10; Tue, 4 Apr 2017 10:16:31 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::5931:f431:f97d:943d]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::5931:f431:f97d:943d%16]) with mapi id 15.01.1005.018; Tue, 4 Apr 2017 10:16:31 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PATCH 11/11] Add SH_MAX_REGISTER_SIZE and SH64_MAX_REGISTER_SIZE Date: Tue, 4 Apr 2017 10:16:31 +0000 Message-ID: authentication-results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-microsoft-exchange-diagnostics: 1; AM3PR08MB0103; 7:O5vvbJNpsm7ZF+/O5HeD0n405OCnFh+jGqWCcdWx5L3B0cuUEv72qQJbchteyAEla3DvH+iunjtH7Lv1mLbjvaZf5crriDM/dyqQKe5Y2hzpTGf+mILoQec0y6rp+7JsbC1knUdIC+kICA5Lj0kyHudEyOPwk4MLcuFyfynyJyiAV4Op5BGzt+gl72mfqVw6KOufLayxmEQjXuCf/MKPeEk1YjxEJyax6joQHGZEN89AfQ2g19hIVzbiOpY2A1fU6xcpJrQq620h/ZBCvasEHuY+rIMTniyyje2y2cRKNIxgIYeqZRALJdJ+7oCjHV62tEz8K4sVl4x0DgF7nRo+Mw==; 20:Fsm2v7qk4m6FKxfDJ1hfqbaREqcfviAnNUyRmrhwqxEa26GR2OFqYE2+MHd9YqnIuJFmgr5F7JBNEppAQNNuD1jIvtWzJpOpBwWbxiB76p3xk+5pU2CgT6EbrzUl1UAnoG6PyxZUwAUqWsSt5HMwPKeGlobFL5A19WSWJJiQirI= x-ms-office365-filtering-correlation-id: 5a73b244-29ed-4a8a-d5f0-08d47b43aa24 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:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:AM3PR08MB0103; BCL:0; PCL:0; RULEID:; SRVR:AM3PR08MB0103; x-forefront-prvs: 0267E514F9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(6009001)(39840400002)(39860400002)(39850400002)(39400400002)(39450400003)(39410400002)(377424004)(2351001)(86362001)(36756003)(6506006)(575784001)(6916009)(66066001)(189998001)(50986999)(6486002)(2900100001)(25786009)(54356999)(8676002)(6436002)(5250100002)(33656002)(2501003)(3280700002)(3660700001)(3846002)(82746002)(305945005)(8936002)(110136004)(102836003)(6512007)(6116002)(5660300001)(38730400002)(4326008)(99286003)(5640700003)(81166006)(2906002)(83716003)(53936002)(7736002)(15760500002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0103; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Apr 2017 10:16:31.2137 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0103 Max size set to 96bits, which I determined using the various sh*register_type() functions. Tested on a --enable-targets=all build using make check with board files unix and native-gdbserver. I do not have a SH machine to test on. Ok to commit? Alan. 2017-04-04 Alan Hayward * sh-tdep.c (sh_pseudo_register_read): Use SH_MAX_REGISTER_SIZE. (sh_pseudo_register_write): Likewise. * sh64-tdep.c (SH_MAX_REGISTER_SIZE): Add. (sh64_pseudo_register_read): Use SH64_MAX_REGISTER_SIZE.. (sh64_pseudo_register_write): Likewise. * sh-tdep.h (SH64_MAX_REGISTER_SIZE): Add. diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h index d15ef050e079aec93a8f2578bf6e94ace919061b..ca9bb25c947a7425e6160797ac05019b20fd4bff 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -82,6 +82,9 @@ enum FV_LAST_REGNUM = 79 }; +/* Big enough to hold the size of the largest register in bytes. */ +#define SH_MAX_REGISTER_SIZE 12 + /* This structure describes a register in a core-file. */ struct sh_corefile_regmap { diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 9b3692dc0c32ffcb53d99f0fc095303d2c221fcb..7e56864202fe9321edb7561c721ef912b3a4f8c5 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1648,7 +1648,7 @@ sh_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, int reg_nr, gdb_byte *buffer) { int base_regnum; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; + gdb_byte temp_buffer[SH_MAX_REGISTER_SIZE]; enum register_status status; if (reg_nr == PSEUDO_BANK_REGNUM) @@ -1687,7 +1687,7 @@ sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, int reg_nr, const gdb_byte *buffer) { int base_regnum, portion; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; + gdb_byte temp_buffer[SH_MAX_REGISTER_SIZE]; if (reg_nr == PSEUDO_BANK_REGNUM) { diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 23f5ade3b2e631eeb50cb918a4f36bb8cfbe6131..19fce4fef6aba859491304c171fe16cb41ca3d37 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -122,6 +122,9 @@ enum FP_LAST_REGNUM = SIM_SH64_FR0_REGNUM + SIM_SH64_NR_FP_REGS - 1 }; +/* Big enough to hold the size of the largest register in bytes. */ +#define SH64_MAX_REGISTER_SIZE 12 + static const char * sh64_register_name (struct gdbarch *gdbarch, int reg_nr) { @@ -1528,7 +1531,7 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int base_regnum; int offset = 0; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; + gdb_byte temp_buffer[SH64_MAX_REGISTER_SIZE]; enum register_status status; if (reg_nr >= DR0_REGNUM @@ -1704,7 +1707,7 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int base_regnum, portion; int offset; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; + gdb_byte temp_buffer[SH64_MAX_REGISTER_SIZE]; if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM)