From patchwork Tue Jun 7 02:47:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579305 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp4669246max; Mon, 6 Jun 2022 19:59:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy33cgwHF4kH/Nz9RCjtA05s06f9dEH5m98RqsZzS7boywEfzabXlyPZG9GldpNrCWzN1hf X-Received: by 2002:a05:6214:20a1:b0:42d:6f51:46e2 with SMTP id 1-20020a05621420a100b0042d6f5146e2mr75266653qvd.67.1654570789462; Mon, 06 Jun 2022 19:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654570789; cv=none; d=google.com; s=arc-20160816; b=GmKuau52dG95O4Nt4cgLMGMcQI+8gQ+Ow0CBGyDDquY7PMgAqv+lBhupA9r2MUX9ot XpGAn7+0AeRljBlcUveWJX+VfsCH2z68vjOKep+0/drf2pHSmZoLPSQLLt3rse2ZSTmA lodOR3O21b3u7ezN+Jr8KSu8fuPfCeJeoP3wpElDR4OZAa0QdvuyhhBvBoWX/lY7eK7W qAHHso5VY15/pIyXeXBXzu4PcueYu+i8JL8wfODoxBrRa89CGjPPCWxadOqXWg6PEFL8 99l1anzSdevAZQUHln0uIYlZUVAxET04+noWxyu/wll1pRzTdR+AfXNe+TjTu+OxkYUD vNiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9S8DgVIYwXT3v7+Mq8zUaV8sSMq5mSYLW1DSinvTJ/c=; b=f8hEPao2FcP247cSLUBbBPWwbLL0dJOfZPP5getVPRtLiEF30Opkd9xunKjAVgD4v9 gxML1sxItzhq5I2cBLj+KQlU3/tQrFouibCbr9ARv9JYlvqDi2lHsj3aI7Un5kQ9HuFr B29AsQ1ZFzI2WQbGHXgF27r42h+iMJzC+hLY1qqVTMKqGsWKvzRCuWfe8+OyBhwJrvbG Sb62O+DpT52Y59dMbcxVqx+XtTeGkDGjIybeZsCNgXYqZG1Sg9pgpiiWoY4WXHqmRKb4 cVR8hBckLhd78xKrHg6nyJ3i05u2gKZsRgV7Jsz7xt9SE5wcSudBKxj5IsrRwpXwYFx+ c/YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S91Jd+1o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a11-20020ad45c4b000000b004542667c953si9925404qva.199.2022.06.06.19.59.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Jun 2022 19:59:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S91Jd+1o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyPRd-0003Bm-28 for patch@linaro.org; Mon, 06 Jun 2022 22:59:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyPG1-0006sa-Jl for qemu-devel@nongnu.org; Mon, 06 Jun 2022 22:47:49 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:44647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyPFx-0000K8-3K for qemu-devel@nongnu.org; Mon, 06 Jun 2022 22:47:48 -0400 Received: by mail-pg1-x536.google.com with SMTP id c18so6218460pgh.11 for ; Mon, 06 Jun 2022 19:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9S8DgVIYwXT3v7+Mq8zUaV8sSMq5mSYLW1DSinvTJ/c=; b=S91Jd+1otx21UGN8wuqGFzTijKyO8JHYnyjyvh74paoeE4Zd6lHITfxFmz+qgcttMF nqEQ8no8oEi2BVGSigpoRXum+peB3TiuVHweWQSnGpMRGmat25uPxgMrIPt1L80v7PbW g5WEnxyWWbO8koAnSUo0+qGM9dXHw+mTJtZ+x7egbBxuFuMmVfFSacNR+KZki8WnmTzp TUv5gdhfxce04sHUmBR9WPr4PcJLyIZKWvV/qHG6P6bjvZAij6IQ43iD8DaAMKaazFXo 5waFt5KDVVnvXp6KUfW7hOgugJhsGL0cCY2O/reRopw0H0A6Ro0YQWXAwJW1xnqYuthr fcmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9S8DgVIYwXT3v7+Mq8zUaV8sSMq5mSYLW1DSinvTJ/c=; b=2TZTLr+WbcdvRa8HQ2F/tvXKhWdrntcI1KI0tVL78o4cC6rmiBuZgpwaL/zHahBLH2 MS2WJjXm5T9LLGradsAdk5NdQMCE87Zl9pqFuGyhN++XKrBSWOuUloxlCDdinm88hppA T0iL+NvE/PYjqrDWtI47KK5nA3fH/TqzmuGOQjCLxid6OOH5ZwcQNorKPxi7NUKSD8Lf h8gptIk7laGzHfnoD+3RrmRMrqaN7pTiZW2q++Jz45nwg2RNhYqvsdkCIqaRCmV5YLYt XDNCyt2hJ4iKx8zF2HX3hnjJJO13jT6oMvl2MTgleMuKJ5PxlimMqrZ7YCwt9S9l5d3T vKsw== X-Gm-Message-State: AOAM533PCDhUhSHRxFlBMRiBWC51+b6dM/gU5Ta2tpW3NLrv6bYjciO5 AEjQyVK2C392vEWoS/ig2hsh2sC+5XWBjA== X-Received: by 2002:a05:6a00:1496:b0:51b:dfb2:c9b5 with SMTP id v22-20020a056a00149600b0051bdfb2c9b5mr21161067pfu.84.1654570063803; Mon, 06 Jun 2022 19:47:43 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:d3db:cca:e5c9:6531]) by smtp.gmail.com with ESMTPSA id y26-20020aa7805a000000b0051876d83714sm7476904pfm.196.2022.06.06.19.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 19:47:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 10/25] target/arm: Rename helper_exception_with_syndrome Date: Mon, 6 Jun 2022 19:47:19 -0700 Message-Id: <20220607024734.541321-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607024734.541321-1-richard.henderson@linaro.org> References: <20220607024734.541321-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename to helper_exception_with_syndrome_el, to emphasize that the target el is a parameter. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/helper.h | 2 +- target/arm/translate.h | 6 +++--- target/arm/op_helper.c | 6 +++--- target/arm/translate.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index a13007699d..aca86612b4 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -45,7 +45,7 @@ DEF_HELPER_FLAGS_2(usad8, TCG_CALL_NO_RWG_SE, i32, i32, i32) DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) DEF_HELPER_2(exception_internal, noreturn, env, i32) -DEF_HELPER_4(exception_with_syndrome, noreturn, env, i32, i32, i32) +DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32) DEF_HELPER_3(exception_advsimdfp_access, noreturn, env, i32, i32) DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32) DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl) diff --git a/target/arm/translate.h b/target/arm/translate.h index da5f89d49d..1d6a8c7dca 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -332,9 +332,9 @@ static inline void gen_ss_advance(DisasContext *s) static inline void gen_exception(int excp, uint32_t syndrome, uint32_t target_el) { - gen_helper_exception_with_syndrome(cpu_env, tcg_constant_i32(excp), - tcg_constant_i32(syndrome), - tcg_constant_i32(target_el)); + gen_helper_exception_with_syndrome_el(cpu_env, tcg_constant_i32(excp), + tcg_constant_i32(syndrome), + tcg_constant_i32(target_el)); } static inline void gen_exception_advsimdfp_access(DisasContext *s, diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index ae0009d1a3..1c4e6753f6 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -373,7 +373,7 @@ void HELPER(yield)(CPUARMState *env) * those EXCP values which are special cases for QEMU to interrupt * execution and not to be used for exceptions which are passed to * the guest (those must all have syndrome information and thus should - * use exception_with_syndrome). + * use exception_with_syndrome*). */ void HELPER(exception_internal)(CPUARMState *env, uint32_t excp) { @@ -385,8 +385,8 @@ void HELPER(exception_internal)(CPUARMState *env, uint32_t excp) } /* Raise an exception with the specified syndrome register value */ -void HELPER(exception_with_syndrome)(CPUARMState *env, uint32_t excp, - uint32_t syndrome, uint32_t target_el) +void HELPER(exception_with_syndrome_el)(CPUARMState *env, uint32_t excp, + uint32_t syndrome, uint32_t target_el) { raise_exception(env, excp, syndrome, target_el); } diff --git a/target/arm/translate.c b/target/arm/translate.c index 87a899d638..dc033600c0 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -1119,9 +1119,9 @@ static void gen_exception_el(DisasContext *s, int excp, uint32_t syn, { gen_set_condexec(s); gen_set_pc_im(s, s->pc_curr); - gen_helper_exception_with_syndrome(cpu_env, - tcg_constant_i32(excp), - tcg_constant_i32(syn), tcg_el); + gen_helper_exception_with_syndrome_el(cpu_env, + tcg_constant_i32(excp), + tcg_constant_i32(syn), tcg_el); s->base.is_jmp = DISAS_NORETURN; }