From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 8E4083858D38 for ; Fri, 22 Mar 2024 08:22:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E4083858D38 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 8E4083858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::531 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711095735; cv=none; b=TXsBdCSRNU3u8lCjC5uic1/5Cr4Mym+Frj+YBbFGajQECv4WTTcAP4KIyPeBnnMLfahvJ4AGZC9N9OpsVGO9vnwIpOFoRb5lV4widT5AN7jC7N5EJRW4dP7eP+zhUleLXN1xbYl5WIr4Km6dSMgXYGTurnn2x/jvUsnBkZ7X9Zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711095735; c=relaxed/simple; bh=j4mp3qjiqwJ4ogQ/TgfzfR4x1cekIjRTeb5cDyFwP14=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=G1U6Be3BC4yKD2NW04gjX82DIi5E0oWrE3FoRXNUiWytUQS6BhP1kvFTroa0akNxt+wpO2MHp0Cz9M7fcLwG3DI0Hfxt7qp7Q4DAaUW6SzwpkTh02qjfkG8Vn9EKTfRblRdRfY8hgS4V4bHmXS+HrG1Ba6nXmhO4nGE5EF7iItY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-56b8e4f38a2so2341145a12.3 for ; Fri, 22 Mar 2024 01:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1711095722; x=1711700522; 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=6VEq9b1kbduvPtxWS0daalQjSznh/S8eyq4uf3IN0Is=; b=AgrG8mhSjWRPGj+MavHaOhS74x8thPtkbEaoj9IpPkbmayuYVzU/6nNuNu8/3q7foN 25jqpCl3hD9cYJcCZ2zPp8cO0F4TjI0CxwTsx6umI5FlILrwW6AwALzUDgQZa+YvIKKB QmBFGkQSQry+bGzJsIym6iUKeYqQ7CJtSdPinnMxVvYbCCPe1BIPn4Rgq7nzx1rpY6px jFvFK4RVtULrpmURvhDcyziRg1T3ClkgCOwQ8Ki1RfLWyH1KZTRNRBbKVG/geixz7U8N 7JcJ9ayOBD7blTfLRkwkvkLzh2qt2apuRFDyhJRTWPSeX5vcWQqV+9ad6QVAPDWVaZQ5 ZeKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711095722; x=1711700522; 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=6VEq9b1kbduvPtxWS0daalQjSznh/S8eyq4uf3IN0Is=; b=Qi884j+PLnBEniuiX+uWrV52HNIFS+7rJdPjE9s4VqJGD4Mg/dp/PtXOrfniFVxfCP sFI4RQrDl5DsyVOOYENzQapxwJmE/fXMqQWF/HUokVv6YVadZh5OiMgURZcc5G2/7vOW qWWyCc6x/6oG/8ap/ckbmpRerGwTlkZh1yFBfZschMhnc3PdjUqId9Yc4NXB3nd0U2HA sMYCNV7moaVulyM171eeCstDL1fhM42pGQljxj/ww78cgF63mPgfii3h24y8MlnT6N56 ZNyERTeoH57JEcF5oX/IU1I0hVpcwWVorvbi4iXqxBWMkzWd265tKqCHQ97B3tpqORLK n16w== X-Gm-Message-State: AOJu0Yxas+BtAZDYIV9JFzA38REH2XNpcYhvJyxX4sS3l7SIN9q7LYac 7qG/nH15uA8EXfIBbs4afomgo7i5SzY4hMul26mmGxx1528rZ0Z1URYts6tlkEamV//t+Q1hPzU = X-Google-Smtp-Source: AGHT+IGcUho7qahrMAO5ApbyeTh68HCwRqa87Zc95QCfmIhy9MEVzw+mRuD8UkQNXMAUBXPQZazYjg== X-Received: by 2002:a50:9318:0:b0:56a:2b6b:42cd with SMTP id m24-20020a509318000000b0056a2b6b42cdmr949436eda.3.1711095722267; Fri, 22 Mar 2024 01:22:02 -0700 (PDT) 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 c2-20020a0564021f8200b0056bcec9c89esm754006edc.92.2024.03.22.01.22.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Mar 2024 01:22:02 -0700 (PDT) Message-ID: Date: Fri, 22 Mar 2024 09:22:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: Richard Earnshaw , Marcus Shawcroft From: Jan Beulich Subject: [PATCH v2] Arm64: check tied operand specifier in aarch64-gen 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.3 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 List-Id: Make sure that field actually matches the specified operands. Don't follow existing F_PSEUDO checking in using assertions, though. Print meaningful error messages, thus - while not having a line number available - at least providing some indication of where things are wrong. Fix SVE2.1's extq accordingly, but don't extend the testsuite there: There are further issues with its operands (SVE_Zm_imm4 doesn't look to be correct to use there, as that describes an indexed vector register, while here a separate vector register and immediate operand are to be specified). --- v2: Also report opcode and opcode mask in error message. --- a/opcodes/aarch64-gen.c +++ b/opcodes/aarch64-gen.c @@ -129,6 +129,7 @@ read_table (const struct aarch64_opcode* const struct aarch64_opcode *ent = table; opcode_node **new_ent; unsigned int index = initialize_index (table); + unsigned int errors = 0; if (!ent->name) return; @@ -140,6 +141,8 @@ read_table (const struct aarch64_opcode* do { + bool match = false; + /* F_PSEUDO needs to be used together with F_ALIAS to indicate an alias opcode is a programmer friendly pseudo instruction available only in the assembly code (thus will not show up in the disassembly). */ @@ -150,12 +153,46 @@ read_table (const struct aarch64_opcode* index++; continue; } + + /* Check tied_operand against operands[]. */ + for (unsigned int i = 1; i < ARRAY_SIZE (ent->operands); ++i) + { + if (ent->operands[i] == AARCH64_OPND_NIL) + break; + + if (ent->operands[i] != ent->operands[0]) + continue; + match = true; + + if (i != ent->tied_operand) + { + fprintf (stderr, + "%s (%08x,%08x): operands 1 and %u match, but tied=%u\n", + ent->name, ent->opcode, ent->mask, i + 1, ent->tied_operand); + ++errors; + } + } + if (!match && ent->tied_operand + /* SME LDR/STR (array vector) tie together inner immediates only. */ + && ent->iclass != sme_ldr && ent->iclass != sme_str) + { + fprintf (stderr, "%s: no operands match, but tied=%u\n", + ent->name, ent->tied_operand); + ++errors; + } + *new_ent = new_opcode_node (); (*new_ent)->opcode = ent->opcode; (*new_ent)->mask = ent->mask; (*new_ent)->index = index++; new_ent = &((*new_ent)->next); } while ((++ent)->name); + + if (errors) + { + fprintf (stderr, "%u errors, exiting\n", errors); + xexit (3); + } } static inline void --- a/opcodes/aarch64-tbl.h +++ b/opcodes/aarch64-tbl.h @@ -6375,7 +6375,7 @@ const struct aarch64_opcode aarch64_opco SVE2p1_INSNC("fminqv",0x6417a000, 0xff3fe000, sve2_urqvs, 0, OP3 (Vd, SVE_Pg3, SVE_Zn), OP_SVE_vUS_HSD_HSD, F_OPD_SIZE, C_SCAN_MOVPRFX, 0), SVE2p1_INSN("dupq",0x05202400, 0xffe0fc00, sve_index1, 0, OP2 (SVE_Zd, SVE_Zn_5_INDEX), OP_SVE_VV_BHSD, 0, 0), - SVE2p1_INSN("extq",0x05602400, 0xfff0fc00, sve_misc, 0, OP3 (SVE_Zd, SVE_Zd, SVE_Zm_imm4), OP_SVE_BBB, 0, 0), + SVE2p1_INSN("extq",0x05602400, 0xfff0fc00, sve_misc, 0, OP3 (SVE_Zd, SVE_Zd, SVE_Zm_imm4), OP_SVE_BBB, 0, 1), SVE2p1_INSNC("ld1q",0xc400a000, 0xffe0e000, sve_misc, 0, OP3 (SVE_Zt, SVE_Pg3, SVE_ADDR_ZX), OP_SVE_SZS_QD, 0, C_SCAN_MOVPRFX, 0), SVE2p1_INSNC("ld2q",0xa490e000, 0xfff0e000, sve_misc, 0, OP3 (SME_Zt2, SVE_Pg3, SVE_ADDR_RI_S4x2xVL), OP_SVE_QZU, 0, C_SCAN_MOVPRFX, 0), SVE2p1_INSNC("ld3q",0xa510e000, 0xfff0e000, sve_misc, 0, OP3 (SME_Zt3, SVE_Pg3, SVE_ADDR_RI_S4x2xVL), OP_SVE_QZU, 0, C_SCAN_MOVPRFX, 0),