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))))