From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 42AC13858C74 for ; Fri, 19 Jan 2024 10:49:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42AC13858C74 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 42AC13858C74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705661398; cv=none; b=hL8AN/wi9FewqQYIL0QpxnCacVgusH3fmlCab/MvYj+MEsIHeYD6PorRK58sCWJgIQBJgpeL88qvjdnOfKKdQPGSt/ghZEqWVbhBuyqZww8lX08CT/owsKdeuWCZc5PltyEdnxbH+F38J2rrXti1S/ms++zc3c8UztPeSqFME84= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705661398; c=relaxed/simple; bh=f+1ab/RHLndh2gKQ2QXph8pI7EGoHt4Fjs0T8s7NKHs=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=EWjxz1kFH/1lfbZKT7yp88qvj2cOeq0x8Pk1e/kuDv8H+8YyevodHZgZmrExg+Tz3lfazcE6HjBynlHQuwfYj7DJ5ji94CzbkVUXGm+eonQ9REtJ1KZgaYW5364UmhQSSf+UCxRci0XiKDDOM3MsinHEBpHNo+zCIOaLlFtjyOY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-339237092dcso55618f8f.3 for ; Fri, 19 Jan 2024 02:49:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1705661396; x=1706266196; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=YPvpr0UIvWgo2DxmZEok0FkVo6+s7dJagDCLEKkzcQ8=; b=LTLCA7/P/sXpUS0pwJqgtVzhG/FvvhzUA5uBwGFhIKoyB9aNvAW+inOqtJExNEYiUL 16rLbOF0G3S/Crr9NmWTdD4cfSGHwU8jEs61BSDv2Azytq6dpL+myJLp+4YK2ShEqbby aAe6wlhzXwnVO3w8RVqrh3MfptOQQL0nMdHP8mr7wgNeLzYVy/5mVqtx1hldEHj10hF9 L4VwUxc/4P8/0gRWl1CIFW4FvydFZZlTu8aNFtIVShPKma1vN4lEj5kIFq770eKL4cnc hMnzWkXyeoU0rrmFqMxO/csjPdotG7S9MKLiRaT9yuIC9MURfkZt6L7w1bEZpLWOmaau 8tiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705661396; x=1706266196; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YPvpr0UIvWgo2DxmZEok0FkVo6+s7dJagDCLEKkzcQ8=; b=chIA1D7/TXHuq2YZ81HDA8RiDBEDML8yQTPAIA1+L9nfliWuRDqeuFQCsnvlO1Tyuc kGfltIWJJMdLEcqWAFX3kiXEv8wwuE5p5Nq8bKxut7XcOdsnnvVRFXJQPyhqwbjUeHHL /O1TVe6c+utA82rxFxRCMuIhgdSgPquUnDUS5Z2OwQqmnnNTyaobqJb46Er3c2avCnS2 05zX9du7wbQpIfS13vLRhg6HRE6PpuL3roOVGVmZFozaOY2TGkouZhqt4LEzOxi+G6bF 3xvhKMh7stAl19mZJIM42tPSWomtZkq55ZF2iapcBmUHD47m1Kq+CWfLtLlCjKBHqwhZ veOQ== X-Gm-Message-State: AOJu0YziqtYPVYjXdqMKnA3WCgv0cK89PLgzrzLgxjqzq3v5wps2E2/M w8n+l1NvKWmMKjtNkDkeQYnCVvW137ACTq8uJMvGG6QtwxQAkBENUxzMZpx6CqV0kT6GYGzb1V4 = X-Google-Smtp-Source: AGHT+IEZTyVD4Zx79JKKlPmnF1n8OBAq+d/hz/8aB4xHUODGpo2psJmJS8HZeUNAJ4JKUn9E1m9G2A== X-Received: by 2002:a5d:4104:0:b0:336:81d8:3ed0 with SMTP id l4-20020a5d4104000000b0033681d83ed0mr1330683wrp.26.1705661396027; Fri, 19 Jan 2024 02:49:56 -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 e21-20020adfa455000000b003392295997dsm679231wra.25.2024.01.19.02.49.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Jan 2024 02:49:55 -0800 (PST) Message-ID: <78991069-9936-49d9-935f-4bd40457636b@suse.com> Date: Fri, 19 Jan 2024 11:49:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "H.J. Lu" , LIU Hao From: Jan Beulich Subject: [PATCH] x86: make "-msyntax=intel -mnaked-reg" match ".intel_syntax noprefix" 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3025.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,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: Adjustments made for the directive (by set_intel_syntax()) need also making for the command line option. Break out respective code into a new helper function, to also be invoked during command line processing. Further also set register_prefix when processing -mnaked-reg. --- If we wanted to also generalize the bfd_get_symbol_leading_char() dependency, we'd need to defer processing until at least tc_init_after_args(), perhaps md_begin(). --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -2708,6 +2708,16 @@ set_16bit_gcc_code_flag (int new_code_fl } static void +_set_intel_syntax (int syntax_flag) +{ + intel_syntax = syntax_flag; + + expr_set_rank (O_full_ptr, syntax_flag ? 10 : 0); + + register_prefix = allow_naked_reg ? "" : "%"; +} + +static void set_intel_syntax (int syntax_flag) { /* Find out if register prefixing is specified. */ @@ -2729,17 +2739,13 @@ set_intel_syntax (int syntax_flag) } demand_empty_rest_of_line (); - intel_syntax = syntax_flag; - if (ask_naked_reg == 0) - allow_naked_reg = (intel_syntax + allow_naked_reg = (syntax_flag && (bfd_get_symbol_leading_char (stdoutput) != '\0')); else allow_naked_reg = (ask_naked_reg < 0); - expr_set_rank (O_full_ptr, syntax_flag ? 10 : 0); - - register_prefix = allow_naked_reg ? "" : "%"; + _set_intel_syntax (syntax_flag); } static void @@ -15212,9 +15218,9 @@ md_parse_option (int c, const char *arg) case OPTION_MSYNTAX: if (strcasecmp (arg, "att") == 0) - intel_syntax = 0; + _set_intel_syntax (0); else if (strcasecmp (arg, "intel") == 0) - intel_syntax = 1; + _set_intel_syntax (1); else as_fatal (_("invalid -msyntax= option: `%s'"), arg); break; @@ -15225,6 +15231,7 @@ md_parse_option (int c, const char *arg) case OPTION_MNAKED_REG: allow_naked_reg = 1; + register_prefix = ""; break; case OPTION_MSSE2AVX: --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -66,6 +66,7 @@ if [gas_32_check] then { run_dump_test "intel16" run_list_test "intelbad" "" run_dump_test "intelok" + run_dump_test "intelok2" run_dump_test "prefix" run_list_test "prefix32" "-al" run_dump_test "insn-32" --- a/gas/testsuite/gas/i386/intelok.d +++ b/gas/testsuite/gas/i386/intelok.d @@ -1,6 +1,6 @@ -#as: -J --divide +#as: -J --divide --defsym USE_DIRECTIVE=1 #objdump: -dwMintel -#name: i386 intel-ok +#name: i386 intel-ok (directive) #warning_output: intelok.e .*: +file format .* --- a/gas/testsuite/gas/i386/intelok.e +++ b/gas/testsuite/gas/i386/intelok.e @@ -1,2 +1,2 @@ .*: Assembler messages: -.*:155: Warning: redundant segment overrides +.*:157: Warning: redundant segment overrides --- a/gas/testsuite/gas/i386/intelok.s +++ b/gas/testsuite/gas/i386/intelok.s @@ -1,4 +1,6 @@ + .ifdef USE_DIRECTIVE .intel_syntax noprefix + .endif .text start: --- /dev/null +++ b/gas/testsuite/gas/i386/intelok2.d @@ -0,0 +1,6 @@ +#as: -J --divide -msyntax=intel -mnaked-reg +#objdump: -dwMintel +#name: i386 intel-ok (cmdline option) +#source: intelok.s +#dump: intelok.d +#warning_output: intelok.e