From patchwork Fri Nov 22 12:40:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 101742 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E0553857B98 for ; Fri, 22 Nov 2024 12:45:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E0553857B98 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=QZsv2x2s X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 9A873385773A for ; Fri, 22 Nov 2024 12:40:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9A873385773A 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-Filter: OpenARC Filter v1.0.0 sourceware.org 9A873385773A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279205; cv=none; b=eaCSWaDkuGfY3qw/AruaNo+UQb1ENC81dLVeeSmhOre33qHPU0F1bkSbIkeu1XcRf1c7ASj+AMnFKydQrnkmpi0J5igPeoWYxcxGF9nfCuxRebpyt8j62gEtQNJ0mh3CFZM4iXg7qPERNwc3kJElVb5aGBWLpNd5tsu0C0WlirQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279205; c=relaxed/simple; bh=hAz+RGJUUth2m8pJ/Bpsu9uXXlOU3xOlg5YCATK633o=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=COayowt7eb1mlafPl+ODzIK49po7Pb924e7d46nE4cLhE/k1/o9KcqvhOYD9/OumeWGONJqtGxRkcEDaAWFKrzjS+bpY8f+A9wYqGts8PCdsvrlW2g4XzoLTATWVcjRSsldw/OBRMQ0ylzfMbUgutH3VoX6SlC23IwI8QP6i2tQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9A873385773A Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5cec9609303so2349671a12.1 for ; Fri, 22 Nov 2024 04:40:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732279204; x=1732884004; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=WchuXyW+dqwPRnIJvYMuXOQlrWUAFghgShW9SVjaAJ8=; b=QZsv2x2s3/g9IAwm2u5fXE3Ca33QmJCbTRNFVjmd062N0F0cRckN+agF1fgMgv+ycQ euBMPAW9nBVKsEp/0GsTBQH4Oqf017OsoaLR38vc6ZFS0qxI9SAol9yG5MloTbaC+DVY WxHnMNbNd+Lnwh7vqq3KEJ2JhgczHAdmTulJ0cE3weEtGli/jlUtdfy4+y6xKytpq73o 8AD0hjhMpgfSNfhCVwejsasQjA4inzKjrSVcurVm/0V1q91FXByt5dSsofHNN9hVtiQ9 jTsaRt39OSi+z75kE4qTXtK56gq1Eeshfo1BHtPaI419hflXnhJCXbeIUsZ88Xy/h/IO z5Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732279204; x=1732884004; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WchuXyW+dqwPRnIJvYMuXOQlrWUAFghgShW9SVjaAJ8=; b=Tb2ttvWVOP7ITwRBHpBDpQtr0Bf0uRBISWNRe51VokIv+/W78j2L6UeuE4zGjorTPx I3uiLA8EJ5GNZPSOB9Zz6jBWN58A7SKLBPDF4vPoT0shsg/On29wbQlDKl0a83/pfZxW r96YAWRDxHYqcHCrNqLgw3LMd29p9jXSDM1TOLTQPpjthc7Pi440HOy5bv0ZmVUuwvIA GW2vetlkbA8MQCku8dcB+NHzRCDkZ9rBggSJoxjeOv3+pswdZ3eCpVLDQ0Ew/IYFmhv0 eYrPJ0APYtoYkpmnvQxjPcVC6Y2SrwC8AhLQM9Q1Ml/Cn+x09/hoLKKcO3aJ71cfb1pl KqBg== X-Gm-Message-State: AOJu0Yw7/n+XzTiMsVjW8U+FDKqw2QzurXoNLONuq0Os1Hx1WuGxsNYS vbCoF17sngLWocd7B4HmCE837i5GmkycVUWrxduoJ4p6OTCPD2W4rtBTKFK4Nl06BLU3XIf/xF8 = X-Gm-Gg: ASbGncsPWAJ+tftoE+QZkRuAieIcHoOLoSogCKIz1QOXZaHdJ87yRXlcJl3ijo80RZA C9XfiUxOsr1yUB189SI7BytNASAGfT39tSOMJXp0Kd6VjLCyDerzSNqYBqeeQac6WR58VkQ7Hfh 5bmFeyQ4h/z/OvdSROwoqBY6wIKiEdxgs8P61DtMKldN98/lz9phmsD3nET09nx/jdDh+KBlrlY AdeeYBdm8tfsLNd6hQSXGlg21iKCC0Rwg05ZsUNoaFv6Ws6tba/IVLqrgbIuJ+ljJMCGDDOoz7x DLuLPmhg9xRMZALgVvm+m+TT5aU/OMPoJUk= X-Google-Smtp-Source: AGHT+IEHrQyRPXI2rYEMNCDcAIRJAhuebKgZP5fpE6xHrH8wUCgaNMBtT5pQs317xx5qJKA836rpXQ== X-Received: by 2002:a17:906:cc9:b0:a9e:c460:ef4e with SMTP id a640c23a62f3a-aa5099f9c00mr246234266b.32.1732279204045; Fri, 22 Nov 2024 04:40:04 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b5b990dsm94216066b.201.2024.11.22.04.40.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 04:40:03 -0800 (PST) Message-ID: Date: Fri, 22 Nov 2024 13:40:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/5] gas: streamline expr_build_dot() From: Jan Beulich To: Binutils References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org There's no point involving symbol_clone_if_forward_ref(), just for it to replace dot_symbol by one obtained from symbol_temp_new_now(). For the abs-section case also produce a slightly more "complete" (as in: all potentially relevant fields filled) expression by going through expr_build_uconstant(). Move the function next to current_location(), for it to be easier to see the (dis)similarities. Correct the function's comment while there. --- a/gas/expr.c +++ b/gas/expr.c @@ -193,17 +193,6 @@ expr_build_uconstant (offsetT value) e.X_extrabit = 0; return make_expr_symbol (&e); } - -/* Build an expression for the current location ('.'). */ - -symbolS * -expr_build_dot (void) -{ - expressionS e; - - current_location (&e); - return symbol_clone_if_forward_ref (make_expr_symbol (&e)); -} /* Build any floating-point literal here. Also build any bignum literal here. */ @@ -754,6 +743,24 @@ current_location (expressionS *expressio } } +/* Make a symbol for the current location ('.'). */ + +symbolS * +expr_build_dot (void) +{ + if (now_seg != absolute_section) + { + symbolS *symbolP = symbol_temp_new_now (); + +#ifdef tc_new_dot_label + tc_new_dot_label (symbolP); +#endif + return symbolP; + } + + return expr_build_uconstant (abs_section_offset); +} + #ifndef md_register_arithmetic # define md_register_arithmetic 1 #endif From patchwork Fri Nov 22 12:41:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 101740 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B1BDF3857739 for ; Fri, 22 Nov 2024 12:43:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B1BDF3857739 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=QWb+vEnB X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id E65D03857704 for ; Fri, 22 Nov 2024 12:41:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E65D03857704 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-Filter: OpenARC Filter v1.0.0 sourceware.org E65D03857704 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279300; cv=none; b=qgxqWLkIcbIQnAIKnWdNJQkbGPTpMSc+1iiN5V7IlyeqTsGDXw6Jgb+7IZdYJh/sW1Qcpu3G5TeizqXGOh/jjBwboH04nRSC5r4dRQrRJ6efUL3Y5BIcXYBhrKSpC9mHYbexh/0lTMik227os38CNItMT8OeJv3+6mV3q1eTVvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279300; c=relaxed/simple; bh=M8ohWZAWUvaBNR7a2PR0H58SI1/UMNrbpaoQ2jYSqfw=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=S3gtGNtJ+YQcc4eYJAxq2o2nHJ5uRUeHmx7HqtEdHvSYfMaX66tgs3SyhBtrzv32SfatETkkT52ZEau5Zs64OCxGIqL5l9AqOa5mGqIM4IGG439GqiorF9ZmXCkPNfbbX4aYBv2koaADGbzTksn6w9jfIzvRbu34akXwioFP2eM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E65D03857704 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-aa1e51ce601so352269766b.3 for ; Fri, 22 Nov 2024 04:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732279298; x=1732884098; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=WWpW2UX4pySWRpUOPrlwU5KhqXwK1EAnQO35w+4VW0w=; b=QWb+vEnBu/Ng9DYXfjPXMagDexKAY7i/JNnyU/2O8wT/yE7ieOLJMwdPv+Pn4C8P2M 2gGIBFY36kl97/TW5yJwSuLdHBmtdCK2iggp6KwswLLB5hCQEZNETeDgZ1sLOcA2TRZQ LdB1cag+BMk4jPC7WQqzz8VI7mCgDBDfeUSZC6iuhXm9zH11/hAwOryX/9BHqFbGRyH+ DRL8pnvQzUU+i5kBFD8tm2ubgbVWMknXmAOPjsZ1vvZNKBfnGhbp9BymkNYASBhqIZ5G Vug3xsrh21+rXafpcqNfDJS5HLfvNgTaLFgX+z1Buu55GFLGi8XLB2HwVQVdHqNVaV3h 2YwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732279298; x=1732884098; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WWpW2UX4pySWRpUOPrlwU5KhqXwK1EAnQO35w+4VW0w=; b=d4AOjlHsjBLAU7DDNUDZiJELSvKcu7PTh0EzUFucIU5+FobfwCBPHXgWjyY9mp2Hbs uo8Ckvg1cr/obm6NTCWiVsnr8RiGUbGG/NqEF2rDEvYIZc2b7P4FHC6ddkDNHqksZlD4 NKiap1lIbMK4hllrqXkisByaEg8K+vlyRKAvqpgzer7ZQw53G+/NHb2YG3/wtRLaT39U lI+aDhRfTWC4345cJm+5DBxEj1V2GE1QIg/AlbR/+YMQ+d2twC8fGnB/lajLWVf0Yw2K FOkIG+Z9S4EtMz+lkzKE8Y2oJOh+6u87fJmYdSnlyASNrqG0G64GtUzoZKQLqLu1CKKe B3zQ== X-Gm-Message-State: AOJu0YzRi5u0EB6reH4AVaktvKktvRsVv7xvt5Kl5+15pPX8v5C1LO2O /0+wb8qdoN9/NTyazphs0raZ6dRl8aUf1NGdpFrljY97xsk/nD1D8OMC23fVD4rTGL5J6tTRQeQ = X-Gm-Gg: ASbGncsK4sH0a/pSWeXpoCp9Qju+HzOFLEmymTfPK5549rXGIr9pISmOI3afxf3boK4 lCDuZ+z77S7lGJNftiXmh4msNj+T26UJV9It14huJmcX0XctjHr45UrvYURVG+WhmaxdgfOIhID 84coWeDo4M9Pk/3++APIZpOPV8ATWmWU+MAsZmgT+1HwkMQrJfvJuAfYGAIkhBAL7CBFs5tDBLk RdWMDQ8VrUBdfRPIiMWv+qzgr8AfFMp2bTN7tvl5FmdVgH4tLPViOEEcKmNUsdxDjU/nu5J6jUt ietP5Ly3dxNWeA43yFzhMzTejHwP4DoDvPU= X-Google-Smtp-Source: AGHT+IGoj1rqy0aBAmGr//4dWbMwqdvE3Rk8JqYlAFcf6tqvz3wxupDTGqmx+W3VVxvXGe/wQ8tyPg== X-Received: by 2002:a17:906:1da9:b0:a99:d6cf:a1df with SMTP id a640c23a62f3a-aa509c074eemr228794166b.46.1732279298587; Fri, 22 Nov 2024 04:41:38 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b28f6ccsm94227066b.17.2024.11.22.04.41.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 04:41:38 -0800 (PST) Message-ID: <058b64a7-5e54-4f11-b16f-c137ec87b79a@suse.com> Date: Fri, 22 Nov 2024 13:41:36 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/5] MMIX: use current_location() directly From: Jan Beulich To: Binutils Cc: Hans-Peter Nilsson References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org It's no longer a static function, so it can be used without involving a wrapper function plus an indirect function call. --- a/gas/config/tc-mmix.c +++ b/gas/config/tc-mmix.c @@ -441,16 +441,6 @@ mmix_fill_nops (char *opcodep, int n) md_number_to_chars (opcodep + i * 4, SWYM_INSN_BYTE << 24, 4); } -/* See macro md_parse_name in tc-mmix.h. */ - -int -mmix_current_location (void (*fn) (expressionS *), expressionS *exp) -{ - (*fn) (exp); - - return 1; -} - /* Get up to three operands, filling them into the exp array. General idea and code stolen from the tic80 port. */ --- a/gas/config/tc-mmix.h +++ b/gas/config/tc-mmix.h @@ -48,15 +48,12 @@ extern void mmix_md_begin (void); extern void mmix_md_finish (void); #define md_finish mmix_md_finish -extern int mmix_current_location \ - (void (*fn) (expressionS *), expressionS *); extern int mmix_parse_predefined_name (char *, expressionS *); extern char *mmix_current_prefix; -/* A bit ugly, since we "know" that there's a static function - current_location that does what we want. We also strip off a leading - ':' in another ugly way. +/* Besides the special casing of "@" we also strip off a leading ':' in an + ugly way. The [DVWIOUZX]_Handler symbols are provided when-used. */ @@ -65,7 +62,7 @@ extern int mmix_gnu_syntax; (! mmix_gnu_syntax \ && (name[0] == '@' \ ? (! is_part_of_name (name[1]) \ - && mmix_current_location (current_location, exp)) \ + && (current_location (exp), 1)) \ : ((name[0] == ':' || ISUPPER (name[0])) \ && mmix_parse_predefined_name (name, exp)))) From patchwork Fri Nov 22 12:43:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 101745 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A615D385AC1C for ; Fri, 22 Nov 2024 12:48:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A615D385AC1C Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=GVxI+5h0 X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 3B83B3858416 for ; Fri, 22 Nov 2024 12:43:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B83B3858416 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-Filter: OpenARC Filter v1.0.0 sourceware.org 3B83B3858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::635 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279436; cv=none; b=sYJofkG+UpVkpR4tfK1L3nMn34GVK6ZlEcSn+M2ehdiT5WE3SbqFvRaTjWfxISJi/F1+S1ASfG16GkhQD92Rl3PDs6D3whKZIfpBE4r8caiB0W6JrrTR3PUqdMBj2h1pozsVnVg9TSwcKWnjzMsbhD+Z36XPo+SctemWUqVmEM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279436; c=relaxed/simple; bh=lOqu2He91eueSYKSIm78mRfQAhwUYPBAsduSqZwbGdQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=ebv6QrUlT71DMoOIk/PmhjLX6XwWDFPCPRcF0zm709l7N0VtIoauJySbBVyf4zKqzUEh12jc18vt0uITfyfInOxAuyS5fL6ajsop1WdxzV8JaG+hEJ4HiQr1J0EGiqSZuYUOVoca1UVFG5gW3SF7rOLzclO7GCFH7jN7k/xLWZE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-aa4833e9c44so234572366b.2 for ; Fri, 22 Nov 2024 04:43:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732279424; x=1732884224; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=fge1IcUsPTMwENO3Ep+bit/6uXnqWid/H3NE0nCUdZU=; b=GVxI+5h0sQCXS1wODGVFfdlQf8LhbkiEAK7avQmHKOxz9b/SDDCz0c6tAJ1XYlYIcF KLnS2Wn/la50P/kzYV+ksHVIxFt2hy5rKYfTLs50CixdunFzL8gTQwC+BaqbCKPFisq2 YF0AjH7gO0fCnDRNrqwQbF8Wk77OUZyebj9wL5x/cjkSWKLcRCXyoKtJ06oScK1bMpf2 nF9hl5237YCcfJPHf6RO+Z6NDq+CpvdxZKMiXBUBjGFAxJp74zRzHWWOR/yIzV2GeSND 6aPIVneDKPXlo4iPYMrDjJZd6Bo4FmTtHJ+1XPsspAqmOpb+SvPZ139hd8h5fmCnQ149 EyOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732279424; x=1732884224; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fge1IcUsPTMwENO3Ep+bit/6uXnqWid/H3NE0nCUdZU=; b=hbjX2qkxOHcrDf2PGWWN+peT9I3+N2+SXV6ehY1F0GYLoP7e+Da9EFsw8DKa09D+ZJ Ndp39hiXh53mCrDDxiUOPCAMCtYxt4ummq4mtJSMI3d738jSLZ2imvDOagWqOOgxEnb6 /QsURUjBkR5R7vEaqeuqX4FP3Qh0sUe/PVQXxf7NYWh0AXIEV2H2wupk1/e7iiO0go9I au1bkl1PYN0JFu2L+0e/11lLjqTOx3grBbNL2kruXg3CJRQ3jSitpYtSh7guogNmnmkE +1HbzPAjRS1TIN9QgaVhAjTzjhlQnaDLHBiizV7QPrZjdcAzlCzodJEchhgowrO/iO0L OqyA== X-Gm-Message-State: AOJu0Yxd1KTzpKTgJiaXPthEOHlgIT5b/dh6MZogIiQUrcBadt1Ryofv uoLmzWR/4t9uZmEoHxsyExzulEmBFYDQyTrRFrVsp3p7po50tRq8M2MFV8qnX0PtHT3ic54xdTA = X-Gm-Gg: ASbGnctSt2kdI6cN71kxz56x7klbGwtOS+WQIhJqSPrH/yH+dhaIfCDhZVFK/4K84eM /Aq56x9s0U+PubsVl/T9ADYfPFOSBsNwaZCSkY2A7o3KuzB4NsleKJomauDY4UBA2X/4hdIwkEX JjSf8xqb/TSHslAzV79rwEDCQ5dQbZM7QGxdLVWcGLb+Jl952DIWQb6Z4NrUrSbQhnx1IfAuixi QADPKorppAXp/V9GpkyPsvQdSPXIVIxgBp+VBcOJK8WDXwWV7EBqmvY+ZqvS0VOo0pCrmqKn5bp ln+JKlx+Q3cfzRTvsJTKMZuxoRIV+jgrWJM= X-Google-Smtp-Source: AGHT+IGiMxoOShn+IgUpCV8Sx32XLhq+r65nRecx+HcMrXXGJnf8rN6fAgdwCZXizgkHmpYUpz/ZZA== X-Received: by 2002:a17:906:32cb:b0:aa4:a810:79c3 with SMTP id a640c23a62f3a-aa5099764cemr172255366b.26.1732279424203; Fri, 22 Nov 2024 04:43:44 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b57c19esm94429066b.154.2024.11.22.04.43.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 04:43:43 -0800 (PST) Message-ID: <34da7da0-487f-48c4-b5c9-26616593612e@suse.com> Date: Fri, 22 Nov 2024 13:43:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/5] gas: partly restore how current_location() had worked From: Jan Beulich To: Binutils Cc: "Maciej W. Rozycki" References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org Commit 4a826962e760 changed its behavior without saying why, and without putting in place any testcase demonstrating the required behavior. Firmly latch the current position unless deferred-evaluation mode is in effect. --- a/gas/expr.c +++ b/gas/expr.c @@ -728,7 +728,7 @@ mri_char_constant (expressionS *expressi handles the magic symbol `.'. */ void -current_location (expressionS *expressionp) +current_location (expressionS *expressionp, enum expr_mode mode) { if (now_seg == absolute_section) { @@ -738,7 +738,15 @@ current_location (expressionS *expressio else { expressionp->X_op = O_symbol; - expressionp->X_add_symbol = &dot_symbol; + if (mode != expr_defer) + { + expressionp->X_add_symbol = symbol_temp_new_now (); +#ifdef tc_new_dot_label + tc_new_dot_label (expressionp->X_add_symbol); +#endif + } + else + expressionp->X_add_symbol = &dot_symbol; expressionp->X_add_number = 0; } } @@ -1215,14 +1223,14 @@ operand (expressionS *expressionP, enum if (is_part_of_name (*input_line_pointer)) goto isname; - current_location (expressionP); + current_location (expressionP, mode); break; #endif case '.': if (!is_part_of_name (*input_line_pointer)) { - current_location (expressionP); + current_location (expressionP, mode); break; } else if ((strncasecmp (input_line_pointer, "startof.", 8) == 0 @@ -1309,7 +1317,7 @@ operand (expressionS *expressionP, enum if (! flag_m68k_mri || is_part_of_name (*input_line_pointer)) goto de_fault; - current_location (expressionP); + current_location (expressionP, mode); break; #endif --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -168,7 +168,7 @@ static int i386_finalize_displacement (s static int i386_att_operand (char *); static int i386_intel_operand (char *, int); static int i386_intel_simplify (expressionS *); -static int i386_intel_parse_name (const char *, expressionS *); +static int i386_intel_parse_name (const char *, expressionS *, enum expr_mode); static const reg_entry *parse_register (const char *, char **); static const char *parse_insn (const char *, char *, enum parse_mode); static char *parse_operands (char *, const char *); @@ -16644,7 +16644,10 @@ parse_register (const char *reg_string, } int -i386_parse_name (char *name, expressionS *e, char *nextcharP) +i386_parse_name (char *name, + expressionS *e, + enum expr_mode mode, + char *nextcharP) { const reg_entry *r = NULL; char *end = input_line_pointer; @@ -16669,7 +16672,7 @@ i386_parse_name (char *name, expressionS } input_line_pointer = end; *end = 0; - return intel_syntax ? i386_intel_parse_name (name, e) : 0; + return intel_syntax ? i386_intel_parse_name (name, e, mode) : 0; } void --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -191,8 +191,8 @@ extern bool i386_check_label (void); extern int i386_unrecognized_line (int); #define tc_unrecognized_line i386_unrecognized_line -extern int i386_parse_name (char *, expressionS *, char *); -#define md_parse_name(s, e, m, c) i386_parse_name (s, e, c) +extern int i386_parse_name (char *, expressionS *, enum expr_mode, char *); +#define md_parse_name(s, e, m, c) i386_parse_name (s, e, m, c) extern operatorT i386_operator (const char *name, unsigned int operands, char *); #define md_operator i386_operator --- a/gas/config/tc-i386-intel.c +++ b/gas/config/tc-i386-intel.c @@ -236,13 +236,15 @@ operatorT i386_operator (const char *nam return O_absent; } -static int i386_intel_parse_name (const char *name, expressionS *e) +static int i386_intel_parse_name (const char *name, + expressionS *e, + enum expr_mode mode) { unsigned int j; if (! strcmp (name, "$")) { - current_location (e); + current_location (e, mode); return 1; } --- a/gas/config/tc-mmix.h +++ b/gas/config/tc-mmix.h @@ -62,7 +62,7 @@ extern int mmix_gnu_syntax; (! mmix_gnu_syntax \ && (name[0] == '@' \ ? (! is_part_of_name (name[1]) \ - && (current_location (exp), 1)) \ + && (current_location (exp, mode), 1)) \ : ((name[0] == ':' || ISUPPER (name[0])) \ && mmix_parse_predefined_name (name, exp)))) --- a/gas/expr.h +++ b/gas/expr.h @@ -184,7 +184,7 @@ extern segT expr (int, expressionS *, en extern unsigned int get_single_number (void); extern symbolS *make_expr_symbol (const expressionS * expressionP); extern int expr_symbol_where (symbolS *, const char **, unsigned int *); -extern void current_location (expressionS *); +extern void current_location (expressionS *, enum expr_mode); extern symbolS *expr_build_uconstant (offsetT); extern symbolS *expr_build_dot (void); extern uint32_t generic_bignum_to_int32 (void); From patchwork Fri Nov 22 12:44:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 101741 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B5F3385AC12 for ; Fri, 22 Nov 2024 12:45:14 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id D1F2A3857438 for ; Fri, 22 Nov 2024 12:44:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D1F2A3857438 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-Filter: OpenARC Filter v1.0.0 sourceware.org D1F2A3857438 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::635 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279492; cv=none; b=QedxHLt5p3kMH+1XHGa0gipDGjY/oyB2ZJoXOamXm0rEsY16n4h2TYISxkAJ+OBvUibLDzipKxTGuasTOEN51hVRDJbBbfTwfvTTn6c5UaeOvKdS8Zwn9ZHAsNbV06camkc1dUcjMXK4vY/RysioLoimKP8SXpUfoBdw8fFOwsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279492; c=relaxed/simple; bh=eB4yJP3Fstbls99BX1TzOdg6+SSDh+zC5J5jLJiOdb4=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=FqsXLHMy+TXOTdxq10X3XJmumtf5drBWhPDE2b7yif61ezihUUn4mHSKnHuzpixBPtZTrIE5G4ypECv5R75AtYG6csc9/p9XlXAA+UARywyD83f1/g+0Kp1RUfXF4pBTksnas1kNydi7IMj7GNWARnVUtvCgzZjq6GT1+shOM48= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1F2A3857438 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=bAWxk8DL Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a9ef275b980so332853266b.0 for ; Fri, 22 Nov 2024 04:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732279471; x=1732884271; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oSFZM8SN81xJiGYiyU+hRdTNZiVk1LS5ZAABBfsXWfg=; b=bAWxk8DLTUktSRBtQaqMyQhPjf7mlkOmsf63GJO/AovQqyduJlejM4B7uDKYGO/6GU /6dgSnMFGo373yrHqC6SBypd1aoBPukxnpVZlj0e8HhEXX4vvrwwawmslnMtMny3C4PQ ua7qYTNUAC85EbqM488TZC3V+2TxzL8G737tJwZ/gFFMHaA2XTDq9HMhByFTAnPqH9om ePgQvFvz+mp8m6i826wpEJ4e8OJ0I+nvS29nJh3uC9wgjLwlAlbWhM0/4HJZjySoGOD/ /FtPBkqj2z0UZ2GA4q8hV5VLoJoO+5GYib5k61F6dVklQWzRrBnbs4HDBKQL6L2fOGbo zb1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732279471; x=1732884271; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oSFZM8SN81xJiGYiyU+hRdTNZiVk1LS5ZAABBfsXWfg=; b=iblPvI0Oa26rCVZloNB4j8lYtgYPUecPnjYXd0cSMWpfn2Q/O2euYt9fsS1hlMHIDX 1Hlg2SDC9G73rPpJ4FPNhcW4BQ2a5Eo/1TqwiSUZ5ZXfwNChBh41ql/A8K+WA/Zwve2K nNkN+dB6yp+wwe9c8dgocYxoi5ivy0i4hbJo4yvkSfDeP1u2IQBiebAYLhQhtvtq0Mws XD4Qo4BodVKF9BkJv5NPfSB6rF5o7Zk2+JbWARUzxxnh4j1s7/BTizEIT8weNaJIqztL YqBAFP7Bq97NkUbT3524AoB/drHR+9ynF20FYPwhHKS5zMZrdhuxNVav2g3o+SkL8E6J k1sA== X-Gm-Message-State: AOJu0Yx+r0lYHX8ZuRXt/iRHyr/QKSmnGGiEJDl0fgnPhR2GYPW9yVey KWBYPo3aFgoeat/v9Zv+wZKN+3xi2vLB9bHlBIutxPZp7lWD/di06TqWOJFhPzxAF7/QtuIhXNE = X-Gm-Gg: ASbGncuvRA7YQVVzzmNs3Xz1/MEbgc8ULkjQVu8gCHV57LMiEi6ekIp2isqMr9xcgtA hrGz5nWzL5rCr0ca2RAUD3b0Y6NnZVM5jGigZDB3jazr1N0e0pfpaE3GP2W+1LK2aaQJ4vdi49I 8yodquzbgdqkz01R2TGrqH0qOsNNffyMUqLriHL/EhFgLqoIBZAzd1VIKREvPjDrZeLxQQJaF8C aBHLcWE5uS47L9m+ja4n8h1UlYeNRE2yJ+xYIRKNM0ghf2WQgnD8ZHilCyF2xwzJoaB+f0UiB7x wQ1nxqeT5E6JtckU4SapeCwrNu7/2qsHonE= X-Google-Smtp-Source: AGHT+IHeWJVVJ0tF/93mP3vpw22F6xnx5Z1s65A1m1UWFR8JZPiAy9qJTpaRZhyZK4e3M7pRHMlpQg== X-Received: by 2002:a17:906:1daa:b0:aa5:bda:f11 with SMTP id a640c23a62f3a-aa50bda10b6mr198280366b.12.1732279471023; Fri, 22 Nov 2024 04:44:31 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b28fd61sm94927966b.5.2024.11.22.04.44.30 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 04:44:30 -0800 (PST) Message-ID: <789a0964-de22-4017-92c7-9d5ec51e6a94@suse.com> Date: Fri, 22 Nov 2024 13:44:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 4/5] gas: introduce deferred expression evaluation mode latching dot From: Jan Beulich To: Binutils References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org Deferring expression evaluation is often necessary. However, the value current_location() records typically is intended to represent the location at the point of use of the expression, with the main exception being .eqv (or its == equivalent). Introduce a predicate to cover both "deferred" modes, and use it everywhere except in current_location(). --- a/gas/config/tc-m32r.c +++ b/gas/config/tc-m32r.c @@ -2335,13 +2335,13 @@ m32r_parse_name (char const *name, /* If we have an absolute symbol or a reg, then we know its value now. */ segment = S_GET_SEGMENT (exprP->X_add_symbol); - if (mode != expr_defer && segment == absolute_section) + if (!expr_defer_p (mode) && segment == absolute_section) { exprP->X_op = O_constant; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); exprP->X_add_symbol = NULL; } - else if (mode != expr_defer && segment == reg_section) + else if (!expr_defer_p (mode) && segment == reg_section) { exprP->X_op = O_register; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); --- a/gas/config/tc-metag.c +++ b/gas/config/tc-metag.c @@ -6908,13 +6908,13 @@ metag_parse_name (char const * name, exp /* If we have an absolute symbol or a reg, then we know its value now. */ segment = S_GET_SEGMENT (exprP->X_add_symbol); - if (mode != expr_defer && segment == absolute_section) + if (!expr_defer_p (mode) && segment == absolute_section) { exprP->X_op = O_constant; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); exprP->X_add_symbol = NULL; } - else if (mode != expr_defer && segment == reg_section) + else if (!expr_defer_p (mode) && segment == reg_section) { exprP->X_op = O_register; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -2478,13 +2478,13 @@ mn10300_parse_name (char const *name, /* If we have an absolute symbol or a reg, then we know its value now. */ segment = S_GET_SEGMENT (exprP->X_add_symbol); - if (mode != expr_defer && segment == absolute_section) + if (!expr_defer_p (mode) && segment == absolute_section) { exprP->X_op = O_constant; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); exprP->X_add_symbol = NULL; } - else if (mode != expr_defer && segment == reg_section) + else if (!expr_defer_p (mode) && segment == reg_section) { exprP->X_op = O_register; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -902,7 +902,7 @@ ppc_parse_name (const char *name, expres /* If we have an absolute symbol or a reg, then we know its value now. Copy the symbol value expression to propagate X_md. */ bool done = false; - if (mode != expr_defer + if (!expr_defer_p (mode) && !S_FORCE_RELOC (sym, 0)) { segT segment = S_GET_SEGMENT (sym); --- a/gas/config/tc-sh.c +++ b/gas/config/tc-sh.c @@ -3933,13 +3933,13 @@ sh_parse_name (char const *name, /* If we have an absolute symbol or a reg, then we know its value now. */ segment = S_GET_SEGMENT (exprP->X_add_symbol); - if (mode != expr_defer && segment == absolute_section) + if (!expr_defer_p (mode) && segment == absolute_section) { exprP->X_op = O_constant; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); exprP->X_add_symbol = NULL; } - else if (mode != expr_defer && segment == reg_section) + else if (!expr_defer_p (mode) && segment == reg_section) { exprP->X_op = O_register; exprP->X_add_number = S_GET_VALUE (exprP->X_add_symbol); --- a/gas/expr.c +++ b/gas/expr.c @@ -1387,14 +1387,14 @@ operand (expressionS *expressionP, enum /* If we have an absolute symbol or a reg, then we know its value now. */ segment = S_GET_SEGMENT (symbolP); - if (mode != expr_defer + if (!expr_defer_p (mode) && segment == absolute_section && !S_FORCE_RELOC (symbolP, 0)) { expressionP->X_op = O_constant; expressionP->X_add_number = S_GET_VALUE (symbolP); } - else if (mode != expr_defer && segment == reg_section) + else if (!expr_defer_p (mode) && segment == reg_section) { expressionP->X_op = O_register; expressionP->X_add_number = S_GET_VALUE (symbolP); @@ -1438,7 +1438,7 @@ operand (expressionS *expressionP, enum if (expressionP->X_add_symbol) symbol_mark_used (expressionP->X_add_symbol); - if (mode != expr_defer) + if (!expr_defer_p (mode)) { expressionP->X_add_symbol = symbol_clone_if_forward_ref (expressionP->X_add_symbol); @@ -1933,7 +1933,7 @@ expr (int rankarg, /* Larger # is highe is_unsigned = resultP->X_unsigned && right.X_unsigned; - if (mode == expr_defer + if (expr_defer_p (mode) && ((resultP->X_add_symbol != NULL && S_IS_FORWARD_REF (resultP->X_add_symbol)) || (right.X_add_symbol != NULL --- a/gas/expr.h +++ b/gas/expr.h @@ -153,9 +153,12 @@ enum expr_mode { expr_evaluate, expr_normal, - expr_defer + expr_defer, + expr_defer_latch_dot, }; +#define expr_defer_p(m) ((m) >= expr_defer) + /* "result" should be type (expressionS *). */ #define expression(result) expr (0, result, expr_normal) #define expression_and_evaluate(result) expr (0, result, expr_evaluate) From patchwork Fri Nov 22 12:47:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 101743 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8DEB3857015 for ; Fri, 22 Nov 2024 12:48:25 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id D4F023858416 for ; Fri, 22 Nov 2024 12:47:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4F023858416 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-Filter: OpenARC Filter v1.0.0 sourceware.org D4F023858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279674; cv=none; b=rY+pnOE1ub+7scnesnkwzCz/rFPXGUiQaLbsEIhlQLz0HNtQHbGZZEmIlAA4hmqyAeFubNXVDWhm2f0mvKG+FqLNmGw8M0X8usGWuawqIDW+aXZKfCXdBQY6YRpIu0ytyS8Kpj/092nadRaEfTpJFo/vKCJy1uvpWBU9F7TFje8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732279674; c=relaxed/simple; bh=JBfLlxhX/UxILJlBJ84Bx8QWIRfjTk1cb6Y1dergHtM=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=Q/lDEgXGPo1gaAYGtQib3/C8KBuENWFOI2/3BNPqI+L1FNJyeQdvjAfUiEy3u0d0KOY4mSTHdMGFER9eLfiQy/FDvZwullQgREv/vNZBvwr3IGMwePoMGC+DhFSmezfjbHGfvrr7PqqzdaBeJQYjeMU2FeLWjRmdUmTG3d4L2NQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a9ed49edd41so346289866b.0 for ; Fri, 22 Nov 2024 04:47:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732279670; x=1732884470; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=0DKPGqzPZWwABUCIxT4hqfbS7qaK6X1+BWy8vApW6OI=; b=R3cmXgKbsUN7weqqhQSq7NiZHOOGqH0oVTJYjVQ7ueOdKUK2slWQB4BtIthuP8AM3m XWxYeOYmmCwUJ145y9tpQYfmyuw/ubA2Pqcn07HU7FOJJ4cfjRiSg/k34H1tfatgbLQI jiPtGOz3KJZUmClEmK7CAzACxnpK0BewaY8MwSJ7xoYucSl5IaYxibBccxY3HpIpeReA tW4HQ/bPRGNmBw5YpFf/7Q9FR+cpX1YEOQuRqgyHwYVbN9MAsa9T5uXkjxqAfk0aiTvz sTlzQ3dJghk3/EZGRMd4odwRuvsGwksQwiLFhnNJkQFb5DWaEFnjIc5nltjm4nUs5X9W YbsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732279670; x=1732884470; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0DKPGqzPZWwABUCIxT4hqfbS7qaK6X1+BWy8vApW6OI=; b=YVsV6vSMqiUWFDkwO5Z/IkFKxKAJbv2LmTjPCZcj25Gvebo7LXhTlXvW5W9TOOOWd1 fWOq+/2N6eF4lWF/Gosg2AJvQTEUnMRDNUNRdhl3OXv7TbtUFR6zIxyAU1TpjOe564nG ABTSYLW4YCWOZJ0w2CzmEn5X6VgmJn/UKS9w9QbWobF4rfzB29KPOD2Se2e0tj8FC2lG tU80Pb1hIhvg+Fu6l3FkCClpYfZXKkITAlEpE6/uIQO+KqAu5LzMlfc0DWMD7+q7+zDI Q8spaa64SQklphgW9xrj/qTJCeOR6bYpMobh6DfcptPS9/F/f9OuG6kaqShVtye2F/h6 9+CQ== X-Gm-Message-State: AOJu0YyjUM5BpOZASTNSoc9EgRp5KhnZCjWQoE5JEqB9vlLWo4Ao3CWZ /LzGytxGulvgvCrir3LMP2AVSfKKsvioGN9kKBVvInS9QCq+NpwaTPdM5u75w4skvXvxD4EkayM = X-Gm-Gg: ASbGncuZrdvT3nHU32whwEkE9Lbr4zg5lFIM6EEVPFlOL5y39fhXtGjFwBbtx5rQLu6 /qP3jz+5p55fy2vcw6yjFUF8d+/fNBb/3dmmz4f+li+iGKMjf5c2fZNkSID2p4Aff4Mycu4O0iR 9qXTnSjM13Wd0b3sn9dsxpDq3oCR7r2iVuzdNIy0rIoc9uPfa4uznDMA6nl2y1CkJvD83GRlBYJ kRfivk1W4/GNDM6fAqjTiv9HMz7r6caEf1iIkVIaB7n+V4URCFMnjlfCYWIx9Cgcxhp049bQh9Q Sn/OX5MqojyLpejkEFsEzfw9PIlEdZDfWsA= X-Google-Smtp-Source: AGHT+IHgIILK7wXaNkfxUKSH+K/QgDYnsj2oWTy3vKL5calYR1o/R8I6ijawJMpPj1JfYepW/qUExA== X-Received: by 2002:a17:906:3155:b0:a9a:230b:fb5e with SMTP id a640c23a62f3a-aa509966471mr225367566b.4.1732279670080; Fri, 22 Nov 2024 04:47:50 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b52fb87sm96095166b.95.2024.11.22.04.47.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 04:47:49 -0800 (PST) Message-ID: <1a9cfc5a-03ca-47cd-a3d8-abc00b779fad@suse.com> Date: Fri, 22 Nov 2024 13:47:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 5/5] aarch64: re-work PR gas/27217 fix again From: Jan Beulich To: Binutils Cc: Richard Earnshaw , Marcus Shawcroft , Alan Modra , Nick Clifton References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org Commit c1723a8118f0 ("Arm64: re-work PR gas/27217 fix") really was only a band-aid; Nick's original solution to the problem was technically preferable, yet didn't work when . came into play. Undo most of that change, but use the new expr_defer_latch_dot expression parsing mode. Also add testing for the . case, which I should have done already back at the time. --- Quite likely tc-spu.c will want to use latched_dot_expression() as well, perhaps allowing the double parsing to be dropped. Question really is: Should the new mode become the default, with just pseudo_set() using the variant not evaluating dot? In which case names likely would want changing (e.g. expr_defer and expr_defer_dot, with the latter better not even given a wrapper, i.e. truly only for pseudo_set() to use). I wasn't certain whether to keep the md_apply_fix() hunk, or rather leave that code untouched here. The extra check was necessary to add back at the time, and I wonder whether it really wants/needs removing again. --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -666,18 +666,25 @@ static bool in_aarch64_get_expression = #define ALLOW_ABSENT false #define REJECT_ABSENT true +/* Fifth argument to aarch64_get_expression. */ +#define NORMAL_RESOLUTION false + /* Return TRUE if the string pointed by *STR is successfully parsed as an valid expression; *EP will be filled with the information of such an expression. Otherwise return FALSE. If ALLOW_IMMEDIATE_PREFIX is true then skip a '#' at the start. - If REJECT_ABSENT is true then trat missing expressions as an error. */ + If REJECT_ABSENT is true then trat missing expressions as an error. + If DEFER_RESOLUTION is true, then do not resolve expressions against + constant symbols. Necessary if the expression is part of a fixup + that uses a reloc that must be emitted. */ static bool aarch64_get_expression (expressionS * ep, char ** str, bool allow_immediate_prefix, - bool reject_absent) + bool reject_absent, + bool defer_resolution) { char *save_in; segT seg; @@ -697,7 +704,10 @@ aarch64_get_expression (expressionS * e save_in = input_line_pointer; input_line_pointer = *str; in_aarch64_get_expression = true; - seg = expression (ep); + if (defer_resolution) + seg = latched_dot_expression (ep); + else + seg = expression (ep); in_aarch64_get_expression = false; if (ep->X_op == O_illegal || (reject_absent && ep->X_op == O_absent)) @@ -1163,7 +1173,8 @@ parse_index_expression (char **str, int6 { expressionS exp; - aarch64_get_expression (&exp, str, GE_NO_PREFIX, REJECT_ABSENT); + aarch64_get_expression (&exp, str, GE_NO_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION); if (exp.X_op != O_constant) { first_error (_("constant expression required")); @@ -2546,7 +2557,8 @@ parse_immediate_expression (char **str, return false; } - aarch64_get_expression (exp, str, GE_OPT_PREFIX, REJECT_ABSENT); + aarch64_get_expression (exp, str, GE_OPT_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION); if (exp->X_op == O_absent) { @@ -2780,7 +2792,8 @@ parse_big_immediate (char **str, int64_t return false; } - aarch64_get_expression (&inst.reloc.exp, &ptr, GE_OPT_PREFIX, REJECT_ABSENT); + aarch64_get_expression (&inst.reloc.exp, &ptr, GE_OPT_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION); if (inst.reloc.exp.X_op == O_constant) *imm = inst.reloc.exp.X_add_number; @@ -3677,7 +3690,8 @@ parse_shift (char **str, aarch64_opnd_in p++; exp_has_prefix = 1; } - aarch64_get_expression (&exp, &p, GE_NO_PREFIX, ALLOW_ABSENT); + aarch64_get_expression (&exp, &p, GE_NO_PREFIX, ALLOW_ABSENT, + NORMAL_RESOLUTION); } if (kind == AARCH64_MOD_MUL_VL) /* For consistency, give MUL VL the same shift amount as an implicit @@ -3741,7 +3755,7 @@ parse_shifter_operand_imm (char **str, a /* Accept an immediate expression. */ if (! aarch64_get_expression (&inst.reloc.exp, &p, GE_OPT_PREFIX, - REJECT_ABSENT)) + REJECT_ABSENT, NORMAL_RESOLUTION)) return false; /* Accept optional LSL for arithmetic immediate values. */ @@ -3900,7 +3914,8 @@ parse_shifter_operand_reloc (char **str, /* Next, we parse the expression. */ if (! aarch64_get_expression (&inst.reloc.exp, str, GE_NO_PREFIX, - REJECT_ABSENT)) + REJECT_ABSENT, + aarch64_force_reloc (entry->add_type) == 1)) return false; /* Record the relocation type (use the ADD variant here). */ @@ -4095,7 +4110,8 @@ parse_address_main (char **str, aarch64_ } /* #:: */ - if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT)) + if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT, + aarch64_force_reloc (ty) == 1)) { set_syntax_error (_("invalid relocation expression")); return false; @@ -4111,7 +4127,8 @@ parse_address_main (char **str, aarch64_ /* =immediate; need to generate the literal in the literal pool. */ inst.gen_lit_pool = 1; - if (!aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT)) + if (!aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION)) { set_syntax_error (_("invalid address")); return false; @@ -4225,7 +4242,8 @@ parse_address_main (char **str, aarch64_ /* We now have the group relocation table entry corresponding to the name in the assembler source. Next, we parse the expression. */ - if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT)) + if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT, + aarch64_force_reloc (entry->ldst_type) == 1)) { set_syntax_error (_("invalid relocation expression")); return false; @@ -4238,7 +4256,8 @@ parse_address_main (char **str, aarch64_ } else { - if (! aarch64_get_expression (exp, &p, GE_OPT_PREFIX, REJECT_ABSENT)) + if (! aarch64_get_expression (exp, &p, GE_OPT_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION)) { set_syntax_error (_("invalid expression in the address")); return false; @@ -4294,7 +4313,8 @@ parse_address_main (char **str, aarch64_ operand->addr.offset.regno = reg->number; operand->addr.offset.is_reg = 1; } - else if (! aarch64_get_expression (exp, &p, GE_OPT_PREFIX, REJECT_ABSENT)) + else if (! aarch64_get_expression (exp, &p, GE_OPT_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION)) { /* [Xn],#expr */ set_syntax_error (_("invalid expression in the address")); @@ -4422,7 +4442,8 @@ parse_half (char **str, int *internal_fi else *internal_fixup_p = 1; - if (! aarch64_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX, REJECT_ABSENT)) + if (! aarch64_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX, REJECT_ABSENT, + aarch64_force_reloc (inst.reloc.type) == 1)) return false; *str = p; @@ -4464,7 +4485,8 @@ parse_adrp (char **str) inst.reloc.type = BFD_RELOC_AARCH64_ADR_HI21_PCREL; inst.reloc.pc_rel = 1; - if (! aarch64_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX, REJECT_ABSENT)) + if (! aarch64_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX, REJECT_ABSENT, + aarch64_force_reloc (inst.reloc.type) == 1)) return false; *str = p; return true; @@ -7223,7 +7245,8 @@ parse_operands (char *str, const aarch64 goto failure; str = saved; po_misc_or_fail (aarch64_get_expression (&inst.reloc.exp, &str, - GE_OPT_PREFIX, REJECT_ABSENT)); + GE_OPT_PREFIX, REJECT_ABSENT, + NORMAL_RESOLUTION)); /* The MOV immediate alias will be fixed up by fix_mov_imm_insn later. fix_mov_imm_insn will try to determine a machine instruction (MOVZ, MOVN or ORR) for it and will issue an error @@ -9605,8 +9628,7 @@ md_apply_fix (fixS * fixP, valueT * valP /* Note whether this will delete the relocation. */ - if (fixP->fx_addsy == 0 && !fixP->fx_pcrel - && aarch64_force_reloc (fixP->fx_r_type) <= 0) + if (fixP->fx_addsy == 0 && !fixP->fx_pcrel) fixP->fx_done = 1; /* Process the relocations. */ --- a/gas/expr.h +++ b/gas/expr.h @@ -163,6 +163,7 @@ enum expr_mode #define expression(result) expr (0, result, expr_normal) #define expression_and_evaluate(result) expr (0, result, expr_evaluate) #define deferred_expression(result) expr (0, result, expr_defer) +#define latched_dot_expression(result) expr (0, result, expr_defer_latch_dot) /* If an expression is O_big, look here for its value. These common data may be clobbered whenever expr() is called. */ --- a/gas/testsuite/gas/aarch64/pr27217.d +++ b/gas/testsuite/gas/aarch64/pr27217.d @@ -10,8 +10,19 @@ Disassembly of section \.text: 0+000 <.*>: [ ]+0:[ ]+90000000[ ]+adrp[ ]+x0, [0-9]*[ ]+<.*> -[ ]+0:[ ]+R_AARCH64(|_P32)_ADR_PREL_PG_HI21[ ]+\*ABS\*\+0x12345678 +[ ]+0:[ ]+R_AARCH64(|_P32)_ADR_PREL_PG_HI21[ ]+bar [ ]+4:[ ]+91000000[ ]+add[ ]+x0, x0, #0x0 -[ ]+4:[ ]+R_AARCH64(|_P32)_ADD_ABS_LO12_NC[ ]+\*ABS\*\+0x12345678 +[ ]+4:[ ]+R_AARCH64(|_P32)_ADD_ABS_LO12_NC[ ]+bar [ ]+8:[ ]+d65f03c0[ ]+ret +#... +0+010 <.*>: +[ ]+10:[ ]+90000000[ ]+adrp[ ]+x0, [0-9]*[ ]+<.*> +[ ]+10:[ ]+R_AARCH64(|_P32)_ADR_PREL_PG_HI21[ ]+\.text\+0x10 +[ ]+14:[ ]+91000000[ ]+add[ ]+x0, x0, #0x0 +[ ]+14:[ ]+R_AARCH64(|_P32)_ADD_ABS_LO12_NC[ ]+\.text\+0x10 +[ ]+18:[ ]+90000001[ ]+adrp[ ]+x1, [0-9]*[ ]+<.*> +[ ]+18:[ ]+R_AARCH64(|_P32)_ADR_PREL_PG_HI21[ ]+\.text\+0x1c +[ ]+1c:[ ]+91000021[ ]+add[ ]+x1, x1, #0x0 +[ ]+1c:[ ]+R_AARCH64(|_P32)_ADD_ABS_LO12_NC[ ]+\.text\+0x1c +[ ]+20:[ ]+d65f03c0[ ]+ret #pass --- a/gas/testsuite/gas/aarch64/pr27217.s +++ b/gas/testsuite/gas/aarch64/pr27217.s @@ -13,4 +13,13 @@ foo: add x0, x0, :lo12:bar ret .size foo, .-foo - .ident "GCC: (GNU) 10.2.1 20201030 (RTEMS 6, RSB " + + .p2align 4 + .type dot, %function +dot: + adrp x0, . + add x0, x0, :lo12:. - 4 + adrp x1, . + 4 + add x1, x1, :lo12:. + ret + .size dot, .-dot