From patchwork Mon Oct 30 17:05:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 23969 Received: (qmail 95295 invoked by alias); 30 Oct 2017 17:05:42 -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 95284 invoked by uid 89); 30 Oct 2017 17:05:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 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=layers, unexpectedly, sk:debug_m X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 30 Oct 2017 17:05:39 +0000 Received: from ESESSHC014.ericsson.se (Unknown_Domain [153.88.183.60]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id F4.16.07039.0EB57F95; Mon, 30 Oct 2017 18:05:36 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.60) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 30 Oct 2017 18:05:36 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DBXPR07MB320.eurprd07.prod.outlook.com (2a01:111:e400:941d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.4; Mon, 30 Oct 2017 17:05:34 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Remove mem_region_vector typedef Date: Mon, 30 Oct 2017 13:05:22 -0400 Message-ID: <1509383122-5110-1-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1509377531-21044-1-git-send-email-palves@redhat.com> References: <1509377531-21044-1-git-send-email-palves@redhat.com> MIME-Version: 1.0 X-ClientProxiedBy: MWHPR04CA0034.namprd04.prod.outlook.com (2603:10b6:300:ee::20) To DBXPR07MB320.eurprd07.prod.outlook.com (2a01:111:e400:941d::21) X-MS-Office365-Filtering-Correlation-Id: ff5c1ad6-8b6d-477c-1e50-08d51fb86fa3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(2017052603199); SRVR:DBXPR07MB320; X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 3:K0RA0gwjiEAqmwvHjIp6mthyUu9/p4PUG4Rzmb3/EcX9Snl2SqSWgtYOpKX1z1YRJH2ovPpvuXLzs+u0D89spXbTwVrvb86DUaJetWheJwEr0y1mH5EVAKdl2KRx7hHSGTR2HrWWQBBEVe5mXI10xj+FedlrwTCnp7sgGNzLpuQapRQMmb6eJ8deS6hRekrtWCWHGShgwm9OGrf5N/33d+50lcg1Tz6/DGqYczQJGtJxXXOxmL7vv+5umG7oR3Bu; 25:fwJyW5e518HiBwB3+jbI712/3BGzWP+0uVHXxRqA2SR9tq1/LGfpRqWZrTEmRbun75lyP1wRwksQiMIKmMxR5yu6B541YE55031xUQVy7gP7K5V2KgkxJxkccD9PdbT5RsOA5iKkLRUtLnX4XkJzlmss6WZ7PnzhwsC9Y3wozzK1gh4wf120d3pRb7TOgpuKG+sZbLlM+j9epm9Tkq8RG+cVVNYZDfdizK5JTkpn6szYKe6XutE833IGsVcAd6YF+HFM7f988Aqk7Uk4b8pYXqacGuA/o4w0d7DLKw6G5pJyp5+cyeOyWe+w5zezjgIkBDU9UZDvPPiFffkg7knH0zpXl68MYrmJBTtIvuACVcg=; 31:Cx6dx+DFtzzU4THUjeaWRNuhKM3ndq9EBoszGrQsdXIWGYAc8DMNwiL8OcJNOHmfSGk/+0TaodOl6vUZqOBVZk53x1DixkWBAiJTP1Gbq0InAP5Tg2AlnuPYVBE2jHhC/SIFFfadNGvnMyZyGb/5dpV2bMIZ2TA2jnWpvdHMxKuQ7VeqF+d4M3QR/cVGJkiimFhheX+nmXRZLcV2yZJEjrTMX0gSPZZHzrycxQxH4kc= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBXPR07MB320: X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 20:zpk0Af2MkwfM30t0xDKP2wtYHRhp+Bs4FslIX/yFJxLw6o1SVOHu5nWOrvTO9WFIXcYhcj272OYpnVEgDVOlS8zw5ufpoGllB+nnd0+1JvNjRVmOnBJe12oo7oBsI1yqN4MlBNQvuOYGx9tLGsjlCAa9kMLa1eBcQSemMNdQSKFYLUAgLv5JvcAYo10tAj1Xk4n2qyQ0xBYXXyODG5/2Wr1ELnOXh1smXwrOi4xTIoBPxvD0tDerKVhpVDzmqReLOGM53lcZiyUaCqfKTDcuZl/Hb4IhTLJbLtcvjbed1790V8rfuC6b7bIutYB5V+h6csgUBTVw7qugsjTE1wMiVeXT+Y+p7Jy57RhMuh5EH7y+X2ATV7uHGQQ2J1G3G5Q/Cm6nqOBIcWvFNKlMNXL8zvFfGhrCQAO5B0UFiy7Zi4pmHZxk37I6wRv/GJcmOL7p79y492o/tIcG+44mITNnPIbzFHTNHq02kbtS088d6E/GAtahJ3ZLkm0SzCTI9mYR; 4:MZDJLymePYzsWbi8cMxJfxNvwVH/Qwhmru3GKeXBlqRZNLYlSuV9qOVvk0JgGZWrLrdTTzJwvN6ut5pleUcdsqWnT3fNzmTq4D9bKS1w16jpDjyLUlfj/LGvPZO2xs5Zh5ICwTLqvoWmU5h4ThPB0oe4kAPoiPnkC0/t71mmCDgTePmCeWDi4Y54HwvoWc20ebW9ijMqrIU1cX3Q99QFV3pttIPehH1qjSv6NphoGeOLlbUbLsNMGVMZqZcFenJnlK3T8TpJjF1l+NYTQcRwUA== X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3231020)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6041248)(20161123555025)(20161123560025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DBXPR07MB320; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DBXPR07MB320; X-Forefront-PRVS: 0476D4AB88 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(54534003)(189002)(199003)(8936002)(76176999)(50986999)(48376002)(81156014)(81166006)(8676002)(316002)(106356001)(5003940100001)(105586002)(189998001)(50226002)(6512007)(7736002)(305945005)(16586007)(4326008)(68736007)(36756003)(47776003)(50466002)(101416001)(2906002)(478600001)(5660300001)(97736004)(16526018)(25786009)(66066001)(33646002)(2361001)(2351001)(107886003)(6116002)(6506006)(6916009)(6486002)(53936002)(2950100002)(3846002)(6666003)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:DBXPR07MB320; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DBXPR07MB320; 23:QzZSTFsDxfNxB96OSyrvQ/zOIqj5c/7fbssz1i6t7J?= =?us-ascii?Q?yLs1loi9Auz562MYpmJ18Dc+UbdQKumh8yy4FSELj64StoL5PPpQ1YQzOSEL?= =?us-ascii?Q?NEy32kdnI2QjDDEqDKQrUNAXja9yXQ5cDECm71BDtgs0kERUM5KA/wyWhaZK?= =?us-ascii?Q?1r0H6P7EfW0TQ13RaMm0TGFJ6XGguRX13pqu4ooJRFnoQ+niKZgXpswEVEzg?= =?us-ascii?Q?CFzWMmnUh+aeIL6ASvEIWaPaJbCDPaLjFhNnKVokiEtUcffOhesq8BMobibX?= =?us-ascii?Q?3WIjeslRAV2g9qQOaIcGMYlvpe7bX67bRSQuuIwAvzghKr45ck/jqElGmosB?= =?us-ascii?Q?AvCgBVcgsHUOofYLtFsUSNB5TDkizvqSg1VRM14HCa/RLlIaZ/HvEHpm/ETQ?= =?us-ascii?Q?dqXPQJhCsy/5H4/6pC4GENoTsmPpAUidjUWn6PkBMu7zWdUu2rOJY6ew8uuq?= =?us-ascii?Q?1sK2BMl/uzMN8vOxXxvF0er7Fw5xd367dUgBFwrZuYSbEeY0SElUnbg6rgq7?= =?us-ascii?Q?MfwFEOevKFBkEyu/UbkDwoSofUJG00yKQqLnQnIn0nJ9K0Z45Y2Pw45ooUmb?= =?us-ascii?Q?tfqW19oZ8yIBAjRfbLD0xsAZLrjDILvqxMhsTF5m++O6kYGUYIuF0VXNniiZ?= =?us-ascii?Q?m5nZWnHA7EEq+OQFF2f+YaCCV0NbM7RQq9ldXZN9Ebx8A7+iOzOk56Dwv+0t?= =?us-ascii?Q?J1xxGelyTPgqPcpcjXjs+POMb9BvzkawJmkEOwCSfVVknWGwS43S1DWQz5oH?= =?us-ascii?Q?+ZMSvjxSB1X1tg1kQrq2x/yol+yqYf0YZhw9eEfq/TXG/zDV6mtttyr7RM2e?= =?us-ascii?Q?WL8hytEHXKN2l5PJTZJ4OFgOLJPyh2VJQDJMVLk3DE88oN0xzh1oQq4wJl99?= =?us-ascii?Q?TVO6+0mlI6KOh4U9hBlD43/VgHrFe7rS3aYN/Z1WI/xaPMpugz899ZtLcmVo?= =?us-ascii?Q?d60RU0WeN8Jqmy3L7+bSp5JEms0UMKt2ONornk9yep+nml9FnhvdkvOsgg7+?= =?us-ascii?Q?gI6RQONPrg4/P9biqPdlcaNUAEQTKtBYzEz5VB5b153MWXVvXWZfujp2p7YD?= =?us-ascii?Q?+VyPEk68/r+MbjyAVyxwNvfE14eZOs2YefQM1yLzL///GHFSH674HxP9rNro?= =?us-ascii?Q?tZEUMp6rl8c3OjGLVKP4xEbGISuYYIDTmgmBOdKGJI9K8I92+ewg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 6:QCvFCckloldS+nhAtHgjnQPAGfOqvM/8vbyZv5zQsyXbGyCY/PKkkRGd2MHucI4UOP/WzAiBd+fN9fX/toJkKg34tTn0CKzZjPBELUeeb74X3oyTxfUU2bxGiFBXILaXhNKgyM2LMovUR/VUdUPGuHK+1QVliqzWAUfFwQImwUW71sJnLmTjB35n19hcvsRkq6Ke+QP8uVm16K2dlhCg0dB4AiycMmWlmwVivSjuOLnDUdRX26+57+VTZOo5RqfCw1D3azq29QZjIByeQNqkm8Ol6Pxhf1CF/8gqS+TzJzziX+6kmQ2gg8xIkiB8gMpHuh1OAJEDcZDSSGSyICPbOcU4mjbKfACAOYTznzeyVI4=; 5:JHULlTf8zyz4Mtn/tWoAiCN3nzeKXAhEhvCnkPMRhPLHic9BKBSadQrWQhCduMWr8jg01yvMQfMmv6ICfRhzuKMlyp3Kzg3Vmy1LSNsDRZmEvLqZitBwXgp+NIM19xEAcaP6UqCshqOMtob4wsTl/pigNT2kdxHkhsLMaVLTjLo=; 24:OKR6vFO8ALr5eNn6OuqX3ZKb/P7ZmzwVcAe1AcI3Ufx2GpArHyBjAVp4av1PZjNttiTOJ59Dd88xUQpn2eAdNv5NPu0aW24UTSWpvXLb5wk=; 7:gzyNslaYwvvzPZuFztIpHYOmddTwV7Ktt40I5yl7dPaEU0BDDrRJk/aIbTmxL2oinytsA6oXwxGXaekBgrEoI87SvAqjqVUUOMbDS73xgAFNkZr7pf/tKc9rJVsq0sGzeqh7gqv2VwPhlQbAnM8ZOnoRjWN39YeOkF3elfDAyih6nXkg0I6ohXfWVnjtPiTe0F9WTjC3Oghg3G4Gn1HZV47NQ/w7wKWlak1cPbtHS9q0z7MqUEKJ68/ZkAg+W7nN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2017 17:05:34.1760 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff5c1ad6-8b6d-477c-1e50-08d51fb86fa3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBXPR07MB320 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes [Something we can push once that series is in.] Now that make-target-delegates understands namespaces and templates, this typedef is no longer useful. gdb/ChangeLog: * target.h (mem_region_vector): Remove. (struct target_ops) : Change return type to std::vector. * target-debug.h (target_debug_print_mem_region_vector): Rename to ... (target_debug_print_std_vector_mem_region): ... this. * target-delegates.c: Re-generate. --- gdb/target-debug.h | 2 +- gdb/target-delegates.c | 10 +++++----- gdb/target.h | 7 +------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 383d4ea..27e5a55 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -116,7 +116,7 @@ target_debug_do_print (host_address_to_string (X)) #define target_debug_print_bfd_p(X) \ target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_mem_region_vector(X) \ +#define target_debug_print_std_vector_mem_region(X) \ target_debug_do_print (host_address_to_string (X.data ())) #define target_debug_print_VEC_static_tracepoint_marker_p_p(X) \ target_debug_do_print (host_address_to_string (X)) diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 8702a9e..aaf11d8 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -2146,29 +2146,29 @@ debug_get_memory_xfer_limit (struct target_ops *self) return result; } -static mem_region_vector +static std::vector delegate_memory_map (struct target_ops *self) { self = self->beneath; return self->to_memory_map (self); } -static mem_region_vector +static std::vector tdefault_memory_map (struct target_ops *self) { return std::vector (); } -static mem_region_vector +static std::vector debug_memory_map (struct target_ops *self) { - mem_region_vector result; + std::vector result; fprintf_unfiltered (gdb_stdlog, "-> %s->to_memory_map (...)\n", debug_target.to_shortname); result = debug_target.to_memory_map (&debug_target); fprintf_unfiltered (gdb_stdlog, "<- %s->to_memory_map (", debug_target.to_shortname); target_debug_print_struct_target_ops_p (&debug_target); fputs_unfiltered (") = ", gdb_stdlog); - target_debug_print_mem_region_vector (result); + target_debug_print_std_vector_mem_region (result); fputs_unfiltered ("\n", gdb_stdlog); return result; } diff --git a/gdb/target.h b/gdb/target.h index 7bcdefb..a4e696f 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -418,11 +418,6 @@ typedef void async_callback_ftype (enum inferior_event_type event_type, #define TARGET_DEFAULT_RETURN(ARG) #define TARGET_DEFAULT_FUNC(ARG) -/* Define a typedef, because make-target-delegates doesn't currently handle type - names with templates. */ - -typedef std::vector mem_region_vector; - struct target_ops { struct target_ops *beneath; /* To the target under this one. */ @@ -778,7 +773,7 @@ struct target_ops This method should not cache data; if the memory map could change unexpectedly, it should be invalidated, and higher layers will re-fetch it. */ - mem_region_vector (*to_memory_map) (struct target_ops *) + std::vector (*to_memory_map) (struct target_ops *) TARGET_DEFAULT_RETURN (std::vector ()); /* Erases the region of flash memory starting at ADDRESS, of