From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 235D0C5AD4E for ; Sun, 9 Aug 2026 22:43:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtC7l-0000oT-1P; Sun, 09 Aug 2026 18:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtC7j-0000nL-EO for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:07 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wtC7h-0007LQ-Sf for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:07 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-cbe827e3cb4so1247952a12.3 for ; Sun, 09 Aug 2026 15:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1786314964; x=1786919764; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3xN9uF24PxcjCHBEneq1+0Tduc7DpGTZFeyk6b0loig=; b=DJueIR4O1NmSmZa5qs7P7DHtp+7eA/5AlokZKCJlz5ZlVZ8nUYCnE0Pzes3BcfC06J 0xj1BCyhtjj1Ll8G4xVVL88cxwRrXzkjFDq4+OQAkb19C0Sfz0Swk86NtiPBPqCzlTY6 3QtG04iGVvR7sAREpRRQAn6wYnkW4xb5XRPBXaUZUVNIWG20ow73qvFX3vutD0Q6fwGb 7GPyg3tvv8YmHyIvW+1hpW75AK62RFo93F4DhJbimNQ24DDxJylUfY9wcYnofUOQxI+u g12Cz8oc2wA/kztHyfEAcwAg9PQePvZdK4CJClstVxPaUJUNWe9G77PilsvZAIoeNB4r /QLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786314964; x=1786919764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3xN9uF24PxcjCHBEneq1+0Tduc7DpGTZFeyk6b0loig=; b=Yx7wEIj0ivoqzjVw/Iowc0ALBYO9CeKPtLx6ctWvtY2iJUEWAjETT96eC+xbGzWVRR QUPY2AlpfnM0RvoqHkvrm95bv1bUla1dJZ3isGos+rsX/17vBsrQdpSYhuIP2iigST9I KzbGBg5xP2ZsQy6Aya4WXRZTA+8zn1oriSMmajbOFXfKL1bqCr2FUc/UvuaJ46G0U/fP STH0a1U+xLVklbZk0qf3c2Qo9srWmBeJigkniumYmG4C5VmT+k/I/AG1hWYmdaUK+Wu5 QfgbqW9AOkdkcVk/A+12xjCQBNyFGcVkR29WLWIp5sTetkipZDWGGce7xaAkFwDMZ5Z0 Ww9g== X-Gm-Message-State: AOJu0Yx+UVzMe9+OIQ6TRfwmIcFodzpFOwbaBu8sy1cgmBLWxMGBsECV Rw6WmG+NQv9glUxB8CyN3LoRAM401gsp5paS9vPfUZ6cfKdd+jtatszIcwacXxseepwHEf9tNJD nh64O X-Gm-Gg: AR+sD122ZF7iRI1tbDmNcUE/E4xUtuPiLrBO92kfhTER6agT8Q18uxHVIgOX4fvLOYr QPldoWuxQfaOyKCZIJD4JUtK+C2HBZFIM8KDS+1MC3eRvscj7ubWKkrNMZnF8EiisBR2tcU5Xgg zGtcb3Uvyydrl+S/9lQlsGJx3EMGOJHyyd9M3h8k+Jvds4gWTVe4uJUT//tcxt6rjx4uOls72Xe GL1MlDcZssIRt2y+9r2y4kEvAfYxk+XCvarOYAf9P75qcixOPWOWx/HKMj2UThVN5WUltMcKwxW sn8ukYZt2r61Swh6YAK3HfKouMQ+fL5x4Mxs0LN9J9cdn3lO9n7s0ajAEx960vXsWvf2+9U9yCB HtJbsV+Ylum2ipKtRgVqBEdKxYmsiH3eDL8ihF6aSvs6V4YA+d6ySkiKeP66dKAcwoW8C4szHZz lQeQhKX5m2Xz8vFohchPBXAMRSYoD6+KjA79PSXtaqW8T6Gh05bR6YlvOPtC5O0U/voL7CdXXMm orUa0pGVId1VNdFOOrj7lO0dUN9118= X-Received: by 2002:a05:6a00:a116:b0:846:bc60:5bf7 with SMTP id d2e1a72fcca58-84f2dfcf7f5mr42979532b3a.6.1786314964295; Sun, 09 Aug 2026 15:36:04 -0700 (PDT) Received: from stoup.. (174-21-93-59.tukw.qwest.net. [174.21.93.59]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbe8f19ace6sm2998102a12.2.2026.08.09.15.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 15:36:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org Subject: [PATCH 13/56] disas/riscv: Tidy disasm_inst main loop Date: Sun, 9 Aug 2026 15:35:02 -0700 Message-ID: <20260809223545.730664-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260809223545.730664-1-richard.henderson@linaro.org> References: <20260809223545.730664-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Unroll first iteration, so that always_true_p is not used, Drop some local variables and use 'decoders' directly. Signed-off-by: Richard Henderson --- disas/riscv.c | 63 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index 70ea41f125..9880b8de20 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -5419,41 +5419,40 @@ static GString *disasm_inst(rv_isa isa, uint64_t pc, rv_inst inst, .inst = inst, .cfg = cfg, }; - - static const struct { - bool (*guard_func)(const RISCVCPUConfig *); - const rv_opcode_data *opcode_data; - void (*decode_func)(rv_decode *, rv_isa); - } decoders[] = { - { always_true_p, rvi_opcode_data, decode_inst_opcode }, - { has_xtheadba_p, xthead_opcode_data, decode_xtheadba }, - { has_xtheadbb_p, xthead_opcode_data, decode_xtheadbb }, - { has_xtheadbs_p, xthead_opcode_data, decode_xtheadbs }, - { has_xtheadcmo_p, xthead_opcode_data, decode_xtheadcmo }, - { has_xtheadcondmov_p, xthead_opcode_data, decode_xtheadcondmov }, - { has_xtheadfmemidx_p, xthead_opcode_data, decode_xtheadfmemidx }, - { has_xtheadfmv_p, xthead_opcode_data, decode_xtheadfmv }, - { has_xtheadmac_p, xthead_opcode_data, decode_xtheadmac }, - { has_xtheadmemidx_p, xthead_opcode_data, decode_xtheadmemidx }, - { has_xtheadmempair_p, xthead_opcode_data, decode_xtheadmempair }, - { has_xtheadsync_p, xthead_opcode_data, decode_xtheadsync }, - { has_XVentanaCondOps_p, ventana_opcode_data, decode_xventanacondops }, - { has_xlrbr_p, rv_xlrbr_opcode_data, decode_xlrbr }, - }; - const rv_opcode_data *op; - for (size_t i = 0; i < ARRAY_SIZE(decoders); i++) { - bool (*guard_func)(const RISCVCPUConfig *) = decoders[i].guard_func; - const rv_opcode_data *opcode_data = decoders[i].opcode_data; - void (*decode_func)(rv_decode *, rv_isa) = decoders[i].decode_func; + dec.opcode_data = rvi_opcode_data; + decode_inst_opcode(&dec, isa); - /* always_true_p don't dereference cfg */ - if (((i == 0) || cfg) && guard_func(cfg)) { - dec.opcode_data = opcode_data; - decode_func(&dec, isa); - if (dec.op != rv_op_illegal) - break; + if (dec.op == rv_op_illegal && cfg) { + static const struct { + bool (*guard_func)(const RISCVCPUConfig *); + const rv_opcode_data *opcode_data; + void (*decode_func)(rv_decode *, rv_isa); + } decoders[] = { + { has_xtheadba_p, xthead_opcode_data, decode_xtheadba }, + { has_xtheadbb_p, xthead_opcode_data, decode_xtheadbb }, + { has_xtheadbs_p, xthead_opcode_data, decode_xtheadbs }, + { has_xtheadcmo_p, xthead_opcode_data, decode_xtheadcmo }, + { has_xtheadcondmov_p, xthead_opcode_data, decode_xtheadcondmov }, + { has_xtheadfmemidx_p, xthead_opcode_data, decode_xtheadfmemidx }, + { has_xtheadfmv_p, xthead_opcode_data, decode_xtheadfmv }, + { has_xtheadmac_p, xthead_opcode_data, decode_xtheadmac }, + { has_xtheadmemidx_p, xthead_opcode_data, decode_xtheadmemidx }, + { has_xtheadmempair_p, xthead_opcode_data, decode_xtheadmempair }, + { has_xtheadsync_p, xthead_opcode_data, decode_xtheadsync }, + { has_XVentanaCondOps_p, ventana_opcode_data, decode_xventanacondops }, + { has_xlrbr_p, rv_xlrbr_opcode_data, decode_xlrbr }, + }; + + for (size_t i = 0; i < ARRAY_SIZE(decoders); i++) { + if (decoders[i].guard_func(cfg)) { + dec.opcode_data = decoders[i].opcode_data; + decoders[i].decode_func(&dec, isa); + if (dec.op != rv_op_illegal) { + break; + } + } } } -- 2.43.0