From patchwork Fri May 15 13:30:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 135036 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0951B40A00CC for ; Fri, 15 May 2026 13:31:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0951B40A00CC 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=I7An6Bso X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 7493240A1FA2 for ; Fri, 15 May 2026 13:30:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7493240A1FA2 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 7493240A1FA2 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778851820; cv=none; b=Q4hBBVnvZPpvQEuJFvy4+7oRMPQmTceprnfqzpiVEr+EzuI+SLDvHe1XFCFqA5DcWcKNleaO+JBljyvJlmy/0sU65RJukrxeOY1M4EIQBpuf/zaFLPXHm2NFXWAnDd4KyLfh4E8ZW/lSLrlAkW6rF2xFfBSjrnrbjWtWejbBv7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778851820; c=relaxed/simple; bh=e2YYqImFBG1jAHdkP4kGb1xccOH9jzuGzbvq5z26FFs=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=WaA3OSXTUaprsZuSVQoefAQ7jDeupIBjs6VWkZaNi/9mwjQ1L8GQLA8fkZBmmug6c+N2+8XipjuVvOvwNoHYQD1Tsnf8XGcIt3oUVp1iLW3Hr8mBElwHKFnNCPq1cbomEe764ZILmE/yfY+yFtGSTl2xwfkub9GqExYG88iKgH0= ARC-Authentication-Results: i=1; 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=I7An6Bso DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7493240A1FA2 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so151861005e9.2 for ; Fri, 15 May 2026 06:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778851819; x=1779456619; 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=iLQM+TpmDpgibHutALLWxLNOvGLcQO8XCNp2SPjyTyM=; b=I7An6Bso9UGBgbKFctQPQ2Wu/+lZLUQLAi53RPBUHaPZDwpylJk1+sUPsKw31BzS14 F/P30PtOYNB5qGQTQ3kpVVhbg3JEDNPx+k11I9cYk6N4AZkmM2oQo6rB/sgpn+xpdml1 m/iw/sfCgy8bL6YMzqi7d5kUsrqCRW7GMeUeWKZt6xL1b1QJZap0Cjd4sWefaStGUlM0 xeTYF1+J7wQYSqxxQoBwZVIHSxsT9t6L955K4dbRip2wTBTuBcA7cdt/P1iITkaYB4bb Ag9X82sGrHviLQ169hLA0hui2H5Lov0Vmr6gVXPvCOJb5kyAGkEtyNQ4sl53pmdiLrBJ 1rBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778851819; x=1779456619; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iLQM+TpmDpgibHutALLWxLNOvGLcQO8XCNp2SPjyTyM=; b=F+Jh+53jiwLzxsO8TfYmuzqIh7ll0bMhejmF3M7/Cj1MjkQYdZKahj222LrVBcSbS/ 9HX+W6wi7U9szzVK4njCfAer5ulZLtjr1va/OQKgITDEV+HJPKC4vhfqnoJiSP9XZsPC cdLJ2Lt6OcMOikJMwWYz2gBNdGPViSaqaYuEw4S/nRUIjyeE5BfbJuYG4SKdEy6rJ2zu QQogSX0pmFL0t1o3mgYxQX0RiFP4ecUf5IUjHi84QXuGcPnfZt2GymUKBOE3jmG3j0xr zkhxJxNscTR5PUUGe5ZHlTvY6k1wSzjTuT3HTPQ1TZt85Cv8PPMzUQA8bTy9pWix7hya RUGQ== X-Gm-Message-State: AOJu0YxS4CgHt+728YtSQKoKj8ndX/ZpnK9QWx6NYK5/qkvJ6VFCI3Oy WLU/dSTccOkhmCHkbA4IVr1k0+NK2Co7GyWVj3j8+S9y9HcAbZ3BW+EVwTmRLJikEy+ScCyJw6s TghQ= X-Gm-Gg: Acq92OHlWvapL3cTIMC8pjI/buED/eNGSQkck3Kr0UlhQ0E7bUdCPl4rrtmDlV5K4C4 Q1ZdApI0OkSahx9srUxTYGwhpe6iRozhaUbsLgghC7ChX2UNRE8/8RRE6Hqdf3w3Uw+Irl7+7Cs I4Y/VZmsjBYLKEpNiXmdNhtSPLOapR2aPCgaJze0gLam/c0MvT4KcFp5/+tf3UpsUeopMsZWSlv XiDy0yCk7appbB2iWjtwEzhU8MP4XPW2ElVeAg4pfoMgRpXKDSq8VZ7a7EdabM7QPk0dHYfP7Ca NV/EmOcnf4IuG35v+kN9/KbI3AfDeEXcWnR621UEygj1MsxlrYno3NM1LntYiHfpWpiFKoIBsf2 VTCnje1M+zu+tdYgBxhTKqGc3KV9UcQHhlzQdzyOTJ++Iq0bmMsWKyr2sembtODmSZJBe0C5IDM 5S+KoKyrULnRU1lvZoRcmeEwqm4qY7gm4tiq0Zml6Bk1KRVAGqrc7I7ab4R/xz78v+7o55xIzbH P3w0UTyDtHQ0Vg= X-Received: by 2002:a05:600c:8b18:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-48fe6515983mr60407985e9.23.1778851819379; Fri, 15 May 2026 06:30:19 -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 5b1f17b1804b1-48fe5694fbfsm111309215e9.6.2026.05.15.06.30.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 06:30:19 -0700 (PDT) Message-ID: <7b2943ce-eab2-454f-817f-f1de5650a5f9@suse.com> Date: Fri, 15 May 2026 15:30:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 04/16] RISC-V: match_*() improvements From: Jan Beulich To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , jiawei 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=-3016.4 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 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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 Match functions referenced by macro insns should not unconditionally invoke match_opcode(): The macro enumeration can change (grow), making the function potentially yield false negatives. In match_rs1_nonzero(), used solely by macro insns, add an assertion to that effect. While there also drop the pointless attribute from match_rs1_nonzero_rs2_even()'s first parameter. --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -22,6 +22,7 @@ #include "sysdep.h" #include "opcode/riscv.h" +#include #include /* Register names used by gas and objdump. */ @@ -210,14 +211,16 @@ static int match_rd_even (const struct riscv_opcode *op, insn_t insn) { int rd = (insn & MASK_RD) >> OP_SH_RD; - return ((rd & 1) == 0) && match_opcode (op, insn); + return ((rd & 1) == 0) + && (op->pinfo == INSN_MACRO || match_opcode (op, insn)); } static int match_rs2_even (const struct riscv_opcode *op, insn_t insn) { int rs2 = (insn & MASK_RS2) >> OP_SH_RS2; - return ((rs2 & 1) == 0) && match_opcode (op, insn); + return ((rs2 & 1) == 0) + && (op->pinfo == INSN_MACRO || match_opcode (op, insn)); } static int @@ -236,11 +239,12 @@ match_rd_even_nonzero (const struct risc static int match_rs1_nonzero (const struct riscv_opcode *op ATTRIBUTE_UNUSED, insn_t insn) { + assert (op->pinfo == INSN_MACRO); return (insn & MASK_RS1) != 0; } static int -match_rs1_nonzero_rs2_even (const struct riscv_opcode *op ATTRIBUTE_UNUSED, insn_t insn) +match_rs1_nonzero_rs2_even (const struct riscv_opcode *op, insn_t insn) { return match_rs1_nonzero (op, insn) && match_rs2_even (op, insn); }