From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2079.outbound.protection.outlook.com [40.107.22.79]) by sourceware.org (Postfix) with ESMTPS id AB39E3858D33 for ; Fri, 5 May 2023 13:04:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AB39E3858D33 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=HajMNPenXg+3YHOQWyktuA5owqehALAXpvb/EpBP6Ta5XvygOaX8SaNWs2zsD6nymgxuyLaFkVhHvQPuAbJXckKZbhCxz/xgs/8DVGqMsLJCNRZVUQ8AFMupEim0GMQ2BNfLBmh3waXQyIeexWmYh+xTSlM+HswigRFC1uJj0MQUoec/kKjQ/6jehACeNo8NTkSb9K94arLVg0eze6GtZTUOASS1or6H2Yr/mSZ7VUaiopnlaot5rqOsymQXi+aStBGcEvmWhIri2KqCyRQPwztEdSWUoz34RmtQC1KJuyqwzCfs8RDnlNKGw+gNpiOarTXxdZUy5NhruglHn1cNaA== 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=g8h1bi9Ip7VgjGM5flxHTUrs804HVvHJQefexaRfcfw=; b=iUGHLA+IijTmzZN1zCCXw88KrBps3qCb3/K191vMTTT7fSK3hIaNgiojNElW9Om9wV5tMNpk8eWpPH8RleAksvMWgiiAv5S4DPxcc/ZPXYhUaXI7sgxnF6Zm0FpJvWp3P56szlW4DnExQNnczbP+wHXLFpmVIgDkHHPQ4A+pnm+OdrjUjLB1ONqkkVa/pRvlMzASDMgviaOQVyY+TRm7OOoUNcgTze1Ric8Qp2QIsltVtyPzRHXyEnL5tGcjUx9HQqt0uHsfljgaRcsQCL2xikpoXQLmclL4EmLXiCcLnOLWrdTM6Pyk8rup8O3i2BAArZX/iC17YtlRxzHgNpYdhA== 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=g8h1bi9Ip7VgjGM5flxHTUrs804HVvHJQefexaRfcfw=; b=JSf74xJRPmo4Ld/Me9OWU6kQLBkXSC3zaha2UCjlzqTWU3eLE61E++W4Sd4ygwc5QVKKBoyfK5hacKohHpbYkQvKG8aAQSrKT/5yWi8az9k+OMVh4N7UNZ6U3JvC3bBvWYxhYNlFTceyZDEhCCeDEXjT3nqqb//CkaAIwJNN7pbRmTo+wXrwWu7bdMoIL3a6Tc15JsOH339wvKmPttPO9/tLOSa9WeD0Rt+FgIX49RCMvNFSfuiqBn+Znldn1REHx2MiMRoZh2vmxwyQtC5YMRb5ORxxzUq9lOcJsGBBluhbgzy7BdDfod2xsKOBds0FRTwsLk0rhVBySC1VaE0S1w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by VE1PR04MB7309.eurprd04.prod.outlook.com (2603:10a6:800:1a8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.27; Fri, 5 May 2023 13:03:59 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7%7]) with mapi id 15.20.6363.027; Fri, 5 May 2023 13:03:59 +0000 Message-ID: Date: Fri, 5 May 2023 15:03:57 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH 3/4] gas: invoke md_optimize_expr() also for unary expressions Content-Language: en-US To: Binutils Cc: Alan Modra , Peter Bergner , Geoff Keating , Dave Anglin References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::18) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6551:EE_|VE1PR04MB7309:EE_ X-MS-Office365-Filtering-Correlation-Id: 49cd9510-5d83-49ac-1d53-08db4d693112 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a9YtQ4ip7MVYGANn/YluEIFLxmBFaswm8ndzqSYjlUDMp5ql502KEQ/aXz0ySO27/DjnAUt4NE/P3DKbNtzGMSOfr6UCqKgNgEy9Y+pPl/0zifnnC44MRr5SYMA7Qbg2ghoHnPLI3InIK6T8RaecayW21j60HPEyo440AHPSeIOGrqQk9H/yeShUCcfTZYKUF0AsX+ONabLVbOG1SCeaPRLE7IICTLNLQ3aIKWKD3uXWwu8NPVSjVTwkXuc2er4bdEB2JK4lV4ZgWW/XUuDYdR1pAgEbJ43KpCAbekMW2fykGzRZgkuYR9a1nBh12+kvqEebjBIG1L//0HTOzy1AM3mIsoRFaC/etbQyr83mKxHmTi0JC+C9eUFtiIoXfAJIlYiNN8SmFNsw9JDuG+sNuZFSllQMS93+zIpGmU34o1+AdlIqxlYTs2OXYxdQj4Ixduxn+8/yevOUmfBuQj45jHJSAxjuDr4MsHTK/dE2g3Ck4rE+q73m/uwCrkEbnAKhEgeXGu/gaRn4kizSV2dy7sMYcO11S48QX9DuaKiJTK77pK6yeJjZVX3Zf/Gxb82OmH3nBlnpRwZalbXb+CMjKw7foU5FFQ+nSBZFc70BDIzQEwsLzml/EoODsI3XLNgEme2IN1DxREGVxzFxHWneAw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(396003)(39860400002)(346002)(376002)(451199021)(6916009)(6486002)(478600001)(4326008)(36756003)(66946007)(66556008)(66476007)(41300700001)(316002)(31696002)(8936002)(8676002)(86362001)(38100700002)(5660300002)(54906003)(2616005)(2906002)(31686004)(186003)(6506007)(6512007)(26005)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzEzNWI5M0NJWkYvRUJKZWZYb04vcWd2UTZwM1B2dWJieWZyUk9pRFpDQkQ4?= =?utf-8?B?bkFtRHArWGNmU0hqTUJwWXZjVHRtM21PTVRvU3k3SG93UUJIRFFxMUJRaUtP?= =?utf-8?B?Q1Z3Y05Wc0ZmNkZJNzFCWmhwbUJieXJSUzR3RC9lY1QzK2ZWekZad09ZMXM0?= =?utf-8?B?TkRHUVdTM0JTNnN0WWUzSWQzUmxLZkluR1ViRjhIam1tK3M3em45aEh1NjRv?= =?utf-8?B?NlhhS0pZd2tnSTlMS3l2UnY1UmErSFcxZ3B5c2pidENDUHRtTnRWcUFmZE5x?= =?utf-8?B?bVhpenhkTWZKZVlabXNGME00ZlZOSERmd0JDaldKYnl6WTZUWk1SUkFNYnl6?= =?utf-8?B?Tm1yc2lLeHdxU0puUTBRbjUzNitaaWlQK1UwNDZVc2ovelJJYytabnh2NkNU?= =?utf-8?B?MXNRU3RQb3JOWHJSc0c2QTNJWFh2WDRCWFh2Q2VRV0NDZCt0ekE2S1Q0ajMy?= =?utf-8?B?b3ZYSWZyMzRqTWVkZDFQRmJsN2NRMlpkRG9pVWlKWmVYcisvNmltdTVRekc2?= =?utf-8?B?d1JGeUF0bGJyQmkwN3F4c3VoeS9JYndJazN4MCtMMTNIblJqTVNEa2JnT0M4?= =?utf-8?B?OXdMSXFTRkwxVExmSDlwOGVYMU1UZXluMmZEdjVyem1WVVJHb3RlYmQzalJI?= =?utf-8?B?dmsxaGlIVy9CK0FwWEgzOWRGZkc1S0R1bFJxMDc3THprUU9wbGRMa1lRRVJs?= =?utf-8?B?bHNGZ2ZSQXRaNVg2WGptQ2twYmFaUVJxbm9ITkMvanBYRTNnUTJuc3V0azNH?= =?utf-8?B?TW5kb2tBMXZEVURkZFplRUh0VitlQVJJTFp6VHovTjJRU2VrNEl6OHBndWpR?= =?utf-8?B?Z2FQdWk0U29YblE3MUJjZDN3MWlESDhYY3RKUktDdVNYbmI5RmlmY0UwL202?= =?utf-8?B?WGo2UmhFR2U5V2NCK1lDSlRBbEFIalA2WTJrTHQ4YnlLT056Q0V4RktsSzhW?= =?utf-8?B?M1BCRzRWT1NEcGVIK3VDRGlGa25nTnlKOWxXQVJFVHM5ZjdzU1g5ZFlKOWR4?= =?utf-8?B?UUw0OTZvdDJFcnFZV0NjWEw0ZlF1QlJ4elhIZVVBZSt6d2w5SG5IcXUzS25C?= =?utf-8?B?T2RjVnJpZjQybW1uZU5hdDVEMnFRRUdoRjczelMwME5kbU80QW15Y0NySk1v?= =?utf-8?B?d3JVSHVxcFhlOS9Hbkk0Z2pFaStWTFlHeUJKKzBESi96WUhoa3pxNEJ6RU9V?= =?utf-8?B?cmx4SkU2WHUzT0MyZDNhUGFPZUxldGNUVmRmNjd4Y2NlSU5GMTRBa3piRXo0?= =?utf-8?B?a3FURTNZdHM0eGlNTjVQQjM3OG0wUmhEcjBKN21tUUp3aGRrQWFpSTdOR1Jl?= =?utf-8?B?USswVzZhVFhYa0l4NU0zTjZ5NWUwSGdxanRIb1krcDZ3cVNJVU1FSkdJWThH?= =?utf-8?B?UzdWMnRuZzdtd01BeldqOE1WclpubFE1alVRZXAxWFBFVDBGS09xNGFvNy9m?= =?utf-8?B?TkV6dEVoa3hGdEJVQ2pEbWxmb3ZSc1o3d3hCTXd5YjJseVR1U0dXdFRtMllo?= =?utf-8?B?Mkw0K0lvMHhyWVZIWVVqN0lRUkRJU1dPY1lvYVJCOTVDTGwySjdmYjNHdGxO?= =?utf-8?B?N3Jlc0F6S0Q4aWROY1M0anJnZGVmK2dXQmpZZmJlUXE0ckhPdnM0Z1dKRWsz?= =?utf-8?B?MDNld3FxTkhWdEtIMWg2Y3pweEZvd25wQ3FGWHJaWkNEbzE2LzROMW94Sngz?= =?utf-8?B?SHZYU0hDR1A5VUlsSVpNWFhaY2xwSkk5b0ZzNm9uMVBZRnkwZkVJVG5JQ3Nl?= =?utf-8?B?Y3lyOG5QNXFPTTNyL0I3Qkkway9lRWc2OXAyVXBHOVFRWlNudW5MbXRPOGZM?= =?utf-8?B?RFZSUjNYZXVQUzZaa25Lb1FXVW5RbzhEQjBkWGJONmtpcUFUWGdGL0JDbFFs?= =?utf-8?B?M1JJU0Qxb0drYzlVcDYyamM0cklpTFBuM3ZCcUZEV2x5amcrY2V0RXB4c0tz?= =?utf-8?B?Qlh6UHIwUURraXRGc3AyQUI2Nk85VzJKTENiWllHWnFLaWNIaVE4Zmlva3Vh?= =?utf-8?B?Ym0wdG9MTFdld1ZKM0cyU0FyeDBkaGl1cW4zb1lhdmNXcHdod0gzNm1HUHNS?= =?utf-8?B?UGkyR1lFUEVKcHA3WHlmTndVNTZQbjdIYTUvSEpma0NScG9NWkhGcnRMWVQy?= =?utf-8?Q?nIXnKwevixEURlUNn1PEn8E+X?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49cd9510-5d83-49ac-1d53-08db4d693112 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 13:03:59.4296 (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: Zp+l0zNmWV/KWQQgyYCGc9DgZH1bGHrQZsAj2Q29S9BJRU72on/JNfba6GQqkcNnlso4c5yoYtv+G8GvkTnheg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7309 X-Spam-Status: No, score=-3027.9 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,T_SCC_BODY_TEXT_LINE 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: Give backends a chance to see these, just as they can see binary ones. Most of those which use this hook already cope with NULL being passed for the left operand (typically because of checking the operator first). Adjust the two which don't. Take the opportunity and also document the hook. --- a/gas/config/tc-hppa.c +++ b/gas/config/tc-hppa.c @@ -6354,6 +6354,7 @@ hppa_force_reg_syms_absolute (expression expressionS *rightP) { if (fudge_reg_expressions + && resultP && rightP->X_op == O_register && resultP->X_op == O_register) { --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -945,9 +945,9 @@ ppc_optimize_expr (expressionS *left, op } /* Accept the above plus , and plus the above. */ - if (right->X_op == O_register + if (op == O_add && left->X_op == O_register - && op == O_add + && right->X_op == O_register && ((right->X_md == PPC_OPERAND_CR_BIT && left->X_md == (PPC_OPERAND_CR_REG | PPC_OPERAND_CR_BIT)) || (right->X_md == (PPC_OPERAND_CR_REG | PPC_OPERAND_CR_BIT) @@ -959,7 +959,7 @@ ppc_optimize_expr (expressionS *left, op } /* Accept reg +/- constant. */ - if (left->X_op == O_register + if (left && left->X_op == O_register && !((op == O_add || op == O_subtract) && right->X_op == O_constant)) as_warn (_("invalid register expression")); --- a/gas/doc/internals.texi +++ b/gas/doc/internals.texi @@ -1047,6 +1047,14 @@ pointer, for any expression that can not is called, @code{input_line_pointer} will point to the start of the expression. +@item md_optimize_expr +@cindex md_optimize_expr +GAS will call this function before trying to carry out certain operations, +like the adding of two constants. The function is passed the left-hand +operand, an @code{expressionS} pointer, the operator, an @code{operatorT} +value, and the right-hand operand, again an @code{expressionS} pointer. For +unary expressions NULL is passed as first argument. + @item md_register_arithmetic @cindex md_register_arithmetic If this macro is defined and evaluates to zero then GAS will not fold --- a/gas/expr.c +++ b/gas/expr.c @@ -764,6 +764,7 @@ operand (expressionS *expressionP, enum symbolS *symbolP; /* Points to symbol. */ char *name; /* Points to name of symbol. */ segT segment; + operatorT op = O_absent; /* For unary operators. */ /* All integers are regarded as unsigned unless they are negated. This is because the only thing which cares whether a number is @@ -1029,19 +1030,33 @@ operand (expressionS *expressionP, enum /* '~' is permitted to start a label on the Delta. */ if (is_name_beginner (c)) goto isname; - /* Fall through. */ + op = O_bit_not; + goto unary; + case '!': + op = O_logical_not; + goto unary; + case '-': + op = O_uminus; + /* Fall through. */ case '+': { -#ifdef md_operator unary: -#endif operand (expressionP, mode); + +#ifdef md_optimize_expr + if (md_optimize_expr (NULL, op, expressionP)) + { + /* Skip. */ + ; + } + else +#endif if (expressionP->X_op == O_constant) { /* input_line_pointer -> char after operand. */ - if (c == '-') + if (op == O_uminus) { expressionP->X_add_number = - (addressT) expressionP->X_add_number; @@ -1052,13 +1067,13 @@ operand (expressionS *expressionP, enum if (expressionP->X_add_number) expressionP->X_extrabit ^= 1; } - else if (c == '~' || c == '"') + else if (op == O_bit_not) { expressionP->X_add_number = ~ expressionP->X_add_number; expressionP->X_extrabit ^= 1; expressionP->X_unsigned = 0; } - else if (c == '!') + else if (op == O_logical_not) { expressionP->X_add_number = ! expressionP->X_add_number; expressionP->X_unsigned = 1; @@ -1067,7 +1082,7 @@ operand (expressionS *expressionP, enum } else if (expressionP->X_op == O_big && expressionP->X_add_number <= 0 - && c == '-' + && op == O_uminus && (generic_floating_point_number.sign == '+' || generic_floating_point_number.sign == 'P')) { @@ -1082,7 +1097,7 @@ operand (expressionS *expressionP, enum { int i; - if (c == '~' || c == '-') + if (op == O_uminus || op == O_bit_not) { for (i = 0; i < expressionP->X_add_number; ++i) generic_bignum[i] = ~generic_bignum[i]; @@ -1095,7 +1110,7 @@ operand (expressionS *expressionP, enum generic_bignum[i] = ~(LITTLENUM_TYPE) 0; } - if (c == '-') + if (op == O_uminus) for (i = 0; i < expressionP->X_add_number; ++i) { generic_bignum[i] += 1; @@ -1103,7 +1118,7 @@ operand (expressionS *expressionP, enum break; } } - else if (c == '!') + else if (op == O_logical_not) { for (i = 0; i < expressionP->X_add_number; ++i) if (generic_bignum[i] != 0) @@ -1117,15 +1132,10 @@ operand (expressionS *expressionP, enum else if (expressionP->X_op != O_illegal && expressionP->X_op != O_absent) { - if (c != '+') + if (op != O_absent) { expressionP->X_add_symbol = make_expr_symbol (expressionP); - if (c == '-') - expressionP->X_op = O_uminus; - else if (c == '~' || c == '"') - expressionP->X_op = O_bit_not; - else - expressionP->X_op = O_logical_not; + expressionP->X_op = op; expressionP->X_add_number = 0; } else if (!md_register_arithmetic && expressionP->X_op == O_register) @@ -1288,8 +1298,7 @@ operand (expressionS *expressionP, enum #ifdef md_operator { - operatorT op = md_operator (name, 1, &c); - + op = md_operator (name, 1, &c); switch (op) { case O_uminus: