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