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 lists.gnu.org (lists.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 5D523CAC5BB for ; Wed, 8 Oct 2025 22:10:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6cCl-0000Pf-2T; Wed, 08 Oct 2025 18:00:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v6cCZ-00008Q-PB for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:05 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6cCK-0007MH-3C for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:03 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-77f67ba775aso409294b3a.3 for ; Wed, 08 Oct 2025 14:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759960783; x=1760565583; 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; bh=TRMGkSahDRDIyhY1Pf+KcfrLPaCj+CJxCc4+NBDjs/c=; b=j5lBAWN7GC+HFcNI2x90h4rDUtLs6G09/KgLUPpkRpdHPhNbb5oG1f3QA9WY/qnM1x F5EmBEuxDf6sukMB8Tdn98Jx+DT9VagNSkLcVa3iTjcc3Gk8lItsYfa0Uu2CgHN2S8ky pXWd/WZXGZvgQzqrP6n8RrhJUM9a1QdxHJutAavp964RoBBSoGDW7qIM44wledohkw+C dE9RhksodOhPlHi9W+WYXnxjdVH4v7Vp5rM9DPFnsaKzjANjlAy2L5eUbYRNkPmPDvHv N9PLt0UHbOXk7zZYU3e1g/9CCubKDDHPqvtRSfnaGcawX20A/CPk0VYdoCWSaPzMEs9b KxwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759960783; x=1760565583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TRMGkSahDRDIyhY1Pf+KcfrLPaCj+CJxCc4+NBDjs/c=; b=MxMRd+DgCIOYS7DWkaNhwKVN+bSE9kQYHV0xlDDxoCJREUTMoX3DXC1oGqgXD3242C sP3nffkVXAAemLFx+7MmGRZAKhegGdeSYOh7DnMqgGsSWGXaLlTzGK7GaZio27moFGJU +wbx6/30R4FnS3Wosd5gJ2Uz6hIy0WdDJFWuje0+V+GVS2Pladb7eSMHKy/1vERYofrm Mx6GEYM99MN7aGXUBd51Cw9Xq5e1UKTlPEOCa2sr+8RGjjZjepGyse88dZ0cPe/eQdIs 46WnElFZ720u6ZNVpzmOaDU9zlFntSobpnlhbV6BeKOSsUDltXKlaGQrxBhLdAbfQe+z ia0w== X-Gm-Message-State: AOJu0Yz2abPE/ikuOPZW4FUTdnJFdDEvqt+RgdFjk0PMl5x2QyD+qUCM HIIN+HG99sNK+b5Fj2X6vBXtsfG3ZwY4zPNN8DnWY0lUTdkez9oV7NEckTlPLnwsSgpz4GtL76p yJtpV4Q4= X-Gm-Gg: ASbGncszs3ERpguML5o29y/lbAtxTHLOWoqE0+QFj9BPAgE3YChB+cQhoPjXZJcouFe s2ud5JTnJ24ep8p6jj5bznq/cmP1AMjsU5R8LLmSf6jcck8hqQ4UD+lfqW9BYCs5PJgSh1bvc+S 3HvkhV11RdQ6nNFNJhmLe182aiRwzLTJgAKwhIbBxLTxpPo9NEpPCpgti93ohdYA/mj9VKOHz0r c+TBahoTgOdPlK3pe3msDEeXUpAW3+yoj0p5onugRfECcWK9OaUpyikG/sNk4L4kemgYWEjG8bx EM2RoVMRgXpj8LkkdV85zwh8GomdQ7xiiHJPo+mmtQIyaBoaOR3bJco2dLS1lyJTVZZCEhYM6NQ SjR+xu8WPmE9T5A/Pdyb8bVDY0vpCvbMtQtM7Pd8++OT97BqO+5IPFyCu X-Google-Smtp-Source: AGHT+IHW/SwPEbLKhMILzadeCRHrcFvtoUFhuYMlcp4OACdN4ujarSVbpcjsMmn23pPjKBm9Hzpn4w== X-Received: by 2002:a05:6a20:3ca8:b0:2fa:26fb:4a7b with SMTP id adf61e73a8af0-32da84ed64emr6062110637.57.1759960783370; Wed, 08 Oct 2025 14:59:43 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-794e1fc9db6sm740724b3a.66.2025.10.08.14.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 14:59:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v7 44/73] target/arm: Emit HSTR trap exception out of line Date: Wed, 8 Oct 2025 14:55:44 -0700 Message-ID: <20251008215613.300150-45-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251008215613.300150-1-richard.henderson@linaro.org> References: <20251008215613.300150-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: 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 Use delay_exception_el to move the exception out of line. Use TCG_COND_TSTNE instead of separate AND+NE. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/tcg/translate.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 78d26aac04..57bc8ea4c5 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -1774,21 +1774,11 @@ static void do_coproc_insn(DisasContext *s, int cpnum, int is64, if (maskbit != 4 && maskbit != 14) { /* T4 and T14 are RES0 so never cause traps */ - TCGv_i32 t; - DisasLabel over = gen_disas_label(s); + TCGLabel *fail = delay_exception_el(s, EXCP_UDEF, syndrome, 2); + TCGv_i32 t = + load_cpu_offset(offsetoflow32(CPUARMState, cp15.hstr_el2)); - t = load_cpu_offset(offsetoflow32(CPUARMState, cp15.hstr_el2)); - tcg_gen_andi_i32(t, t, 1u << maskbit); - tcg_gen_brcondi_i32(TCG_COND_EQ, t, 0, over.label); - - gen_exception_insn_el(s, 0, EXCP_UDEF, syndrome, 2); - /* - * gen_exception_insn() will set is_jmp to DISAS_NORETURN, - * but since we're conditionally branching over it, we want - * to assume continue-to-next-instruction. - */ - s->base.is_jmp = DISAS_NEXT; - set_disas_label(s, over); + tcg_gen_brcondi_i32(TCG_COND_TSTNE, t, 1u << maskbit, fail); } } -- 2.43.0