From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46787 invoked by alias); 2 Dec 2016 22:22:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 46762 invoked by uid 89); 2 Dec 2016 22:22:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 spammy=1277, 3937, temporarily 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; Fri, 02 Dec 2016 22:22:48 +0000 Received: from ESESSHC010.ericsson.se (Unknown_Domain [153.88.183.48]) by (Symantec Mail Security) with SMTP id F2.F6.31000.534F1485; Fri, 2 Dec 2016 23:22:45 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.48) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 2 Dec 2016 23:22:44 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxcz23q12-y4.ca.am.ericsson.se (192.75.88.130) by DBXPR07MB398.eurprd07.prod.outlook.com (10.141.14.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.4; Fri, 2 Dec 2016 22:22:41 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] Introduce enum_flag type for ui_out flags Date: Fri, 02 Dec 2016 22:22:00 -0000 Message-ID: <20161202222224.4760-1-simon.marchi@ericsson.com> In-Reply-To: <82c0febd-7237-15c8-b952-8ef978b1cd8e@redhat.com> References: <82c0febd-7237-15c8-b952-8ef978b1cd8e@redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: CY1PR21CA0053.namprd21.prod.outlook.com (10.163.250.149) To DBXPR07MB398.eurprd07.prod.outlook.com (10.141.14.148) X-MS-Office365-Filtering-Correlation-Id: b24abec9-1e4d-4bf6-e31a-08d41b01bbda X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DBXPR07MB398; X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB398;3:U5T0g5nAUfgCguztt8jzJ8H/oATFiyEDNFjiKCV2hs8ktFJ/iqQCUiX1rjTSUzh4LNAsqEInggbJycOrtWdb8CXyEefVZ+zA45/FAYXcmfyQE5HU6fUmoijoglp/ILoYbMNp3rZ43T+D8zXHvRgEpzq+kD/K7IECjPtqqYR1xrgLN2AsIkEAxOfaVBkD04Vz8cBHJizuXLb5qF3rZGR0HzRL+zKRVm7ixCsHRu0r2DnZ3B9gSLS33OOQ8Rar3PyattNlqJuMJbh+Eka2hD7qQg==;25:w0M2aWD1BoTUp0eTlr12ohHqRc2DOWAqiDYu5oMga8Zvkr9GpdyRHFpCHSShZXcyUCQosaEkyYk+/norOZR9ie31Eg3k/tdqoM8KpJ1MrAIqOcOAuaGVEP9fJIeLbkm+bCo5Jo4EiO0aOzitmtM3yPrlz7LWI1rcfnng+3COzD1N/MiuJXQGi4M4Ey5O5snPF7qTh4PXvrZ8S9/CW3CPkA3kYkQ2k5xmhxJ7dOHPWcup/IQb/hBUB+UAmuAYZyXgFezRbNsVj6Ltq7lllGXH2ZEhuIlRuxQuWmUKCjDpv/UkyzzwDNddlSzKb+mzMEX205YbGpid0zdKtRbOgDjvQXXlpKXZFIop97gYMJWzxqvplUCqyGjXzOEE38TFytOHglD9aaa1KVu2gyeJlMX5c9yUcpseH/UA6ZJ2TGVGQm3v37OxTx3inqhlJgcwR2AATZFPRUAYpakJD0swpYUO6w== X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB398;31:IpXuPFcYRecFIoYSPC9A2xw4qwXYXG8/MNXYpNM17GzJS8O8UPz7z9QD9bGikZ7UxNxgrduCctIf8xPbK3RRQefVWFzQD09TTah3HFt0SVpUPJ1T6BdTNuZVLoHV+RY+FBDZcPXHTrOKKMLkTHdCJRm71Zg40hcwb6FxxGNfJm/d+wrv71v1V1AwuRjHDEJUJtJQjFOELBZtmMnRMp/b2lHjpKL/b3G8o4/7Gw7ywFOqsZ4yDvCqKFyGszWL+Fe4GvHgeY3gbl4PNSZ7tzVi7Q==;20:7kl+cLJDbUnq+b2PJv40l+z3qQokLKJKmcHJu0C8reeAHrLV2UL5c0KA/5680d9tTVMbh9VLbcQ2xzo8QNmhW1D/bJXoDw70VNkdAy3E59ld7Hc5sJSV0m1QcKdRJfCSkmz/OovHLBkYCFZVf+2bYN739j1vneiStfnwwtkxlAHg3p5YB3y5tocjTLSYKhqTbrOIYw8KtMu9RuUHAWaHTdgerOUQdWOvhTe3Arw/dfWj0ItgnIW6zSvoKE4H3O6kFmmyg0hVgNzT5ZdAhv0J/T6QFx3GGUaGsHXeVhnKzQtQlRb+iVmTo9urLnMRqopIBS+vViYh4bMMdpD0D2oYCWITFGdqondesNihc6cgvWgcK1amTvdVbcq2rvmJU7vOiOBbWjSD/RIZm+NVSeVhP3/Vak4Hvm5g8+FOps/AMe8BBlCL61LFzXH5MhF2BI53VeZfA4QkWQCmknIWda/LWgs24gx17alNZmAm4r9o8pAX1uHeaTrpgkJ5iu2bkICV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6042181)(6072148);SRVR:DBXPR07MB398;BCL:0;PCL:0;RULEID:;SRVR:DBXPR07MB398; X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB398;4:Nv9UsJbzzBNQcYH4Z9+/kyMZFZ/WRBLveZqKkw7bngP8ioHSTxAnZP7ixTtHSyWUuUT2wh+20A3rC0Ex3IZM6UA6iJO7+EdDS+VhX3aYs8B7Ro1XG/bs39vft/XsHDwLbHS5K6yn5h2Qe7yhL2F/ox+QbDKA4ZVPQz6fA5MRWNLv32DQLAi3TqNSfDZaMj7rXyx9nfD80+rl+2aKW3n0P86YRCK/repJVoJonMiFNrCAf+g6f9U9COel1QDKAxEAqtu2SLrI2f7jjj4+sST1L2doYwGWEgWsSh6zDr3dCL0KvUFHSlOtiSMgmelp4I1GEXehZBOHv9Iq5Hv3iwJlSn4RZGAdQrJinhYJLHtuKHzjxuJhaavBSLGiAjGDg2e1nnf43vcxoLS3qiXhbsqQ9V72hV1mxISw3DXnMJ3vrnupBHQPpsZZEa23rQD+2JA6eQvq7V3Bn56aSKnXVGmUibPqDDy96leYIVQ33eCHTY2Jjda0oXvPBwIoqFtEFgGftWub21FZVmL2v0O8AG0nGbb9S+XpfCodynA/lkbyc14gBgzAK5DRBm3S33D60lUUyLr2I5+f0IODWKhhwT8D+w== X-Forefront-PRVS: 0144B30E41 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(377424004)(54534003)(199003)(189002)(189998001)(81156014)(8676002)(81166006)(97736004)(2950100002)(7736002)(76176999)(50986999)(110136003)(6512006)(305945005)(6506006)(6666003)(5660300001)(5003940100001)(68736007)(48376002)(38730400001)(50466002)(50226002)(6916009)(1076002)(2906002)(4326007)(92566002)(7846002)(733004)(6486002)(101416001)(36756003)(105586002)(66066001)(42186005)(86362001)(3846002)(33646002)(6116002)(106356001)(2351001)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:DBXPR07MB398;H:elxcz23q12-y4.ca.am.ericsson.se;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX: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;DBXPR07MB398;23:/BtmXZHJ8KxAtZRpkae6lddrUJPUdgrvYEWMcCH2x4?= =?us-ascii?Q?ET/QbhUrni5UyNVj8fBhzeJGMa/vmGAatgB+GkZTaMHYvMBDTmD+cmF38Y/E?= =?us-ascii?Q?YnecjJJ1hS1+2MckVI8n0ZNyyrZd7JaZEQA6qWZajNJyJk/yW7VJ5j9xMGrE?= =?us-ascii?Q?WP0huZPkgWIjsW9+j+ZWxtSlx+6yOwCE/VyiT8AlEI3lEyPHcygifVsDTP3U?= =?us-ascii?Q?7nXjFNT4h5MObipYJ7JZ0uytFjf4xwH+Q+9vAPpzVWQqjQD6ajnNOUzvHIBY?= =?us-ascii?Q?2XPDWvaUFiZwrUFr9LjXVkYExhJaRt4sL8E1lby5MJIX4zcJSfZIP15N6F8I?= =?us-ascii?Q?ul2vRiqHw5ALvKNRdptuDEQ0vtAOP49dJ4rpvmKgLFEij0BQzrUisjd7YBwP?= =?us-ascii?Q?QfH7cp7Y1h5OgIn23KaVHvV0qdsDDY+n1SgZzt51bUJBE9q+Mr0S6Mc4Z/2s?= =?us-ascii?Q?i/Hp5oKuAwu3bhAqStpuJVV3m/HBMz3ZiCm98luMcAU1wfZ5b7Wm5XWh2Nb5?= =?us-ascii?Q?Eui2u3a0exeY1DzJ6K83VYDtaMzgE9KGo3Qsr7lo8RmKKS3XknQuYY+jP068?= =?us-ascii?Q?o62lx5EXSzCpF73kuF1tdSOJUb5S+AQ6IVJIBZWkD8BLJXgX4Xir8uurnaMM?= =?us-ascii?Q?YtaKjhhskZ6q0kT4lxfGnrYUWxidHc3sLeX0gdctyri4CXNyuklmDe6y/8XC?= =?us-ascii?Q?5wYaEkjKp4KpDHoq78HIZUmoDgZiXonVXP6JfpqEg3wqligbWTyCnBFWW4TE?= =?us-ascii?Q?42CvZ0Gch89cbn+Zkn3wAaeCMc1Pk49IyvK3bcuwRvrwOBGZzJAcJcg3rZsg?= =?us-ascii?Q?WPmzN88d5I4svoWFOJudAXbSqLksrywUASpZUcYMOsPl2hXSXh6MJ89aEUS2?= =?us-ascii?Q?WczSsg8/SZb+c6+BZmoMkkK1UwWr/AHDgF+xyoTfUiVKwFufZE654Q4YOSBn?= =?us-ascii?Q?rRnoGMtqCu4RUshxjGUDP1QAHRM2bkgfuK2UUf0TrQPZ/RDHOA2DmAFdFxCg?= =?us-ascii?Q?ZzB48/b7YM8k7X6xigL1SA2vbgP4Wm7JE0YfIiOAN8URI5fUTAheXqMC+hFm?= =?us-ascii?Q?gffEXJLPDCA6fqeqAUWrbcaRn8zc0XBCe6DiWGcz2su1YqS3NSll0WNX14Y4?= =?us-ascii?Q?RVXm/cZXOMBC+ug0KOLJ6IjwPxbTwm?= X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB398;6:xeC1WOTmP/nSYxzAtIGLi9ki1js8RK1zRIu7Aw0ogRNjwpP6U8oZGcQdoz3J4sO2+mDWh07rx3bliL7a3JY69quBebe/5n1vYJOIQpeQdE4R4q9h6EHkX+hYnoGoQfQ6RCrXJANlK8HGh6dUD6H6XPZ4RC5XSDNj9q1kjNUjRPmg5N3+yfuCGy7uQKlAj2fkDFYwa0ck94SmF8geQMihqAXlGp35PEfMPDpBOmp8tRXGYydyERnyItjuhe4UTVMsa6qdlBxfys8aD+j4ViF9sWaj+qKj5wwd3Eql134qTJ6UQAJzZv0bU9M0rBhzeCP0q/vFAqGBD7tQfv/jRuhcz4i8ZeRa/p6XalOJjWlqJ2iTlP7eqjRyGnbVxyvAfw1+c7vQrfEZIutwme2ZuBz6cmDVI4f07eFsbIibjx8/4vc=;5:wu4D+SIBTMZXODfQix8f0vABb64OYFrQEUnogGP3HDGxMUb2mRI5+fZUqBeYPtkBfKvAidVGTnc1vpysGocuCMK/KgV5hWKTIbfBwCmdjWDyq30Ouf3Tc9uQzUawD/jC02vfw8Ya74rE0Su9bLqV/w==;24:YsFWLsaXXRtM52PXsmclfpqRqtrk5hkABmGUfCiOOOElbDmfve70NZvT1SJd0Etru9zP/o1S0sCI2HCLBfmzJ0A8tPgqbZWtVNi9ZRn6fno= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB398;7:187OwrX5vlwTsu+sv35aXatLuCGaJf3u+j1mOlX86Mm3WQrLTv5i+KaSx1LcSpRQDvcoshbaxRjIibOYodI888iQgVfpVTJ2ingXP9lK4WCoWILichiIVn9UGEKJPGoTZ/dm6Mz89ZpLkVhFmqAR3ldYHmyNpCDNAFa/rKLlbkUuD3wPKwWEAN9jNU41l5bPu8e8wm5kAan4syj2QRPN4EMGW3h+twt9YY2x4CyZuC7dNhlQM6TClWXswgCzaFKieCTbOZU1CkAQTryYeIZynTNlCV6srtee0IslSQLhwxuc1dNRyxscOO+wsTS5l/TKV9fW0l7om2d0GbngkTXBVqFr6dnmF0WDvkntEOWjqHg1OAf3h8azFhIxmP7c2fAX3j2tpD4kh14XKgXk5bntf0pKtOIAQ1gfYv+HAlhBbSKy7zkyyqgiHkgm+3PQL3HB3VQpfLrE/kw5hUX6HiNGhQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2016 22:22:41.9868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBXPR07MB398 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2016-12/txt/msg00118.txt.bz2 From: Simon Marchi Here is the version I pushed. I wanted to get rid of this patch while I rework the last two big patches (which will become a single patch), so I cherry-picked it and adapted it to the pre-class code. It's obviously a bit different than the version that was approved, but I think it's straightforward enough. This patch changes the ui_out flags to be an enum flag. gdb/ChangeLog: * ui-out.h: Include "common/enum-flags.h". (enum ui_flags): Rename to ... (enum ui_out_flag): ... this. (ui_out_flags): Define enum flag type. (ui_out_test_flags): Change type of parameter to ui_out_flags. (ui_out_new): Likewise. * ui-out.c (ui_out_test_flags): Likewise. (ui_out_new): Likewise. * cli-out.c (cli_out_new): Update variable type. * mi/mi-out.c (mi_out_new): Likewise. * tui/tui-out.c (tui_out_new): Likewise. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/cli-out.c | 2 +- gdb/mi/mi-out.c | 2 +- gdb/tui/tui-out.c | 2 +- gdb/ui-out.c | 4 ++-- gdb/ui-out.h | 15 ++++++++------- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 777abc7c30..4a64fca8d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2016-12-02 Simon Marchi + + * ui-out.h: Include "common/enum-flags.h". + (enum ui_flags): Rename to ... + (enum ui_out_flag): ... this. + (ui_out_flags): Define enum flag type. + (ui_out_test_flags): Change type of parameter to ui_out_flags. + (ui_out_new): Likewise. + * ui-out.c (ui_out_test_flags): Likewise. + (ui_out_new): Likewise. + * cli-out.c (cli_out_new): Update variable type. + * mi/mi-out.c (mi_out_new): Likewise. + * tui/tui-out.c (tui_out_new): Likewise. + 2016-12-02 Pedro Alves * NEWS: Mention that user commands now accept an unlimited number diff --git a/gdb/cli-out.c b/gdb/cli-out.c index ac19e38c3d..f5b5072e55 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -388,7 +388,7 @@ cli_out_data_ctor (cli_out_data *self, struct ui_file *stream) struct ui_out * cli_out_new (struct ui_file *stream) { - int flags = ui_source_list; + ui_out_flags flags = ui_source_list; cli_out_data *data = new cli_out_data (); cli_out_data_ctor (data, stream); diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 6e69d7cb34..19fcf87fbf 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -393,7 +393,7 @@ mi_out_data_dtor (struct ui_out *ui_out) struct ui_out * mi_out_new (int mi_version) { - int flags = 0; + ui_out_flags flags = 0; mi_out_data *data = new mi_out_data (); struct ui_file *stream = mem_fileopen (); diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c index 4856562343..a5f0541037 100644 --- a/gdb/tui/tui-out.c +++ b/gdb/tui/tui-out.c @@ -145,7 +145,7 @@ tui_text (struct ui_out *uiout, const char *string) struct ui_out * tui_out_new (struct ui_file *stream) { - int flags = 0; + ui_out_flags flags = 0; tui_out_data *data = new tui_out_data (); diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 8f745dadac..774be2cb71 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -702,7 +702,7 @@ ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream) /* Test the flags against the mask given. */ int -ui_out_test_flags (struct ui_out *uiout, int mask) +ui_out_test_flags (struct ui_out *uiout, ui_out_flags mask) { return (uiout->flags & mask); } @@ -923,7 +923,7 @@ ui_out_query_field (struct ui_out *uiout, int colno, struct ui_out * ui_out_new (const struct ui_out_impl *impl, void *data, - int flags) + ui_out_flags flags) { struct ui_out *uiout = new ui_out (); diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 06c05e2f3a..cdf567148f 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -23,6 +23,8 @@ #ifndef UI_OUT_H #define UI_OUT_H 1 +#include "common/enum-flags.h" + /* The ui_out structure */ struct ui_out; @@ -45,12 +47,12 @@ enum ui_align }; /* flags enum */ -enum ui_flags +enum ui_out_flag { - ui_from_tty = 1, - ui_source_list = 2 + ui_source_list = (1 << 0), }; +DEF_ENUM_FLAGS_TYPE (ui_out_flag, ui_out_flags); /* Prototypes for ui-out API. */ @@ -127,7 +129,7 @@ extern void ui_out_wrap_hint (struct ui_out *uiout, const char *identstring); extern void ui_out_flush (struct ui_out *uiout); -extern int ui_out_test_flags (struct ui_out *uiout, int mask); +extern int ui_out_test_flags (struct ui_out *uiout, ui_out_flags mask); extern int ui_out_query_field (struct ui_out *uiout, int colno, int *width, int *alignment, @@ -222,9 +224,8 @@ extern void uo_field_string (struct ui_out *uiout, int fldno, int width, /* Create a ui_out object */ -extern struct ui_out *ui_out_new (const struct ui_out_impl *impl, - void *data, - int flags); +extern struct ui_out *ui_out_new (const struct ui_out_impl *impl, void *data, + ui_out_flags flags); /* Redirect the ouptut of a ui_out object temporarily. */ -- 2.11.0