From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2076.outbound.protection.outlook.com [40.107.21.76]) by sourceware.org (Postfix) with ESMTPS id 30132385084F for ; Wed, 8 Mar 2023 16:08:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30132385084F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z826izVY6Brcuw7c2kHoFnuYaCjWknj0hKy+MEKX87EVAGNfmT6jzm53Y381pRf2vwJxaAzhBCSW5FxoFyCryqM25MUpYcx6/GBQoOwlDsldfxkcNAbIgF8iKGam9lQwo6COcDKyEQcJmZwQttocXELu6WHJoDAJzZ3Rnqjb++qOOvKID7/NjTu//WEGb0ZhnhbyQC7dS66TZ1Vxew/AcJSFn4IuxBGSdCFWHqgCghXFXx9aCWm+Rn8zR3sFehPZ3ta2LZ8h0j2cujVRKZzRq0UVhHLt2JQq21VyaK5Ijl4nkh9jPB8crdz3OpHo83TFzlEzvCEjyTJvVLn+2tmCjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7m/YV3wpYy1OU2ojg1FThyBK0AGDmf0fsWNaqa9kbVU=; b=hpvaqQxP3Li9OO2aBd9+fj7R0toe/lkNHya0FXM5erqfZsXTE2d4xaLXTwEUQ/66O6O5vis1aixVhGfF03kojzlRpKfXK/9wFhGOZ1TmHeDp7vbr3vv2w3l7WZDHJ+h+AfGFPUTJfsgxWd/WCIBtBwDqU963U4qHv3Jd/VUoo0oGqNtXznV46NQ9RnNAktS0J9np2e7jS+RIwUU9y/EAjMYoM58W6A7mOflDGsyLCGTuSTqzzjZwBD/Ub3VR/84Owv74qEdDC0Fepc73X3K4541PxEOcU3uKZSBZJqF/0+WqIEpErzpoCeIAmCSTZpxNCDgMcI4cE18enMDG0wh1Cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7m/YV3wpYy1OU2ojg1FThyBK0AGDmf0fsWNaqa9kbVU=; b=bnH+s4dz5DAoXWES5pdxrfkPPz2U0YVfwoveQal6Z0+A+hLY3V6Jvm2kUnZffhWMGCEVEn9tD4rr7c2zi4cRZsTYyP+ZKJ7BTn+LLreK9Sl5FEbpUTQbVkvSKb99Tp5Rd1tWA83Wd2jcwmkSTdewCdacKmyKvoyHKJ9k1PmvtU9zg4kX96G5tQEBs8VqytrGbaEKUSbKc/PKuaegXnq1A9S5AtXBEsKzbY00w+s9rwMziRzpHFLOjELHv7SBz0RPkXa6CHdZG945g+kLrHC+BkcprNiApXKF0iu0QZ3bSXz9Zmyf/BeXkX+WXqtWDdUy2EZRLv/+hA/IAiu1k+SxGA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM7PR04MB6965.eurprd04.prod.outlook.com (2603:10a6:20b:104::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 16:08:41 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%5]) with mapi id 15.20.6156.028; Wed, 8 Mar 2023 16:08:41 +0000 Message-ID: <0cdb6ff1-8f31-8222-629f-cb991a1efb63@suse.com> Date: Wed, 8 Mar 2023 17:08:39 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH 3/4] gas: use flag_mri directly in macro processing Content-Language: en-US To: Binutils References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0084.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::11) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM7PR04MB6965:EE_ X-MS-Office365-Filtering-Correlation-Id: 8aa433d0-b5f8-4e42-db16-08db1fef6213 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zx7ktuxwiy0LR91dLV/wdI1Hw59LO5f11GMh9eSseZcTCdIlm3B2YR0HaNA7gI6POIIQgY9RikNTCryNfa5yyTPbwDf2CuMLyYL6681rvKREHu6i1ES9VelaN3fCP66P4R3GmH3Yjy9qGJVRIBZaw18M0jTCi7Szzbc/kM5vzQt3c6J6j5AxjCt+RNwfBYaxc/U5LF4+69G49bV7WQJFNgpgDE6swln6hKIWBwI6hkWR3MT2G5OlRnXz1578OIFQbNxjPjJjFcX/Dzf69PbvEbmZDgEU/OERlwq6utZxwCHnJpZtfYuEMV0sgm/V2mdVk4+fLoj1XPqoTqAvR5sJietSGUIubKv52nhxLSeT3BOdyyRwqH6MbU62pP08syLrXkxr68fYzUwULE8n9U6kJ0Koc89rwiwT1nIZ52aPFh1+bXpCAu2eFNBsjmFk3cL9mrDsqMlCI2bdExLOKoSgFyQ1bw8kVJOWxUJophJkNDEXP+GgSNyADY2C8S/8Dlhj8+hk/4mz8ci0wqpxQR8+NXT2pDJwvXyCEhWNL4t349pVbXIZtL3naA9pef+5gw79lha36jXywRGO8DQJnb1hqHWOliGeI6ugDYbKaHNdm3MkwbH35pEh0TuC6C9/XKV66/W0bv7bgRj9PPPriMX26dlWzOmzEM4v9G9rUY7aidp49MPHAPgDMxjjrIFqEvzFnCh5a4xSwd6lOoHucKGHc2cxt/9E6LDkggFuf46Hl8Y= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(396003)(346002)(39860400002)(376002)(136003)(366004)(451199018)(86362001)(38100700002)(66476007)(66556008)(31696002)(36756003)(5660300002)(8676002)(66946007)(41300700001)(2906002)(8936002)(6506007)(6916009)(186003)(2616005)(83380400001)(6512007)(6486002)(478600001)(316002)(26005)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NjRQQ01BMCs0OVpXVFluK04wcXJiZzA1OFJTekVKMi9lZHV0NUU2Yy9nOUl0?= =?utf-8?B?eE5ZUlZxZW9JOFRjeE1rc0FwSDluQ2NvWk9zMnkram1ncXdOYlpUR1RKYXpx?= =?utf-8?B?SkFRa2Qxcmt1aStEeDJtdFdIT0Y1R2VVcWJRZDJlcjdzU0h5eE5XdEhJV201?= =?utf-8?B?WHp0VGRBcmg1MmZSdlJibWI2cGo0S0hWWUJvTEhLV2pna01KOXJtSlVmdDB0?= =?utf-8?B?dHZrWU1Nd094UWxoUFZTUzZFaXp3ZFBDa2VlUjYrYmt2V0JydkMxN0daaEFu?= =?utf-8?B?eXNZNGw0R2FMVWVCWnhTNDJ0SERQSkZQb0RFNGpoZjd5YzhoNXduUCtGSndi?= =?utf-8?B?emFLR3d2ZXptU2xhSy84WWQ4WEJnOUpRNGgzak5acEVIZzFGSGMxTGpacG9P?= =?utf-8?B?MjdwU0lIN0hMeTdyaGRLWnlkRElGWlBhbzFjeG5PY0tOOThudmR0b3VVcmN0?= =?utf-8?B?aXhLMGYwYzVkNWtNbVA1YUttZkI2Z3UyN0p3U2RwYlhRVGVFSm9EdWZ2aGhN?= =?utf-8?B?eVI2eHFiV2NDdlJ3WGtVSXNpcFBJdElML2NXbmtLbEE2WGlkNjFWUkFNSnl4?= =?utf-8?B?ZFhEYzAxejdYWjZ1NUY5TjlRcTJDazE3Z3RxOW83Y3ozWDhFSGZCLzhTaXla?= =?utf-8?B?WVFKS0lTR08wL0U1cVBCemFBVzFObnNHWGpwaDlmSzV2YVp6NHQ4UzZnWUV0?= =?utf-8?B?Vi9HNytBdngrd1pveStXbU92eUNLSkFQUDQxUzZlZDh0ZHRTM3Y5VXhNZExy?= =?utf-8?B?SlRBa2tNM1cxaC85WkE3UmtyT2NsbWhQR0RTazBNblI0NVQ4Wk1aTGxjK2or?= =?utf-8?B?Zld5RE5OWEQ5M2VaRHlqeFFsa3dodGpQWlIwMDhHblU4RU1SakVPSmlSdTk3?= =?utf-8?B?ZUN0RDl2czd4UXNnQzN5SzAya2ZUcUtaMHdBdDJIM2xkc29DT25zRm1hMXFw?= =?utf-8?B?Y3RhOTEwWFN6aHdxMkdseUwySVBnWnpPNGxqRXlDdW5hSDV4MTNFUVZDMTAx?= =?utf-8?B?MXhrOFRtSUhTaTRaSFBDVDIxNVZyc0plakRjQjBwek1OVEx3bG1PMzNad09k?= =?utf-8?B?dk1rTzRHZFFxTU9LVmJnb0dlQ3R4Q1l0TkVua0Fxd0NXRjVLVHBFOUxWdDgx?= =?utf-8?B?UmR4QzlIVDNzT1hqbGdBQXplaFpCS2crclExUnJUa3FjM0FuSmUwVWhHeGVI?= =?utf-8?B?R3BNdGxXc0lLakttbHd4RE55TXVaazhXV29tMUlvYmFZenFxNGpDdnMweWZI?= =?utf-8?B?aU80M0EycjJhdlBMU09zOTM3bzNoWHFrcHV6dGhMK0t3azd5ZXdjSnFtOW1Y?= =?utf-8?B?ZGJzRjRMS0d5K0ZrR1RmZnpMWm01YklYVjFvcFBJdEdYcy9CeElPSnRBMm8w?= =?utf-8?B?UkxrcUxWTGpmU2tiajBsMFFQNTVBbmg5S01IcVBSc29FTWs4bFMvQlI2M1dJ?= =?utf-8?B?WlVoOFRhbGRKeVBIMnZtbXZ0UjY3Y2orREFUSTh3VGxEUG5Cdy8yd3pObndQ?= =?utf-8?B?ZzlRNGQxbG1DUXhZRmhyRjFod09BS3crOUNuUUluVTVmVVJqOEx3TU42aWFF?= =?utf-8?B?VDFhMW9meVh2U0dXb3p0UjkrZFEwb1dwRVNFNU10YzRqNEJ0elJ4OWlpTkZ1?= =?utf-8?B?WWk4ZEZyUFZnR0VwcG03M3hYaWVVUWpyOGVEenFSajQzN0g5VE9xRDdBZko3?= =?utf-8?B?eEVEeFdpMEVHUVdIc1ZPQVRSRVZVL011K0l1cDlLNFlBczJGdnVieFlYZHN3?= =?utf-8?B?UXRlZm9US29IMUo1ZzBaWFNQVS9CRm9ndHR4eEJMUUlRQS90cDhPTDRYV2gr?= =?utf-8?B?bjBnU0F6dHB6T0NlcVNxTysvZnhuSzhEdVhTNC9TVm1LUG9CRzZjVVZlSkdj?= =?utf-8?B?QkNLWW5HcEcvL0pvU1R2SmtmR3FUMUY0TWh4cDZLTjRQR1RQcS96ZG5xVk5L?= =?utf-8?B?S3VsKzJWai9iZzFsbm9oNHBQd05rd1dpS2RVdkphQ3Y0bWZ2VDVjQlp2bUpN?= =?utf-8?B?enA3RjRoZUdyUVdXSFh2UjFTVHNVeWVjT3BtWHF0RVdYSkdYZ0Z2bE1xV1da?= =?utf-8?B?OWxySWRUU25nOXdNYVNPVUpLZ05YcTBUTVFkeEFoYmwzNkU5ZGFxK2ZzS201?= =?utf-8?Q?AaWYuw2N3E5RdbhfMbex5xV75?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8aa433d0-b5f8-4e42-db16-08db1fef6213 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 16:08:41.7419 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: at1FdXcxFngh/YBwub3EgSqJiQDEj+3kibG/++Vq0qAHG5jg9wiM3VWs04pXTKvc5KY42g/MgfYjGvvO280KAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6965 X-Spam-Status: No, score=-3028.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Again with the removal of gasp about 20 years ago the extra level of indirection isn't necessary anymore. Drop macro.c's local variable and use the global flag directly. --- a/gas/as.c +++ b/gas/as.c @@ -1307,7 +1307,7 @@ gas_init (void) input_scrub_begin (); expr_begin (); - macro_init (flag_macro_alternate, flag_mri); + macro_init (flag_macro_alternate); dwarf2_init (); --- a/gas/macro.c +++ b/gas/macro.c @@ -34,7 +34,7 @@ #define ISSEP(x) \ ((x) == ' ' || (x) == '\t' || (x) == ',' || (x) == '"' || (x) == ';' \ || (x) == ')' || (x) == '(' \ - || ((macro_alternate || macro_mri) && ((x) == '<' || (x) == '>'))) + || ((macro_alternate || flag_mri) && ((x) == '<' || (x) == '>'))) #define ISBASE(x) \ ((x) == 'b' || (x) == 'B' \ @@ -54,10 +54,6 @@ int macro_defined; static int macro_alternate; -/* Whether we are in MRI mode. */ - -static int macro_mri; - /* Whether we should strip '@' characters. */ #define macro_strip_at false @@ -78,13 +74,12 @@ macro_del_f (void *ent) /* Initialize macro processing. */ void -macro_init (int alternate, int mri) +macro_init (int alternate) { macro_hash = htab_create_alloc (16, hash_string_tuple, eq_string_tuple, macro_del_f, notes_calloc, NULL); macro_defined = 0; macro_alternate = alternate; - macro_mri = mri; } void @@ -101,14 +96,6 @@ macro_set_alternate (int alternate) macro_alternate = alternate; } -/* Switch in and out of MRI mode on the fly. */ - -void -macro_mri_mode (int mri) -{ - macro_mri = mri; -} - /* Read input lines till we get to a TO string. Increase nesting depth if we get a FROM string. Put the results into sb at PTR. @@ -205,7 +192,7 @@ buffer_and_nest (const char *from, const if (i < ptr->len && (ptr->ptr[i] == '.' || NO_PSEUDO_DOT - || macro_mri)) + || flag_mri)) { if (! flag_m68k_mri && ptr->ptr[i] == '.') i++; @@ -309,7 +296,7 @@ getstring (size_t idx, sb *in, sb *acc) { while (idx < in->len && (in->ptr[idx] == '"' - || (in->ptr[idx] == '<' && (macro_alternate || macro_mri)) + || (in->ptr[idx] == '<' && (macro_alternate || flag_mri)) || (in->ptr[idx] == '\'' && macro_alternate))) { if (in->ptr[idx] == '<') @@ -423,7 +410,7 @@ get_any_string (size_t idx, sb *in, sb * sb_add_string (out, buf); } else if (in->ptr[idx] == '"' - || (in->ptr[idx] == '<' && (macro_alternate || macro_mri)) + || (in->ptr[idx] == '<' && (macro_alternate || flag_mri)) || (macro_alternate && in->ptr[idx] == '\'')) { if (macro_alternate && ! macro_strip_at && in->ptr[idx] != '<') @@ -450,7 +437,7 @@ get_any_string (size_t idx, sb *in, sb * && in->ptr[idx] != '\t')) && in->ptr[idx] != ',' && (in->ptr[idx] != '<' - || (! macro_alternate && ! macro_mri))) + || (! macro_alternate && ! flag_mri))) { char tchar = in->ptr[idx]; @@ -553,7 +540,7 @@ do_formals (macro_entry *macro, size_t i idx = sb_skip_white (idx, in); /* This is a formal. */ name = sb_terminate (&formal->name); - if (! macro_mri + if (! flag_mri && idx < in->len && in->ptr[idx] == ':' && (! is_name_beginner (':') @@ -625,7 +612,7 @@ do_formals (macro_entry *macro, size_t i } } - if (macro_mri) + if (flag_mri) { formal_entry *formal = new_formal (); @@ -764,7 +751,7 @@ get_apost_token (size_t idx, sb *in, sb idx = get_token (idx, in, name); if (idx < in->len && in->ptr[idx] == kind - && (! macro_mri || macro_strip_at) + && (! flag_mri || macro_strip_at) && (! macro_strip_at || kind == '@')) idx++; return idx; @@ -838,7 +825,7 @@ macro_expand_body (sb *in, sb *out, form if (in->ptr[src] == '&') { sb_reset (&t); - if (macro_mri) + if (flag_mri) { if (src + 1 < in->len && in->ptr[src + 1] == '&') src = sub_actual (src + 2, in, &t, formal_hash, '\'', out, 1); @@ -887,7 +874,7 @@ macro_expand_body (sb *in, sb *out, form sb_add_char (out, '&'); src++; } - else if (macro_mri && src < in->len && ISALNUM (in->ptr[src])) + else if (flag_mri && src < in->len && ISALNUM (in->ptr[src])) { int ind; formal_entry *f; @@ -917,7 +904,7 @@ macro_expand_body (sb *in, sb *out, form src = sub_actual (src, in, &t, formal_hash, '\'', out, 0); } } - else if ((macro_alternate || macro_mri) + else if ((macro_alternate || flag_mri) && is_name_beginner (in->ptr[src]) && (! inquote || ! macro_strip_at @@ -970,7 +957,7 @@ macro_expand_body (sb *in, sb *out, form } } else if (in->ptr[src] == '"' - || (macro_mri && in->ptr[src] == '\'')) + || (flag_mri && in->ptr[src] == '\'')) { inquote = !inquote; sb_add_char (out, in->ptr[src++]); @@ -985,7 +972,7 @@ macro_expand_body (sb *in, sb *out, form ++src; } } - else if (macro_mri + else if (flag_mri && in->ptr[src] == '=' && src + 1 < in->len && in->ptr[src + 1] == '=') @@ -1070,7 +1057,7 @@ macro_expand (size_t idx, sb *in, macro_ while (f != NULL && f->index < 0) f = f->next; - if (macro_mri) + if (flag_mri) { /* The macro may be called with an optional qualifier, which may be referred to in the macro body as \0. */ @@ -1105,7 +1092,7 @@ macro_expand (size_t idx, sb *in, macro_ scan = idx; while (scan < in->len && !ISSEP (in->ptr[scan]) - && !(macro_mri && in->ptr[scan] == '\'') + && !(flag_mri && in->ptr[scan] == '\'') && (!macro_alternate && in->ptr[scan] != '=')) scan++; if (scan < in->len && !macro_alternate && in->ptr[scan] == '=') @@ -1162,7 +1149,7 @@ macro_expand (size_t idx, sb *in, macro_ formal_entry **pf; int c; - if (!macro_mri) + if (!flag_mri) { err = _("too many positional arguments"); break; @@ -1196,7 +1183,7 @@ macro_expand (size_t idx, sb *in, macro_ while (f != NULL && f->index < 0); } - if (! macro_mri) + if (! flag_mri) idx = sb_skip_comma (idx, in); else { @@ -1217,7 +1204,7 @@ macro_expand (size_t idx, sb *in, macro_ m->name); } - if (macro_mri) + if (flag_mri) { ptr = str_hash_find (m->formal_hash, macro_strip_at ? "$NARG" : "NARG"); @@ -1233,7 +1220,7 @@ macro_expand (size_t idx, sb *in, macro_ } /* Discard any unnamed formal arguments. */ - if (macro_mri) + if (flag_mri) { formal_entry **pf; @@ -1271,7 +1258,7 @@ check_macro (const char *line, sb *expan sb line_sb; if (! is_name_beginner (*line) - && (! macro_mri || *line != '.')) + && (! flag_mri || *line != '.')) return 0; s = line + 1; --- a/gas/macro.h +++ b/gas/macro.h @@ -83,10 +83,9 @@ extern htab_t macro_hash; extern int buffer_and_nest (const char *, const char *, sb *, size_t (*) (sb *)); -extern void macro_init (int, int); +extern void macro_init (int); extern void macro_end (void); extern void macro_set_alternate (int); -extern void macro_mri_mode (int); extern macro_entry *define_macro (sb *, sb *, size_t (*) (sb *)); extern int check_macro (const char *, sb *, const char **, macro_entry **); extern void delete_macro (const char *); --- a/gas/read.c +++ b/gas/read.c @@ -2746,7 +2746,6 @@ s_mri (int ignore ATTRIBUTE_UNUSED) #ifdef TC_M68K flag_m68k_mri = 1; #endif - macro_mri_mode (1); } else { @@ -2754,7 +2753,6 @@ s_mri (int ignore ATTRIBUTE_UNUSED) #ifdef TC_M68K flag_m68k_mri = 0; #endif - macro_mri_mode (0); } /* Operator precedence changes in m68k MRI mode, so we need to