From patchwork Fri Jun 10 16:07:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580608 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp1892786max; Fri, 10 Jun 2022 09:18:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPzQmX923IkNUa9YlM2mMB8k0hGEM1Ayxf0NYMI7ctqwAxx2vQIyUwvcG5fniHNjDeR82K X-Received: by 2002:a05:620a:24ce:b0:6a7:48c:f0d5 with SMTP id m14-20020a05620a24ce00b006a7048cf0d5mr9465580qkn.314.1654877904819; Fri, 10 Jun 2022 09:18:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654877904; cv=none; d=google.com; s=arc-20160816; b=ge6c5/XaaZjiMcb9k1a1qNulm2U2soFfqW5RIHtcX8Y0BVjvfv8BP5AUZb/NRYT1bT ngxX+QmYh/HHB4pPOvURNqm2t1BJL5aHP6OiKHwuhvl3WxvpLU6Pn/XpY48cvjvJn5cQ ZJgFkbsaSM9UXLwDDjbW/11CvGoKjgpSnWYVLDpznXndvW26+xabwUBke8HSBs4kOutj dSDOo5exm81+yKu62eT+Uvy8jWps6s105GddqWrm/dHGfzBl3C8KJPasG61SCVx95zD0 /ie5KQE5d/+skqq8Kj97NDoyQ8LiZ8saz6Nv/g6uphPYDn69+nFb5SS1/vD6ue7xLyTJ f4MQ== 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:to:from :dkim-signature; bh=uihzOvElFxYE5Rw9/Fbrqmv/if8v5ot0XEU8msK1zdE=; b=J3Hbf3M6Hl7Y6Ylc+HZDvR+31VUqhAFKJNWwy0JWqOPigsTghuw5SDw2g56yw4O08Z uuz5qV/bAhkulEVsmdNTEEQUXMZ5XP8mrx/SkWsAuRT4KQrAOuaDZuzrH3XWvvPV6t04 qH9Cm7PcVXw7vjgoPG9cIS3HlaQ/q3H0QEP40b0lV+Ywp/pbo65b1zyaD87xvYOfAcjv H5fSiZxsW6XNe0D4bLl18Sq/6fCZbGffuuH5+TNYEuIM/iVCitwTSd7LNmaRnUAnNXTK EJkJMLZTG+1TstcobpGmTgF9RTr4dIV5NK6XyeBNjTmY8YExJVSxFfMfIyT5B48cY5ue 5CwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=reqnHUKo; 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 k3-20020ac85fc3000000b002fbad06a700si15107960qta.677.2022.06.10.09.18.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Jun 2022 09:18:24 -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=reqnHUKo; 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]:50396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzhL6-0000LE-Bt for patch@linaro.org; Fri, 10 Jun 2022 12:18:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzhB1-0007i3-Pp for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:08:03 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:33520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzhAy-0007Gm-Fv for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:07:59 -0400 Received: by mail-wr1-x436.google.com with SMTP id h5so37187335wrb.0 for ; Fri, 10 Jun 2022 09:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uihzOvElFxYE5Rw9/Fbrqmv/if8v5ot0XEU8msK1zdE=; b=reqnHUKoVB2Edinu7jZmGuW929q7uQRVDqQLTw9J/xtKBIS2CCN8aU0e+VcJZgeIKm Ck3HDwtSfX4NvU5ATNFUlF2DJlvXbP0b5DcDE15jv8cpgV2kota6aHki1ldaKYOhvvzn 2129xf1FmvZW5+809a+vl0015/UpJ0qC2uf5F5yX1gtMINFk8KNNsA6WbNxuS8heM9g0 8XNy8KS8BRuJ5DQp1xRMoomp4opDKR+prr+w7Plob0lYm1cWdd/0yWO5BpMKWgCRpT9d 3VWgTYJlHomeVK4TYhWF2lAZKcvUYXRLETwQOJAOcJcwq+gULdtfoQ0oeCZYc6TpaCKB u/4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uihzOvElFxYE5Rw9/Fbrqmv/if8v5ot0XEU8msK1zdE=; b=YtKiK9v+AD+5cV8Vnf/ZyYotD4zTejVOs1drJ76SaXfrTSnCBM0Iu6Mwv5nydyp7FR zvSV3mvu6/lg2JpMBRpGpoa+uDK89/c0mqCywiUF/3fnXGA1Ppq50FGyENG/QtFbq35B D3IWmf9bWpQdPSGO+Ey8GpkS03NDEV5uao4hsMphjiGVenTLYB+7K/c3sMMnMWk9g/mK F7d5PeUuK592UiVW72V3Yd5a5DkVTnxfLF+6JXsTIjGD1qSDpFSKz4BYeJ17ogz/aqjB YRBrukTCeouev5tf/Cv3UBJ6lKVVqFgFa5PWdQbNyhwT6OaV8+MKe5MFBPH9S7ncrsk4 YGsw== X-Gm-Message-State: AOAM532TPfUltmDTT0vLblL6YD8saCVbH3e9Y0hwd7O+B40FZfGrpbnB 7feXyEQSf9SHfzjENq4bqXHtoqqTlBlsLg== X-Received: by 2002:a05:6000:1849:b0:219:be72:177e with SMTP id c9-20020a056000184900b00219be72177emr7743621wri.150.1654877275043; Fri, 10 Jun 2022 09:07:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bp11-20020a5d5a8b000000b0020c5253d926sm14276053wrb.114.2022.06.10.09.07.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 09:07:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/28] target/arm: Rename gen_exception to gen_exception_el Date: Fri, 10 Jun 2022 17:07:26 +0100 Message-Id: <20220610160738.2230762-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610160738.2230762-1-peter.maydell@linaro.org> References: <20220610160738.2230762-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220609202901.1177572-17-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index fc5eafaeeba..edb7d3f3944 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -1086,7 +1086,7 @@ static void gen_exception_internal_insn(DisasContext *s, uint32_t pc, int excp) s->base.is_jmp = DISAS_NORETURN; } -static void gen_exception(int excp, uint32_t syndrome, uint32_t target_el) +static void gen_exception_el(int excp, uint32_t syndrome, uint32_t target_el) { gen_helper_exception_with_syndrome_el(cpu_env, tcg_constant_i32(excp), tcg_constant_i32(syndrome), @@ -9758,16 +9758,16 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) switch (dc->base.is_jmp) { case DISAS_SWI: gen_ss_advance(dc); - gen_exception(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb), - default_exception_el(dc)); + gen_exception_el(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb), + default_exception_el(dc)); break; case DISAS_HVC: gen_ss_advance(dc); - gen_exception(EXCP_HVC, syn_aa32_hvc(dc->svc_imm), 2); + gen_exception_el(EXCP_HVC, syn_aa32_hvc(dc->svc_imm), 2); break; case DISAS_SMC: gen_ss_advance(dc); - gen_exception(EXCP_SMC, syn_aa32_smc(), 3); + gen_exception_el(EXCP_SMC, syn_aa32_smc(), 3); break; case DISAS_NEXT: case DISAS_TOO_MANY: @@ -9828,14 +9828,14 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) gen_helper_yield(cpu_env); break; case DISAS_SWI: - gen_exception(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb), - default_exception_el(dc)); + gen_exception_el(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb), + default_exception_el(dc)); break; case DISAS_HVC: - gen_exception(EXCP_HVC, syn_aa32_hvc(dc->svc_imm), 2); + gen_exception_el(EXCP_HVC, syn_aa32_hvc(dc->svc_imm), 2); break; case DISAS_SMC: - gen_exception(EXCP_SMC, syn_aa32_smc(), 3); + gen_exception_el(EXCP_SMC, syn_aa32_smc(), 3); break; } }