From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id D99553857B89 for ; Fri, 2 Feb 2024 10:41:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D99553857B89 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 D99553857B89 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::22d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706870514; cv=none; b=ejigjF8o2ipp5uzUsgI+dAlJOAfc8OBwzVznXGJRuo+KMjWLS6Q4twJYqYviAApokTRrTYgSxdrxansbkwvWONpmm97ereB8ERYCLsiIoyohHEhtC29Nk+l1BTXYVFhMTx7B2/dsGtiHHJEfcnTfpvJI3D3mwUU6zTQ7IhLKyBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706870514; c=relaxed/simple; bh=aTckQFBq7m/N8f/Te9g6jnEgy5HLAkG1iVOZU/rIwNc=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=qupVSY3qLC5lnKWLK9LjlzDxdfGBTP/B1M4GD7xP0snxcSSZn/ASc8D+Mjml7vaMhE2IpsT+tUp1YdNYq2jK3z7Mc9g98vCZipwhyCG+dQL3JnxyPdHqEpExxKORE3P9zqxnJ8MUuUzlRSn54DYkEn3jbF4hUIxjQiqSmfFJ9sA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2cf206e4d56so24568761fa.3 for ; Fri, 02 Feb 2024 02:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1706870511; x=1707475311; 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=57BzVeuL/sVD/twLrJBxWt0NzgByZPxLyHvLRreydZ8=; b=SVRqJ/3aCzSoLWgMAyhmMtAzN4Q/wQNsQADyUNLBQE+Zoi7e7Vm7tFu+A9PXxVUHD0 szKBqad9Wh4wwxeP+a+nnh7c56+HkBgD9TTxKfTbelPPjI84cr+CI5vuM43Nsv6l8tBU kNBVkpjFExM66kvtmeiN03yGviifkHNmMJsJiAUDijOyRGmv3cjQsizf+IHqgZyDXR8/ 9kAs5BO+0hCxYi5wM42PofAboWV6eXEpPUjGomLC3/2moS8uu8SZC4aaw6ETYSqoA4SB /9MFT+ljIvGkStaqM8ccPN3bPInTZJtFqZg74bWAkTS8J27bsP9+2lqTlVebBquzrYXV B+Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706870511; x=1707475311; 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=57BzVeuL/sVD/twLrJBxWt0NzgByZPxLyHvLRreydZ8=; b=RqjI/NrgAsKa9Vkjj6nSB7zAf59oJsg1saE1AD7ScgvGTU2n41ZC21Jdq+BLJ28hY2 IN0x4UX6rSk4+kkionLNTF0S72I/BNhPgIVzFmtAHMOvmeMLuEOuqbEkNpeGJ0hPusT/ HaiEeg2U14xSrGqQOzJ7QJG0DSSpO9KB6j2P3jknUnn/1E/Ku3x0/tvKiTgj325FNAju 2dZK+ScCsneZXuM1f0QeFq2huH9CO15tPxfNbQCwu29OxXj2MRH12WfJRJkUffeUCwN7 OYbt+aeewXeHsNjpCDEMEwdqug82Ee3IvjF9r09hv55IUc7zLFZwvXB6ulwlIJhOUgYa 77LQ== X-Gm-Message-State: AOJu0YyHG0bUcRy4yh1Q1h7VkRRsPKQpJEI1ICI6xsGEvgEUgIcvqNU/ E+HTteYVT8NH2zjdooT0vhpEy4YHhEjaWtC7euyVLcFUF4CEGKyq+flg4Xb+Qskt0VIFyIZVlSc = X-Google-Smtp-Source: AGHT+IGLgfARDLytSdURGcz6WFq2RswwVJJM1FlMAP0b2XabRixZmg6/OJo49EQrBnIVR73CDQvZYQ== X-Received: by 2002:a2e:7817:0:b0:2cc:ee90:e565 with SMTP id t23-20020a2e7817000000b002ccee90e565mr3370751ljc.9.1706870511417; Fri, 02 Feb 2024 02:41:51 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWrm2jIdrPS7IzO9fe5MDdbcctQBXhkn+XMVtxm3SW+dnouwGjYBvc4xWSEMJAELuCnidFyNRslV6UTJsmAN9WzzJU= 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 wn7-20020a170907068700b00a2e9f198cffsm742112ejb.72.2024.02.02.02.41.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Feb 2024 02:41:51 -0800 (PST) Message-ID: <1aff1d43-b427-4451-b08f-8dccc54aaf55@suse.com> Date: Fri, 2 Feb 2024 11:41:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "H.J. Lu" , Lili Cui From: Jan Beulich Subject: [PATCH] x86/APX: with REX2 map 1 doesn't "chain" to maps 2 or 3 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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Don't wander into three_byte_table[] when REX2 is present. While there also eliminate related confusion when accessing dis386_twobyte[]: There's nothing 3-byte-ish involved there. Dropping the odd variable gets things better in sync with 1-byte handling as well. --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -8833,6 +8833,8 @@ get_valid_dis386 (const struct dis386 *d break; case USE_3BYTE_TABLE: + if (ins->last_rex2_prefix >= 0) + return &err_opcode; if (!fetch_code (ins->info, ins->codep + 2)) return &err_opcode; vindex = *ins->codep++; @@ -9550,8 +9552,6 @@ print_insn (bfd_vma pc, disassemble_info /* REX2.M in rex2 prefix represents map0 or map1. */ if (ins.last_rex2_prefix < 0 ? *ins.codep == 0x0f : (ins.rex2 & REX2_M)) { - unsigned char threebyte; - if (!ins.rex2) { ins.codep++; @@ -9559,17 +9559,15 @@ print_insn (bfd_vma pc, disassemble_info goto fetch_error_out; } - threebyte = *ins.codep; - dp = &dis386_twobyte[threebyte]; - ins.need_modrm = twobyte_has_modrm[threebyte]; - ins.codep++; + dp = &dis386_twobyte[*ins.codep]; + ins.need_modrm = twobyte_has_modrm[*ins.codep]; } else { dp = &dis386[*ins.codep]; ins.need_modrm = onebyte_has_modrm[*ins.codep]; - ins.codep++; } + ins.codep++; /* Save sizeflag for printing the extra ins.prefixes later before updating it for mnemonic and operand processing. The prefix names depend