From patchwork Tue Oct 24 14:18:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 23778 Received: (qmail 66198 invoked by alias); 24 Oct 2017 14:18: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 66180 invoked by uid 89); 24 Oct 2017 14:18:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 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=Floating X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0041.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 24 Oct 2017 14:18:33 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0102.eurprd08.prod.outlook.com (10.160.211.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4; Tue, 24 Oct 2017 14:18:29 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::2891:52f2:59:8e54]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::2891:52f2:59:8e54%16]) with mapi id 15.20.0156.007; Tue, 24 Oct 2017 14:18:29 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PATCH] commonize AARCH64 REGNUM/REGNO defines Date: Tue, 24 Oct 2017 14:18:29 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0102; 6:n2QYc8VhW0eH2HB4ucHc/Yh96eH+upzxWoTuRpndA3hl+TbR+WGe0D5zzxZxqshX53i2arQI0FJSctpEC4yH0B9qZLcCXUNBk55286D0N1S4PfsfaCWi2OvtiTrr003+0fYxOY8JyCLCzYmmD0O26Mst3YRJVO8TrHV6T+Uc/u0qi5+nYwXSH7bKjletCFUNiKwX1DJI3hwd0lZm4v3EXCzRvDl7LjDoKCTXV22iHwKdf+wf7RdQqakPzLQZRtgj8yI27Zs90eaFh4Jk5AnSkJzGDPVSc0yjMmNTLcTeeMbuHPTXRRsJlY1kw7U8uMM2s0z4BYNiz44ACY+OilysbA==; 5:AOrRz1uMj0jGIoDYK5YdIx8FiVBKIm0RTAjOAi6VBpzF4I8HzfSSpGl2IPgRYmpMh50fEoHUrvzWPHGiGJ/yo2fqbCPLDUBV1TpnKUaf2jA68yLj99vLiZOX0y00XMKZ8Z7atlafHAHVonqd4zewZQ==; 24:Yo4/sOlWmD2tUkAyFmqDCZuZ16j6lU+7aJDbgn28Y/x/z/OATALNwfJpfLvslA+/+J1gS9O0AC863MMA7ZPMtg6zGpr1eWGy1T3lbPttazA=; 7:IA22pGOt9Nn/IWD3jn4Zc39QTCHIsE4QmBmDK3eRFL+w+X+H7eCT4j0OJB/F/WZGKqTSrEDnlGQbjVv3RIWaFiG8HGTpcNoCgKFfVUrEKDTJ7wA5QcT6rLpQIbs3WM04QApeJeu32gGOPBEBa7IWLMWNB8+S0lO3l+iLCWWmytXkkXzlBa9/uLAUxN5W5ie1dAjhEf2/LucHMF+vKStM5HPZDFHXr160Xq9eb4wCldQ= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 6b48b5c2-f7db-4a94-a480-08d51aea1965 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:AM3PR08MB0102; x-ms-traffictypediagnostic: AM3PR08MB0102: nodisclaimer: True x-exchange-antispam-report-test: UriScan:(250305191791016)(180628864354917)(22074186197030)(788757137089); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3231020)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR08MB0102; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR08MB0102; x-forefront-prvs: 047001DADA x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(377424004)(199003)(189002)(2351001)(14454004)(6306002)(81166006)(105586002)(7736002)(305945005)(106356001)(68736007)(97736004)(8936002)(101416001)(82746002)(8676002)(54356999)(50986999)(4001150100001)(53936002)(72206003)(478600001)(6512007)(33656002)(81156014)(99286003)(25786009)(6916009)(5660300001)(4326008)(66066001)(3280700002)(6436002)(102836003)(2900100001)(6486002)(6506006)(2906002)(5640700003)(189998001)(6116002)(3660700001)(83716003)(3846002)(5250100002)(86362001)(316002)(575784001)(36756003)(2501003)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0102; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <7321E05317744C49B5796F6401D2C28B@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b48b5c2-f7db-4a94-a480-08d51aea1965 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Oct 2017 14:18:29.2460 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0102 X-IsSubscribed: yes gdb uses a set of AARCH64_n_REGNUM defines, whereas gdbserver uses AARCH64_n_REGNO. This path simply commonizes them into arch/ Tested on a --enable-targets=all build and aarch64 build with board files unix, native-gdbserver and unittest.exp. Alan. 2017-10-24 Alan Hayward gdb/ * aarch64-tdep.h (enum aarch64_regnum): Remove. * arch/aarch64.h: New file. gdbserver/ * linux-aarch64-low.c (aarch64_fill_gregset): Replace defines with REGNO. (aarch64_store_gregset): Likewise. (aarch64_fill_fpregset): Likewise. (aarch64_store_fpregset): Likewise. diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index 85c6a97a9bdf735a17f37ac5e38a7c2883d30a1b..2597443560f9caf9f7ce0d95cf3325a423b91e02 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -22,6 +22,8 @@ #ifndef AARCH64_TDEP_H #define AARCH64_TDEP_H +#include "arch/aarch64.h" + /* Forward declarations. */ struct gdbarch; struct regset; @@ -31,32 +33,6 @@ struct regset; #define AARCH64_DWARF_SP 31 #define AARCH64_DWARF_V0 64 -/* Register numbers of various important registers. */ -enum aarch64_regnum -{ - AARCH64_X0_REGNUM, /* First integer register */ - - /* Frame register in AArch64 code, if used. */ - AARCH64_FP_REGNUM = AARCH64_X0_REGNUM + 29, - AARCH64_LR_REGNUM = AARCH64_X0_REGNUM + 30, /* Return address */ - AARCH64_SP_REGNUM, /* Stack pointer */ - AARCH64_PC_REGNUM, /* Program counter */ - AARCH64_CPSR_REGNUM, /* Contains status register */ - AARCH64_V0_REGNUM, /* First floating point / vector register */ - - /* Last floating point / vector register */ - AARCH64_V31_REGNUM = AARCH64_V0_REGNUM + 31, - AARCH64_FPSR_REGNUM, /* Floating point status register */ - AARCH64_FPCR_REGNUM, /* Floating point control register */ - - /* Other useful registers. */ - - /* Last integer-like argument */ - AARCH64_LAST_X_ARG_REGNUM = AARCH64_X0_REGNUM + 7, - AARCH64_STRUCT_RETURN_REGNUM = AARCH64_X0_REGNUM + 8, - AARCH64_LAST_V_ARG_REGNUM = AARCH64_V0_REGNUM + 7 -}; - /* Size of integer registers. */ #define X_REGISTER_SIZE 8 #define B_REGISTER_SIZE 1 diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h new file mode 100644 index 0000000000000000000000000000000000000000..d2c803a626a59216bfc20781004515a9f299a3fc --- /dev/null +++ b/gdb/arch/aarch64.h @@ -0,0 +1,47 @@ +/* Common target-dependent functionality for AArch64. + + Copyright (C) 2017 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef AARCH64_H +#define AARCH64_H + +/* Register numbers of various important registers. */ +enum aarch64_regnum +{ + AARCH64_X0_REGNUM, /* First integer register. */ + AARCH64_FP_REGNUM = AARCH64_X0_REGNUM + 29, /* Frame register, if used. */ + AARCH64_LR_REGNUM = AARCH64_X0_REGNUM + 30, /* Return address. */ + AARCH64_SP_REGNUM, /* Stack pointer. */ + AARCH64_PC_REGNUM, /* Program counter. */ + AARCH64_CPSR_REGNUM, /* Current Program Status Register. */ + AARCH64_V0_REGNUM, /* First fp/vec register. */ + AARCH64_V31_REGNUM = AARCH64_V0_REGNUM + 31, /* Last fp/vec register. */ + AARCH64_FPSR_REGNUM, /* Floating Point Status Register. */ + AARCH64_FPCR_REGNUM, /* Floating Point Control Register. */ + + /* Other useful registers. */ + AARCH64_LAST_X_ARG_REGNUM = AARCH64_X0_REGNUM + 7, + AARCH64_STRUCT_RETURN_REGNUM = AARCH64_X0_REGNUM + 8, + AARCH64_LAST_V_ARG_REGNUM = AARCH64_V0_REGNUM + 7 +}; + +#define AARCH64_X_REGS_NUM 31 +#define AARCH64_V_REGS_NUM 32 +#define AARCH64_NUM_REGS AARCH64_FPCR_REGNUM + 1 + +#endif /* aarch64.h */ \ No newline at end of file diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 6d5c4e54235de92b0c2beb60d13ee1a200d84c45..b00d5c502d2be67daf0e7f48025647f191efef3b 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -38,6 +38,7 @@ #include #include "gdb_proc_service.h" +#include "arch/aarch64.h" /* Defined in auto-generated files. */ void init_registers_aarch64 (void); @@ -47,18 +48,6 @@ extern const struct target_desc *tdesc_aarch64; #include #endif -#define AARCH64_X_REGS_NUM 31 -#define AARCH64_V_REGS_NUM 32 -#define AARCH64_X0_REGNO 0 -#define AARCH64_SP_REGNO 31 -#define AARCH64_PC_REGNO 32 -#define AARCH64_CPSR_REGNO 33 -#define AARCH64_V0_REGNO 34 -#define AARCH64_FPSR_REGNO (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM) -#define AARCH64_FPCR_REGNO (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM + 1) - -#define AARCH64_NUM_REGS (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM + 2) - /* Per-process arch-specific data we want to keep. */ struct arch_process_info @@ -109,10 +98,10 @@ aarch64_fill_gregset (struct regcache *regcache, void *buf) int i; for (i = 0; i < AARCH64_X_REGS_NUM; i++) - collect_register (regcache, AARCH64_X0_REGNO + i, ®set->regs[i]); - collect_register (regcache, AARCH64_SP_REGNO, ®set->sp); - collect_register (regcache, AARCH64_PC_REGNO, ®set->pc); - collect_register (regcache, AARCH64_CPSR_REGNO, ®set->pstate); + collect_register (regcache, AARCH64_X0_REGNUM + i, ®set->regs[i]); + collect_register (regcache, AARCH64_SP_REGNUM, ®set->sp); + collect_register (regcache, AARCH64_PC_REGNUM, ®set->pc); + collect_register (regcache, AARCH64_CPSR_REGNUM, ®set->pstate); } static void @@ -122,10 +111,10 @@ aarch64_store_gregset (struct regcache *regcache, const void *buf) int i; for (i = 0; i < AARCH64_X_REGS_NUM; i++) - supply_register (regcache, AARCH64_X0_REGNO + i, ®set->regs[i]); - supply_register (regcache, AARCH64_SP_REGNO, ®set->sp); - supply_register (regcache, AARCH64_PC_REGNO, ®set->pc); - supply_register (regcache, AARCH64_CPSR_REGNO, ®set->pstate); + supply_register (regcache, AARCH64_X0_REGNUM + i, ®set->regs[i]); + supply_register (regcache, AARCH64_SP_REGNUM, ®set->sp); + supply_register (regcache, AARCH64_PC_REGNUM, ®set->pc); + supply_register (regcache, AARCH64_CPSR_REGNUM, ®set->pstate); } static void @@ -135,9 +124,9 @@ aarch64_fill_fpregset (struct regcache *regcache, void *buf) int i; for (i = 0; i < AARCH64_V_REGS_NUM; i++) - collect_register (regcache, AARCH64_V0_REGNO + i, ®set->vregs[i]); - collect_register (regcache, AARCH64_FPSR_REGNO, ®set->fpsr); - collect_register (regcache, AARCH64_FPCR_REGNO, ®set->fpcr); + collect_register (regcache, AARCH64_V0_REGNUM + i, ®set->vregs[i]); + collect_register (regcache, AARCH64_FPSR_REGNUM, ®set->fpsr); + collect_register (regcache, AARCH64_FPCR_REGNUM, ®set->fpcr); } static void @@ -148,9 +137,9 @@ aarch64_store_fpregset (struct regcache *regcache, const void *buf) int i; for (i = 0; i < AARCH64_V_REGS_NUM; i++) - supply_register (regcache, AARCH64_V0_REGNO + i, ®set->vregs[i]); - supply_register (regcache, AARCH64_FPSR_REGNO, ®set->fpsr); - supply_register (regcache, AARCH64_FPCR_REGNO, ®set->fpcr); + supply_register (regcache, AARCH64_V0_REGNUM + i, ®set->vregs[i]); + supply_register (regcache, AARCH64_FPSR_REGNUM, ®set->fpsr); + supply_register (regcache, AARCH64_FPCR_REGNUM, ®set->fpcr); } /* Enable miscellaneous debugging output. The name is historical - it