From patchwork Fri Jun 10 16:07:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580620 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp1904936max; Fri, 10 Jun 2022 09:34:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+DWm89ZbCkwNxU5QtK9lU6nEt9KRcj7/3rDuhySQPeIPwb0OV4dutukAAygIRl00l4Rs6 X-Received: by 2002:ad4:4ee5:0:b0:46d:f1:9d6c with SMTP id dv5-20020ad44ee5000000b0046d00f19d6cmr10078440qvb.87.1654878890956; Fri, 10 Jun 2022 09:34:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654878890; cv=none; d=google.com; s=arc-20160816; b=ZSqvkf9l032gNI5EQEcll67enOGt7PScapff4FjX5dTC2TjTlYz/mwOwpcC3opx0Ix sBPj5Aa4Za+SmZQK2IPWkO5Ai/9+qvOZMVCE0/hJclF+arx5eUQyd4mkjr4O2cVBHNlF HTiXobG+qUEAGc+gCSAYjOeWIo9kOudy6Pm8EY9NR1YMiyxVZL1zojHuW5pvFNPZww+y bfyV9Z/UaNdPNpfKzhsvQBBWe/+N9jFQ29d6s3esNYx7e/svAgiDnDWev5MZEcC5trwE 43uruuxpXXEtbdV2wkvqIkElRvSl7rGu5jvGgV0gFFOoqrbjsCAfukt/ACO/Qm4D9RYe 2dLQ== 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=0oScPFEaQR9vt1vNhOOVEHubvg87l9aIRvm/ApbcDyg=; b=CjVQajX9OrzwywPo6HX/MoRQq5K2x+sODLZFRIp+VifcmVZOzqpFajjgMSYGCpNzHP xFNUlWoQ2+EITy83GZ1udPxOk4LXBwPpOQ38Nz/6hnofMp4Fr49M56nGWt0cNyGSNOT5 xr0mT/V/9/+j7qwno0n/dAlFNiuAgHblq4c5QJgmTJnsjhcw+CyeYQ7tuiM/TLQ3JaXu dxsahaIB0s0GpVhW0jF/XIK8+0R8XfYtHdoiyMgbTAHWFYQNIp5ht8HWqw0PoeWUyvq9 b9HxzMguOSHYRsKN3TRcjomLdxS5UcxB5cThgsrIb+gE/cTeQHtEiykEqbrd1stCIXES F2GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="F9r43uo/"; 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 k4-20020a05620a142400b006a6ae522351si9545747qkj.663.2022.06.10.09.34.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Jun 2022 09:34:50 -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="F9r43uo/"; 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]:55374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzhb0-0007sS-I7 for patch@linaro.org; Fri, 10 Jun 2022 12:34:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzhB0-0007fK-Qr for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:07:59 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzhAy-0007GR-6T for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:07:58 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q15so29093511wrc.11 for ; Fri, 10 Jun 2022 09:07:54 -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=0oScPFEaQR9vt1vNhOOVEHubvg87l9aIRvm/ApbcDyg=; b=F9r43uo/SfrWzTnPiMb7wD7FYcviLVbszjJsbnVFid1VgVW9xImQhL6/z3S49x5EH2 j6rIIsE+dH+zu9VU2SdbcV9enV9j9q8JaA5p2DK+2PKtW1JxPLA1cRHWj2GyAp6eIE0s rg8EaZUU28Md0rTRdaMF8d//Xy8+914nvlAMJPIXqnavBJinfZrL9YpKv0NxqtSLniD1 pQae6GBJmLPqmyv93+F9yA3SRKkkrqknAmiL0/luX+MrYD5O8ndBBeWKtBDIzVoujhh2 HOOEfztbtMhM0UBvbq2hynA95EUJVPEgvwjRhndi0ZnfkjFG38M82z39mjvgCHTnfdLt KmHQ== 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=0oScPFEaQR9vt1vNhOOVEHubvg87l9aIRvm/ApbcDyg=; b=zxbDhoZfiXxM+fHjNHp+nPr9CLYeXycus3i9ZvxuVLfpE3QEGq/ldi9IrwPx9pAhLD yICBtriHJuiMrbOK1dfP0xGa6fI6Ohca7YoLtSThd71vDk2yajIsDahXNPqqNKq0XHl1 hTdGYZjAgvS6nsf8atXca8ttNG33qxuGcgjbmTh0hmV3agCIdf3jei9V5LoM0plompAt b1wrG/aSjex9oF1l74yfHO6BG4Pc4VuQKDpAo3Kb/ZfNS0hrVcE5B+KFnu8GJ9zyLjOz sT8cOA7ew0QFSJ8eZKPeKYXEh7tPbX2iYHFjTHghciE+9/q2S5ZUtYjIMc1SRSGYwsge 6i4w== X-Gm-Message-State: AOAM531ojJQJmwWUx2vAEueGDaf9fGR11UBtbM/DrJ3ikiCQH6BHg6sQ NJ61xciM0TEhDVkTWZCuc14RGm0yY1BNAQ== X-Received: by 2002:adf:ef01:0:b0:20a:8068:ca5e with SMTP id e1-20020adfef01000000b0020a8068ca5emr44088869wro.661.1654877273561; Fri, 10 Jun 2022 09:07:53 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 09:07:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/28] target/arm: Remove TBFLAG_ANY.DEBUG_TARGET_EL Date: Fri, 10 Jun 2022 17:07:24 +0100 Message-Id: <20220610160738.2230762-15-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::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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 We no longer need this value during translation, as it is now handled within the helpers. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220609202901.1177572-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 6 ++---- target/arm/translate.h | 2 -- target/arm/helper.c | 12 ++---------- target/arm/translate-a64.c | 1 - target/arm/translate.c | 1 - 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 50b5a9c9fd0..719613ad9ee 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3104,11 +3104,9 @@ FIELD(TBFLAG_ANY, BE_DATA, 3, 1) FIELD(TBFLAG_ANY, MMUIDX, 4, 4) /* Target EL if we take a floating-point-disabled exception */ FIELD(TBFLAG_ANY, FPEXC_EL, 8, 2) -/* For A-profile only, target EL for debug exceptions. */ -FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 10, 2) /* Memory operations require alignment: SCTLR_ELx.A or CCR.UNALIGN_TRP */ -FIELD(TBFLAG_ANY, ALIGN_MEM, 12, 1) -FIELD(TBFLAG_ANY, PSTATE__IL, 13, 1) +FIELD(TBFLAG_ANY, ALIGN_MEM, 10, 1) +FIELD(TBFLAG_ANY, PSTATE__IL, 11, 1) /* * Bit usage when in AArch32 state, both A- and M-profile. diff --git a/target/arm/translate.h b/target/arm/translate.h index 890e73194c3..8685f55e800 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -59,8 +59,6 @@ typedef struct DisasContext { */ uint32_t svc_imm; int current_el; - /* Debug target exception level for single-step exceptions */ - int debug_target_el; GHashTable *cp_regs; uint64_t features; /* CPU features bits */ bool aarch64; diff --git a/target/arm/helper.c b/target/arm/helper.c index ac9942d750d..2b2c1998fd1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11102,18 +11102,10 @@ static CPUARMTBFlags rebuild_hflags_m32(CPUARMState *env, int fp_el, return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } -static CPUARMTBFlags rebuild_hflags_aprofile(CPUARMState *env) -{ - CPUARMTBFlags flags = {}; - - DP_TBFLAG_ANY(flags, DEBUG_TARGET_EL, arm_debug_target_el(env)); - return flags; -} - static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - CPUARMTBFlags flags = rebuild_hflags_aprofile(env); + CPUARMTBFlags flags = {}; int el = arm_current_el(env); if (arm_sctlr(env, el) & SCTLR_A) { @@ -11139,7 +11131,7 @@ static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *env, int fp_el, static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { - CPUARMTBFlags flags = rebuild_hflags_aprofile(env); + CPUARMTBFlags flags = {}; ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; uint64_t sctlr; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 0581118f566..4f6181a5483 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14645,7 +14645,6 @@ static void aarch64_tr_init_disas_context(DisasContextBase *dcbase, dc->ss_active = EX_TBFLAG_ANY(tb_flags, SS_ACTIVE); dc->pstate_ss = EX_TBFLAG_ANY(tb_flags, PSTATE__SS); dc->is_ldex = false; - dc->debug_target_el = EX_TBFLAG_ANY(tb_flags, DEBUG_TARGET_EL); /* Bound the number of insns to execute to those left on the page. */ bound = -(dc->base.pc_first | TARGET_PAGE_MASK) / 4; diff --git a/target/arm/translate.c b/target/arm/translate.c index c7d422b5415..b8a8972bac9 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9350,7 +9350,6 @@ static void arm_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) dc->v7m_lspact = EX_TBFLAG_M32(tb_flags, LSPACT); dc->mve_no_pred = EX_TBFLAG_M32(tb_flags, MVE_NO_PRED); } else { - dc->debug_target_el = EX_TBFLAG_ANY(tb_flags, DEBUG_TARGET_EL); dc->sctlr_b = EX_TBFLAG_A32(tb_flags, SCTLR__B); dc->hstr_active = EX_TBFLAG_A32(tb_flags, HSTR_ACTIVE); dc->ns = EX_TBFLAG_A32(tb_flags, NS);