From patchwork Tue Apr 4 10:15:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 19818 Received: (qmail 51224 invoked by alias); 4 Apr 2017 10:15:32 -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 51017 invoked by uid 89); 4 Apr 2017 10:15:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 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=519, inaccessible X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0045.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Apr 2017 10:15:18 +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:15:10 +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:15:10 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PATCH 9/11] Add MN10300_MAX_REGISTER_SIZE Date: Tue, 4 Apr 2017 10:15:10 +0000 Message-ID: <466CF7AB-4D05-4A4B-9FB9-80513E7ABF1C@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-exchange-messagesentrepresentingtype: 1 x-microsoft-exchange-diagnostics: 1; AM3PR08MB0103; 7:IIa1rChN/LK6fLY8d3sVzwHlqB8IUszTqNCeeOQYNXHAJ1/hGXmJc030L+TdkG648jHGFX2oCkwIXM0DYokqz64RKO413luSl44fjBYN2t63ozQ3wkKAlc9mrPtGCAwAQsCtQMtv/zclAWf+O5zA7lEkjZb5UnlGxKFxfJTT41QkxtA5KaTldz2XO2uh7p/79r3M61M0Tp8lF6VjngSJjiRmcVkZrb57qS4zvgVfYNTRs/PyUDVJT1xojVUoCOrajcF/BZPcbtf7J9PnKrH2RhFOTyAnqQz0W1Ey9sqzNhHiaKtAR9JxGzygQUSsGNMXkpFegoTflGBeGqiUdRRKqA==; 20:prwbxOOXZ9+g+1HBgFnGK4SRc5pl3zf41385V4i0ZigcXWv8WfJ1SFaXg6WL2u4B/kRJRukx/+1UEC+ec6T946+OZQ8DJ0S4KYOCKCacpIDHd+nlqalAuKSDcT0io0zya+qLIbAxF4LiT//Ftdd1DKEKNBwUnFHs0UnWTjov+U0= x-ms-office365-filtering-correlation-id: 3bb7f205-b694-4e6d-0bc1-08d47b4379d0 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)(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); 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: <9F5EC91C7DD1084BA6CA3BAC900A1BF5@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Apr 2017 10:15:10.2064 (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 32bits, which I determined using mn10300_register_type() Tested on a --enable-targets=all build using make check with board files unix and native-gdbserver. I do not have a MN10300 machine to test on. Ok to commit? Alan. 2017-04-04 Alan Hayward * mn10300-linux-tdep.c (am33_supply_gregset_method): Use MN10300_MAX_REGISTER_SIZE. * mn10300-tdep.c (mn10300_extract_return_value): Likewise (mn10300_push_dummy_call): Likewise. * mn10300-tdep.h (MN10300_MAX_REGISTER_SIZE): Add. diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c index 8c23f02b2b58b29b10a65df5ae0b4bcdce2925cd..ad7bdeea84c730dfb26a77d11ec4dcc87c6585c1 100644 --- a/gdb/mn10300-linux-tdep.c +++ b/gdb/mn10300-linux-tdep.c @@ -86,7 +86,7 @@ am33_supply_gregset_method (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - char zerobuf[MAX_REGISTER_SIZE]; + char zerobuf[MN10300_MAX_REGISTER_SIZE]; const mn10300_elf_greg_t *regp = (const mn10300_elf_greg_t *) gregs; int i; @@ -188,15 +188,15 @@ am33_supply_gregset_method (const struct regset *regset, /* ssp, msp, and usp are inaccessible. */ case E_E8_REGNUM: - memset (zerobuf, 0, MAX_REGISTER_SIZE); + memset (zerobuf, 0, MN10300_MAX_REGISTER_SIZE); regcache_raw_supply (regcache, E_E8_REGNUM, zerobuf); break; case E_E9_REGNUM: - memset (zerobuf, 0, MAX_REGISTER_SIZE); + memset (zerobuf, 0, MN10300_MAX_REGISTER_SIZE); regcache_raw_supply (regcache, E_E9_REGNUM, zerobuf); break; case E_E10_REGNUM: - memset (zerobuf, 0, MAX_REGISTER_SIZE); + memset (zerobuf, 0, MN10300_MAX_REGISTER_SIZE); regcache_raw_supply (regcache, E_E10_REGNUM, zerobuf); break; @@ -218,11 +218,11 @@ am33_supply_gregset_method (const struct regset *regset, break; case E_FPCR_REGNUM + 1: /* The two unused registers beyond fpcr are inaccessible. */ - memset (zerobuf, 0, MAX_REGISTER_SIZE); + memset (zerobuf, 0, MN10300_MAX_REGISTER_SIZE); regcache_raw_supply (regcache, E_FPCR_REGNUM + 1, zerobuf); break; case E_FPCR_REGNUM + 2: - memset (zerobuf, 0, MAX_REGISTER_SIZE); + memset (zerobuf, 0, MN10300_MAX_REGISTER_SIZE); regcache_raw_supply (regcache, E_FPCR_REGNUM + 2, zerobuf); break; default: /* An error, obviously, but should we error out? */ diff --git a/gdb/mn10300-tdep.h b/gdb/mn10300-tdep.h index 37dcb453b011b8a4dccc461c682b301354b2db22..18bfc18812675f9be6f915e39e07cb1aaac08681 100644 --- a/gdb/mn10300-tdep.h +++ b/gdb/mn10300-tdep.h @@ -51,6 +51,9 @@ enum { E_FS0_REGNUM = 32 }; +/* Big enough to hold the size of the largest register in bytes. */ +#define MN10300_MAX_REGISTER_SIZE 4 + enum movm_register_bits { movm_exother_bit = 0x01, movm_exreg1_bit = 0x02, diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 5f5d5ca87b811d66da272036a515210cf2f17134..eecf92f8c95db5c03ba13b2268e36aa4f8b2a63a 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -195,7 +195,7 @@ static void mn10300_extract_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, void *valbuf) { - gdb_byte buf[MAX_REGISTER_SIZE]; + gdb_byte buf[MN10300_MAX_REGISTER_SIZE]; int len = TYPE_LENGTH (type); int reg, regsz; @@ -1223,7 +1223,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch, int stack_offset = 0; int argnum; const gdb_byte *val; - gdb_byte valbuf[MAX_REGISTER_SIZE]; + gdb_byte valbuf[MN10300_MAX_REGISTER_SIZE]; /* This should be a nop, but align the stack just in case something went wrong. Stacks are four byte aligned on the mn10300. */