From patchwork Wed May 9 21:26:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27187 Received: (qmail 80724 invoked by alias); 9 May 2018 21:27:27 -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 80272 invoked by uid 89); 9 May 2018 21:27:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 May 2018 21:27:20 +0000 Received: from ESESSHC003.ericsson.se (Unknown_Domain [153.88.183.27]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 71.05.22120.3B763FA5; Wed, 9 May 2018 23:27:15 +0200 (CEST) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC003.ericsson.se (153.88.183.27) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 9 May 2018 23:27:14 +0200 Received: from ESESBMB503.ericsson.se (153.88.183.170) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 9 May 2018 23:27:14 +0200 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB503.ericsson.se (153.88.183.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Wed, 9 May 2018 23:27:14 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ericsson.se (129.192.64.65) by SN6PR15MB2400.namprd15.prod.outlook.com (2603:10b6:805:24::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Wed, 9 May 2018 21:27:12 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH RFC 1/5] Rename some functions, index -> gdb_index Date: Wed, 9 May 2018 17:26:52 -0400 Message-ID: <1525901216-15031-2-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1525901216-15031-1-git-send-email-simon.marchi@ericsson.com> References: <1525901216-15031-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: YQXPR0101CA0064.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:14::41) To SN6PR15MB2400.namprd15.prod.outlook.com (2603:10b6:805:24::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:SN6PR15MB2400; X-Microsoft-Exchange-Diagnostics: 1; SN6PR15MB2400; 3:GxBjEj6Gxt65KD8zSWeTj4gDSIS3r64PjH7XqKF+cHwd1ya45tpJJ9iWrDpUeevuuhgP3LeLjsgbw50VQWAWwGSB1i8/pq5vghBw+pBp+TkrB1uFo4ESuH8sTAaXzVoVN3rcSgM+GUiKOSkv861Nkk8rqpg2E50hhmOyNgNK3m6qF0MmvK0N+C7JksM+O/Ja4+AG1IsnuuIJMuVfF5AGH/zoqsLcf7AkygNikpTBm+aVWt0zzeTBesOuMs0nOu3R; 25:L3K9EsiKZhPsF/bLW2wExKtkpnh2p5cZ3d2DvRl/nEUt3Ve45752imR5OLXt69pjlUVYqeO8+IMNE3LFwbiFi/p6soaDnS1KeH2gf3HNvqFpnRa0FjRkMqCgWUKYMHgt9mfciiuT1cSwuxAUCQoeg/fnPNGwG0hawttBD9iWvSOfn8N3zhRj0ReRlM7RoYYq//v7PjrRn39watQDipFQKYDOwMRRgZ3GFGMFOGzvP55UXU7WUcJPXf083fwmRTAC4K3sVIHGZTLqBe2LeCp4sLqxXO+K4PDiqrH3ajY7PWpi17gBZgFpxKS8jkaR90yrW8qZPQW0UkPXdkAmlV3Zag==; 31:ll5j7rbtWtTAB8Wq4z8Vuyc34jW8UnXptCCYS/ganjz+Sd+cfNYDcvgArEfdOPz0qvJmPvwQvqNlQyRN9ywHVsdgwvJXoQwlA7S0mtq3jP+nxkT7FnpP/6AnUgo3WLCE9DFFWzIp23F5rg2PvBfS+fAOg+ZWYfF6k+ekW0p0uxPC5tMoWnc5Od0+aBCOmjjJk+g7EB+behiJFG3nqTOb14qWAK4HbyrvOF4Ziz8RII0= X-MS-TrafficTypeDiagnostic: SN6PR15MB2400: X-Microsoft-Exchange-Diagnostics: 1; SN6PR15MB2400; 20:l9W498dugfOar4cQ0S8ckZoLSGQH4BpjlOcSbgLBPWhDRlAxk8s7RuTUJSyC3E+Jfn9Jx9cESwf6XCHqMa9M0A5bnSnHO70BNHBL4b/UBBz/SgDpzk5UpMFnrXahH/UF/W+kzI8cRPjq3DworEoh4Kwa3/PNH2+T9fCUlZ3XeZpLqHGwzmG47QFIctSj8JCj8MMHotzVeggbGw2mDichXCf6t+k6/mOHyZnlhaDjkps0hHz637x8pzAuEXLyR5MqOb4kJ+d63PiJSoDdv19d+ww+dL7mYi78i5eU1lJP5jxnbFb8sNByyvUXYWv8uE9OyO1FnKJ0djbEIrqCq6PVOYwNesTdVeu9NvKq+Eai2hF86tz2e+3u3WsMAc9A+0j/wcDbf9NTfRxALjQkC06UBuMtl0x974mOlun1Zrp8bJ10ogBSM4IjlfJFUv7Y5WTfBiiwnuHJpodgMk8bGMrOW4KVoqTQpshC3DIcknjRIM8snaQ+N8jO7Uikhc/B/wsd; 4:fgTiaUqz0PufmORONGP4JEp9yUap0EsqixG3tVhFH02vKbRYTTcH0Lc898XRrhSEGFkSIwia35U+kx/K1Vn+4XXNfFZCKbdcjUtbUzXSdybMPiYOlhhefqN+lP5ek50QSwdjZyfHHf20CHOQF47YEx5O/B/b/zQwHK1DOMoKj0TEzSWk3gflLw5Y47/QIIqoOURcwlxhW207J7NJweruOcE81zKs7apPiWcrxnQ6Sux14PzRX3fzvoQhIF2JNq74fDk4ehNDVh2QI97i0oOGcuQf6IZqTcZ6QRzHEY6AyOFr7Jlt3UmAB8HLidiTRTDb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:SN6PR15MB2400; BCL:0; PCL:0; RULEID:; SRVR:SN6PR15MB2400; X-Forefront-PRVS: 0667289FF8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(396003)(39380400002)(39860400002)(189003)(199004)(54534003)(16586007)(2361001)(6486002)(316002)(6512007)(16526019)(51416003)(53416004)(26005)(386003)(105586002)(106356001)(53936002)(186003)(52116002)(59450400001)(6506007)(48376002)(68736007)(76176011)(66066001)(6916009)(6666003)(478600001)(7736002)(2351001)(305945005)(36756003)(47776003)(25786009)(2906002)(50466002)(3846002)(6116002)(50226002)(4326008)(107886003)(5660300001)(81156014)(81166006)(69596002)(476003)(8676002)(44832011)(86362001)(8936002)(956004)(446003)(97736004)(486006)(11346002)(2616005)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR15MB2400; H:elxacz23q12.ericsson.se; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR15MB2400; 23:gcm9VJcFH1dw9rUFxbxvSwcmglxTncbJviT/lQJtE?= =?us-ascii?Q?homZOQWnCEeKqhtwVLQ02N+B7bBehkXTbmefB9tdV8hylySCBNcxQVMvrhDI?= =?us-ascii?Q?409T/YWkQOBxOpU56I7V4OPf9Q5ZLl735i6ICO9i2FfDmTYQQYwQlRBKAJLs?= =?us-ascii?Q?OWkzFSh2wqkKRAkjOfvq1po4XP8Mthu1NuFgKRgYSJEWpQ7bDT3Hrxf+bDpp?= =?us-ascii?Q?c/CHuxFgrwygpsNVzhDWRDl4p2MVnu4jfXVfERfl1RoZUnZs2cRQUcQjh0GN?= =?us-ascii?Q?Ft9KoQ3GtlOqghv2HdTDNAyjRznkV/L8xzFddJjgFXSjtFgXdoLVVaneYz3M?= =?us-ascii?Q?gYBVq9njo0dl+7AkRMSEV8zwjws94caT43jMm2sdBElbbtH532xCkBDIeAwk?= =?us-ascii?Q?gvilisnlxjfmub5RO+7AysO+9epTB/HsTGuJx+VZDpQ/kIpeRvNjbCWADMvJ?= =?us-ascii?Q?8JudxzEpSXv1icEXMHQZX2K9z9h/nBZszzcV43E2Gqb5BVz2nizpwRptcuIu?= =?us-ascii?Q?YOOTpMJUIoXD/IbUge9ZxykV0NMQLFijANXRBYyVmU7LpBQP9GCHM2x84lo2?= =?us-ascii?Q?KoSmvZJCyONvkQXw36NNEn1yPpM7/nk5RwGM1mHXF/edAXFXKZ1NuTJd4ZC6?= =?us-ascii?Q?gmE3udE79mO+YmHDTxrLeCUy7EfGkJ2WCKmk3cxfSp9YvEzEc0i1dwB4cNTz?= =?us-ascii?Q?XCf/AeWgjX782kLM71Upkug0jxXa6I4WvQvpb3zzTwRbu08v3mXrf8xg3m6R?= =?us-ascii?Q?ttp/pKjPCtS/b5elhpEcNSvgwQ8hYTDjamzQpa4J3j4LyQJBC3YOyG1C9jZT?= =?us-ascii?Q?pL0XqsABPggEGLzDuxImyL5yyqnUWZJQN4Esjkh2yPLhVFjArOcQvTmH7FDM?= =?us-ascii?Q?yF33sqrw8lkV4loATh61jcNpbq1Q4hO/bR+fDZDZRevu/onJLXeJPEtnjjXB?= =?us-ascii?Q?Hj/V0JVCIBpSFg8jJJZkW14z9KchihOLDt+cX0lFOfeWx7XkI6DLrON2uLlD?= =?us-ascii?Q?ja0/+thRyXsusKhFwo3sCBhN8Xf7vg7OCr9+8PKD+Y6Uoqq6y5rsZNaoMLiJ?= =?us-ascii?Q?f3iTy8dWM52Xe3scoowOpQRmY7rm5fTDV0T4VrTXd1R5RXgc/bMlxti2AMO7?= =?us-ascii?Q?DKYJAPJUOQPQanTamPsQc17sw2ICCGNJMbbFZUnsiYZxaQ2DY50PLC4x3aF7?= =?us-ascii?Q?A1c+dQYCf3gh6H4hvj7p1fPf3AdllDnua0/1oyGFdV3W5Vi6drC54gDoWTbf?= =?us-ascii?Q?MOH5jCuE58/CKsDsXiIZ2P10qoRBKOAgehpQkAIGY7sfBaNT2Hha3l/001pC?= =?us-ascii?Q?wnrnZ/CeU3IWe7WZ9dEHxAsMNtBC8CwgkBkClf2r4438nMAQNan8xksOMXSz?= =?us-ascii?Q?A2kfiEoWGNMKDd6ucxeLZnr7cw=3D?= X-Microsoft-Antispam-Message-Info: /yTMmql0j+ecKzfgSQHB08jjh0cyVqn0uspzfA4IIwMbsU0lHdBVmwYXteawzalFGUyBiFD+p8PjnI3hu6EG8rJTVePIphxq0NWKfv0ST1DbajS+RzHaXU+UeEbrGy+NL83o7LHZGNHUahjdMaERA9ESPTNN+DbeBiUpvmteY20DvNiInwvYLY/OTx96gGM7 X-Microsoft-Exchange-Diagnostics: 1; SN6PR15MB2400; 6:wbnL2d3swqCO4s+hBNY8NBW0sqmo5d6miqABHMAye1rqsx+VV8MAxTn3bxSWLIJj5ntZTNDMpFbBNUT4t1llvsbR7/dMTDbD1VIgHtkt/k6eg1g4QN3c38HeLLF/N48+cuVmADZjX/68RnSTVjS3SUdAUtYVuXjKrV2ilQDmBBtnrow4GE9Ycf2d6Bv8MJF3SOENLKauvY/YZafMWfIraxpIg4pQXUF5FAskjWgGzf0d8D3fIbDBHmb9M+gHsP1rdQtu8H1kog9d/k0M/muB3C27uvTj39F4MPdiAaeGympKMs5oWyYltI3f7zEIMwSeFkWci/+Ro/P0VU2AiDNpYaIYsaC/teqCIaTUj31I/I1Bqggw6XWgNsedVokuXrYwuQGjRd5TX1i6Fsnzdx52CmfKmYsx/zwkySkUH/lsHC1kKe15uqWzptHGbI+3RWCaz+w/X90NmrcVDkjVOd8Bnw==; 5:S7BIoNY9K6MBmf5vCVqP01WdC6ELlLTvicR55OyPGndVsUwCjQICkaUCerDJP39d3nMJgf4utMYEpE4236caQ6oCyUTCsx1z1sJH3jaBLurNXAAh9s5zxDv4E5qtdL7u8gdfvmptU1kKHESmlQQLvnkJuT8GwQhg7sdPqN+abP0=; 24:4zm5OYyKU5VdtwuQ9jKly2ddFOs6QgjWwexmvw9xnL300Bhq1nZE1V9l9y8H1OVzqQBgbUwHY9Mfulun2ZkMM3NN7ryi4z961OYiUPKMshg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR15MB2400; 7:3NTaL7Nk0r8AwP9tO0zuB2jZM3iTEGLie0AuSPshZiKb1na0RbVdDO0H/IjzW5uvOEXO+X1eAuShIiet1RojjIBpgRhv4dOchlpdt/Uky5YLLX6vwAGdY2ZrdnU5sLkMd1nEZ6O8tHqtqJwuB4C5g9Mi0je5MFsHOAi8AO7PPhf7kToXVzeLnZh1qJtSjTWp5mO0vC2xtU5x0JTgyFF6H6y4efhPstp3idal7jmvcj9gpyFOcP656Afc8XDpQeyz X-MS-Office365-Filtering-Correlation-Id: 623cfdcf-5a6b-4a70-500b-08d5b5f3a159 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2018 21:27:12.6614 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 623cfdcf-5a6b-4a70-500b-08d5b5f3a159 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR15MB2400 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes Since we now have two index formats, DWARF5/debug_names and gdb_index, I wanted to rename some functions to make it clear that they deal with the gdb_index format specifically. gdb/ChangeLog: * dwarf2read.c (read_index_from_section): Rename to... (read_gdb_index_from_section): ... this, update all callers. (dwarf2_read_index): Rename to... (dwarf2_read_gdb_index): ... this, update all callers. --- gdb/dwarf2read.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 26ec5ef..823b498 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3421,15 +3421,15 @@ find_slot_in_mapped_hash (struct mapped_index *index, const char *name, Returns 1 if all went well, 0 otherwise. */ static bool -read_index_from_section (struct objfile *objfile, - const char *filename, - bool deprecated_ok, - struct dwarf2_section_info *section, - struct mapped_index *map, - const gdb_byte **cu_list, - offset_type *cu_list_elements, - const gdb_byte **types_list, - offset_type *types_list_elements) +read_gdb_index_from_section (struct objfile *objfile, + const char *filename, + bool deprecated_ok, + struct dwarf2_section_info *section, + struct mapped_index *map, + const gdb_byte **cu_list, + offset_type *cu_list_elements, + const gdb_byte **types_list, + offset_type *types_list_elements) { const gdb_byte *addr; offset_type version; @@ -3539,7 +3539,7 @@ to use the section anyway."), elements of all the CUs and return 1. Otherwise, return 0. */ static int -dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile) +dwarf2_read_gdb_index (struct dwarf2_per_objfile *dwarf2_per_objfile) { struct mapped_index local_map, *map; const gdb_byte *cu_list, *types_list, *dwz_list = NULL; @@ -3547,11 +3547,11 @@ dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile) struct dwz_file *dwz; struct objfile *objfile = dwarf2_per_objfile->objfile; - if (!read_index_from_section (objfile, objfile_name (objfile), - use_deprecated_index_sections, - &dwarf2_per_objfile->gdb_index, &local_map, - &cu_list, &cu_list_elements, - &types_list, &types_list_elements)) + if (!read_gdb_index_from_section (objfile, objfile_name (objfile), + use_deprecated_index_sections, + &dwarf2_per_objfile->gdb_index, &local_map, + &cu_list, &cu_list_elements, &types_list, + &types_list_elements)) return 0; /* Don't use the index if it's empty. */ @@ -3567,12 +3567,12 @@ dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile) const gdb_byte *dwz_types_ignore; offset_type dwz_types_elements_ignore; - if (!read_index_from_section (objfile, bfd_get_filename (dwz->dwz_bfd), - 1, - &dwz->gdb_index, &dwz_map, - &dwz_list, &dwz_list_elements, - &dwz_types_ignore, - &dwz_types_elements_ignore)) + if (!read_gdb_index_from_section (objfile, + bfd_get_filename (dwz->dwz_bfd), 1, + &dwz->gdb_index, &dwz_map, + &dwz_list, &dwz_list_elements, + &dwz_types_ignore, + &dwz_types_elements_ignore)) { warning (_("could not read '.gdb_index' section from %s; skipping"), bfd_get_filename (dwz->dwz_bfd)); @@ -6213,7 +6213,7 @@ dwarf2_initialize_objfile (struct objfile *objfile, dw_index_kind *index_kind) return true; } - if (dwarf2_read_index (dwarf2_per_objfile)) + if (dwarf2_read_gdb_index (dwarf2_per_objfile)) { *index_kind = dw_index_kind::GDB_INDEX; return true;