From nobody Mon Feb 9 07:43:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1629137152; cv=none; d=zohomail.com; s=zohoarc; b=lCVK4XzMNxiFGZWtNDaSRRuU6nHKQCvQi0T+SQr8sHcIIa1MetPrgyxl1p6rbYgRTFndgymcvrC4m1yDaOSkmiyK6lLQX4esBPzrLF76LuNdVYh9KbkMfepdrcfXUIbcB7GiWa8Qye8yyesz8xielc4Otof0JaT1BUlYKZtkU2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629137152; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8Cu4H8n9Z1bc76Lx0NocvUz9gleAslEdWynQ2KHVsWo=; b=evIW0IR7PzvcTFNcFGjf/CIP7NvC/rrx1KFQeMhRBsZF0IJeMhwEz9EdxbiklpEvZ/GfXP7jA9HGNrLDyOu4gy1leqgOttvGj/vdK/CpoSM9nDTrIc1JKUT4XXNhA/5vwMOSCf0jKhRofWc1qatcFGPyfAC4iFDoBzGYNeJ7b/4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162913715221152.66458115386342; Mon, 16 Aug 2021 11:05:52 -0700 (PDT) Received: from localhost ([::1]:57010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFgze-0006FA-TT for importer@patchew.org; Mon, 16 Aug 2021 14:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFgx6-0002dd-Ni for qemu-devel@nongnu.org; Mon, 16 Aug 2021 14:03:12 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFgx3-0004bw-TJ for qemu-devel@nongnu.org; Mon, 16 Aug 2021 14:03:12 -0400 Received: by mail-wr1-x42e.google.com with SMTP id q11so24811654wrr.9 for ; Mon, 16 Aug 2021 11:03:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u16sm240053wmc.41.2021.08.16.11.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 11:03:08 -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=8Cu4H8n9Z1bc76Lx0NocvUz9gleAslEdWynQ2KHVsWo=; b=JuJWEkKamTZxqZjmhAUVX2NKvw3HcOB/kG2ZCrkRpzrh959b95acSMH5yx6AXEV1Dx d1pRdLNLkRmdatGBD+R6tpHhVsfICQgzELoKKYCqilVHFjV4oDku8QiNZC/sAt9hEq9d 0arj0tsroNk/xE50+ltZZNMqPRtK61yczefRjHASGdI8n4+escw+dob8LPVF3x+GFv52 ym/nG+WnpesuH32v4gU9MIPxf+D0uOQLTHDEszGKtnuEu5bxnaqcsSrlMScKpge4cBq8 nP/jKaQ/yRmOChvYrjItrcZ9BKcDceS1qJeRQ/t5aCwct9CUiGLLWPmimWDxPLIIpbPx KMwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Cu4H8n9Z1bc76Lx0NocvUz9gleAslEdWynQ2KHVsWo=; b=XiisBEU3G8uDfG31ebqdGppGWWDR7nE34WGeccvSE939rjJTXtvxTQWM9FtGQIpYNf XOFNS+JvjPbJwIUn7yGnnD32BqOI7KagetAgmuoPkHa24fNzlrgDOnsz6iYxhPL8UOyg pOV8L3wKxgKa2guaXaE5nv/03194z+uK/qWonbKQlUIdM/PiD0cLJwv95U72WxIpm1QW lIXEfBny/UQndzvwvJsF03lZ25MgShNy33n24AbIb7RTFJbRGCtCeoCn26aqTVoRrdYO qbCwBE2O3YfU6ClwwwNZ+8UQiYf+L86ByCn7tdHpBiSpn9leKaAw3d4gPnNdKYgD76qk /1Cw== X-Gm-Message-State: AOAM532l5IX5uE7u+23adQDDaxFhuXdcUsAB5KixkY41gCe69f+LV5bj +/1Wn81XsMzPxj5fjd179TRY1+UTjiXS9g== X-Google-Smtp-Source: ABdhPJwAVEP5+yGqsSGpd1S/i5kd1VKtSFTKPb/uu/mscdzyDYbABgCnxNOxox//XUMP+/FQBPq4TA== X-Received: by 2002:a5d:67c6:: with SMTP id n6mr7646400wrw.150.1629136988403; Mon, 16 Aug 2021 11:03:08 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] target/arm: Implement HSTR.TTEE Date: Mon, 16 Aug 2021 19:03:04 +0100 Message-Id: <20210816180305.20137-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210816180305.20137-1-peter.maydell@linaro.org> References: <20210816180305.20137-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1629137154020100001 Content-Type: text/plain; charset="utf-8" In v7, the HSTR register has a TTEE bit which allows EL0/EL1 accesses to the Thumb2EE TEECR and TEEHBR registers to be trapped to the hypervisor. Implement these traps. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/cpu.h | 2 ++ target/arm/helper.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 9f0a5f84d50..cf3c90f768a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1536,6 +1536,8 @@ static inline void xpsr_write(CPUARMState *env, uint3= 2_t val, uint32_t mask) #define SCR_ENSCXT (1U << 25) #define SCR_ATA (1U << 26) =20 +#define HSTR_TTEE (1 << 16) + /* Return the current FPSCR value. */ uint32_t vfp_get_fpscr(CPUARMState *env); void vfp_set_fpscr(CPUARMState *env, uint32_t val); diff --git a/target/arm/helper.c b/target/arm/helper.c index 155d8bf2399..262e787f690 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2446,20 +2446,34 @@ static void teecr_write(CPUARMState *env, const ARM= CPRegInfo *ri, env->teecr =3D value; } =20 +static CPAccessResult teecr_access(CPUARMState *env, const ARMCPRegInfo *r= i, + bool isread) +{ + /* + * HSTR.TTEE only exists in v7A, not v8A, but v8A doesn't have T2EE + * at all, so we don't need to check whether we're v8A. + */ + if (arm_current_el(env) < 2 && !arm_is_secure_below_el3(env) && + (env->cp15.hstr_el2 & HSTR_TTEE)) { + return CP_ACCESS_TRAP_EL2; + } + return CP_ACCESS_OK; +} + static CPAccessResult teehbr_access(CPUARMState *env, const ARMCPRegInfo *= ri, bool isread) { if (arm_current_el(env) =3D=3D 0 && (env->teecr & 1)) { return CP_ACCESS_TRAP; } - return CP_ACCESS_OK; + return teecr_access(env, ri, isread); } =20 static const ARMCPRegInfo t2ee_cp_reginfo[] =3D { { .name =3D "TEECR", .cp =3D 14, .crn =3D 0, .crm =3D 0, .opc1 =3D 6, = .opc2 =3D 0, .access =3D PL1_RW, .fieldoffset =3D offsetof(CPUARMState, teecr), .resetvalue =3D 0, - .writefn =3D teecr_write }, + .writefn =3D teecr_write, .accessfn =3D teecr_access }, { .name =3D "TEEHBR", .cp =3D 14, .crn =3D 1, .crm =3D 0, .opc1 =3D 6,= .opc2 =3D 0, .access =3D PL0_RW, .fieldoffset =3D offsetof(CPUARMState, teehbr), .accessfn =3D teehbr_access, .resetvalue =3D 0 }, --=20 2.20.1 From nobody Mon Feb 9 07:43:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1629137221; cv=none; d=zohomail.com; s=zohoarc; b=lNk+W4jDXq7S9ciDCwiCV2Yw609abH651gGRY1Y1duDdZs3+JjI7WzeqO7rEC3XPk91TQN3YAyrdMaDfVnHhhufM3L8/gp6euvy/IhUhQbz9Blx7HUK6esuM4B/r01fOl2A6vuvRqchgdYLQ/dOvcgUcdox5H+yx4Q9Nk8RyMPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629137221; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YmPi2qilJJvDJ3O0NVJdAsYq7QQh55dLDlkm9RLnuTU=; b=TlB/faElu4/7Uuax6K89xfpI+ZvYowl54cMSGfT0gb4pV9EJOdcwrbITuPyHEO5Pm0F3P8i5nBBlM+SffhpSQMM1XZkTDMQGmozXVyIX+MdSb2NSc6INr51Ja8GEDSKzT4jR+7qjWPNm2ro0elsmVBPiu2Y7OrJEQt3zbTIdQp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629137221404999.5908095307547; Mon, 16 Aug 2021 11:07:01 -0700 (PDT) Received: from localhost ([::1]:59196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFh0m-0007mt-BU for importer@patchew.org; Mon, 16 Aug 2021 14:07:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFgx8-0002hp-82 for qemu-devel@nongnu.org; Mon, 16 Aug 2021 14:03:14 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFgx4-0004cD-Ow for qemu-devel@nongnu.org; Mon, 16 Aug 2021 14:03:14 -0400 Received: by mail-wr1-x42d.google.com with SMTP id v4so17694430wro.12 for ; Mon, 16 Aug 2021 11:03:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u16sm240053wmc.41.2021.08.16.11.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 11:03:08 -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=YmPi2qilJJvDJ3O0NVJdAsYq7QQh55dLDlkm9RLnuTU=; b=EOywpDv+/vlm8XMF4r/AD0WAksYJFjQkVcOBaO0UZQ3xMg0tp8eZshtsxb2uX+6Ymy De2i0ofSYCteQhnMR/I3jgEOHXkPCc/h0kY/AaDd3bIkl6Qjt0BR661Z4fu2Au4pnepc bOR80eaVOQVAd//oRMLGKAOpT5zHkZSLrfraUlMYjszCWfEhJeet9bsCOpw6lNX4YARE 3JpDQezU07dIatd6nfuuOMJfnskGkf5TTqHnZRYOuNVtpi/I6JBGh8GV3SjomlSJ6Mu/ jgYkLlbB3ChVVFT577egnd9jjBmy1P4sV7Ro3aNxR96R3xEi2HgShvi+i9dAqecIfnoO t6HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YmPi2qilJJvDJ3O0NVJdAsYq7QQh55dLDlkm9RLnuTU=; b=DjRzD39MheZ3tgnjfShNf44z2Hqk8eECs90nYZZrjKBzxfx/gtOxqaktieKXpZGOCm 2ncJwtR+2ahZgEZVuzOR5w2Gh4/wlasV98qVW0USLf4QcMTE+HyflME9BCSUBXJLFcS5 GFS5H9R5PsNdcj5WAiaW02AWIlBBVKmj69bMgUpQ5E8JZAiet5GLwFqBBcDGOtAMVMz9 JOAjH/m882sPZTs6RhBCcRCBcFsRgEIEYX+AFTjYlyAv52cfuP92IgsD3ug/9Iv1FiNe edk1c9mQ+9Ry/hgEckVIeL1Q4NDLf7Hjax95Tt/ZWFqXiPxJip1eosJFuC36vh/SFJWM TSGw== X-Gm-Message-State: AOAM531qiG6BhBz/ZA7j0Q29I8ej45YpncEqL/87hNFmq33YkJ/A72n2 dZrxgQ8hHBci02Uqkj0duDz1fVXYwX05yw== X-Google-Smtp-Source: ABdhPJzEB35g0jONhtC2WLvr/XiwsNR12zRUZY8a/rmwrH927OLkHTxIbCp/rZEk96wYsS91D0eRxw== X-Received: by 2002:a5d:51cb:: with SMTP id n11mr11707058wrv.221.1629136989237; Mon, 16 Aug 2021 11:03:09 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/2] target/arm: Implement HSTR.TJDBX Date: Mon, 16 Aug 2021 19:03:05 +0100 Message-Id: <20210816180305.20137-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210816180305.20137-1-peter.maydell@linaro.org> References: <20210816180305.20137-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1629137224064100001 Content-Type: text/plain; charset="utf-8" In v7A, the HSTR register has a TJDBX bit which traps NS EL0/EL1 access to the JOSCR and JMCR trivial Jazelle registers, and also BXJ. Implement these traps. In v8A this HSTR bit doesn't exist, so don't trap for v8A CPUs. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/cpu.h | 1 + target/arm/helper.h | 2 ++ target/arm/syndrome.h | 7 +++++++ target/arm/helper.c | 17 +++++++++++++++++ target/arm/op_helper.c | 16 ++++++++++++++++ target/arm/translate.c | 12 ++++++++++++ 6 files changed, 55 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index cf3c90f768a..fe47a652e3f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1537,6 +1537,7 @@ static inline void xpsr_write(CPUARMState *env, uint3= 2_t val, uint32_t mask) #define SCR_ATA (1U << 26) =20 #define HSTR_TTEE (1 << 16) +#define HSTR_TJDBX (1 << 17) =20 /* Return the current FPSCR value. */ uint32_t vfp_get_fpscr(CPUARMState *env); diff --git a/target/arm/helper.h b/target/arm/helper.h index 248569b0cd8..b2050d41755 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -73,6 +73,8 @@ DEF_HELPER_2(v7m_vlldm, void, env, i32) =20 DEF_HELPER_2(v8m_stackcheck, void, env, i32) =20 +DEF_HELPER_FLAGS_2(check_bxj_trap, TCG_CALL_NO_WG, void, env, i32) + DEF_HELPER_4(access_check_cp_reg, void, env, ptr, i32, i32) DEF_HELPER_3(set_cp_reg, void, env, ptr, i32) DEF_HELPER_2(get_cp_reg, i32, env, ptr) diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h index 39a31260f2d..8dd88a0cb17 100644 --- a/target/arm/syndrome.h +++ b/target/arm/syndrome.h @@ -36,6 +36,7 @@ enum arm_exception_class { EC_ADVSIMDFPACCESSTRAP =3D 0x07, EC_FPIDTRAP =3D 0x08, EC_PACTRAP =3D 0x09, + EC_BXJTRAP =3D 0x0a, EC_CP14RRTTRAP =3D 0x0c, EC_BTITRAP =3D 0x0d, EC_ILLEGALSTATE =3D 0x0e, @@ -215,6 +216,12 @@ static inline uint32_t syn_btitrap(int btype) return (EC_BTITRAP << ARM_EL_EC_SHIFT) | btype; } =20 +static inline uint32_t syn_bxjtrap(int cv, int cond, int rm) +{ + return (EC_BXJTRAP << ARM_EL_EC_SHIFT) | ARM_EL_IL | + (cv << 24) | (cond << 20) | rm; +} + static inline uint32_t syn_insn_abort(int same_el, int ea, int s1ptw, int = fsc) { return (EC_INSNABORT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) diff --git a/target/arm/helper.c b/target/arm/helper.c index 262e787f690..97a971bebdb 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7602,6 +7602,21 @@ static CPAccessResult access_jazelle(CPUARMState *en= v, const ARMCPRegInfo *ri, return CP_ACCESS_OK; } =20 +static CPAccessResult access_joscr_jmcr(CPUARMState *env, + const ARMCPRegInfo *ri, bool isrea= d) +{ + /* + * HSTR.TJDBX traps JOSCR and JMCR accesses, but it exists only + * in v7A, not in v8A. + */ + if (!arm_feature(env, ARM_FEATURE_V8) && + arm_current_el(env) < 2 && !arm_is_secure_below_el3(env) && + (env->cp15.hstr_el2 & HSTR_TJDBX)) { + return CP_ACCESS_TRAP_EL2; + } + return CP_ACCESS_OK; +} + static const ARMCPRegInfo jazelle_regs[] =3D { { .name =3D "JIDR", .cp =3D 14, .crn =3D 0, .crm =3D 0, .opc1 =3D 7, .opc2 =3D 0, @@ -7609,9 +7624,11 @@ static const ARMCPRegInfo jazelle_regs[] =3D { .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, { .name =3D "JOSCR", .cp =3D 14, .crn =3D 1, .crm =3D 0, .opc1 =3D 7, .opc2 =3D 0, + .accessfn =3D access_joscr_jmcr, .access =3D PL1_RW, .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, { .name =3D "JMCR", .cp =3D 14, .crn =3D 2, .crm =3D 0, .opc1 =3D 7, .opc2 =3D 0, + .accessfn =3D access_joscr_jmcr, .access =3D PL1_RW, .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, REGINFO_SENTINEL }; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index e98fd863057..70b42b55fd0 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -224,6 +224,22 @@ void HELPER(setend)(CPUARMState *env) arm_rebuild_hflags(env); } =20 +void HELPER(check_bxj_trap)(CPUARMState *env, uint32_t rm) +{ + /* + * Only called if in NS EL0 or EL1 for a BXJ for a v7A CPU; + * check if HSTR.TJDBX means we need to trap to EL2. + */ + if (env->cp15.hstr_el2 & HSTR_TJDBX) { + /* + * We know the condition code check passed, so take the IMPDEF + * choice to always report CV=3D1 COND 0xe + */ + uint32_t syn =3D syn_bxjtrap(1, 0xe, rm); + raise_exception_ra(env, EXCP_HYP_TRAP, syn, 2, GETPC()); + } +} + #ifndef CONFIG_USER_ONLY /* Function checks whether WFx (WFI/WFE) instructions are set up to be tra= pped. * The function returns the target EL (1-3) if the instruction is to be tr= apped; diff --git a/target/arm/translate.c b/target/arm/translate.c index 80c282669f0..80eb1b7eae9 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -6440,6 +6440,18 @@ static bool trans_BXJ(DisasContext *s, arg_BXJ *a) if (!ENABLE_ARCH_5J || arm_dc_feature(s, ARM_FEATURE_M)) { return false; } + /* + * v7A allows BXJ to be trapped via HSTR.TJDBX. We don't waste a + * TBFLAGS bit on a basically-never-happens case, so call a helper + * function to check for the trap and raise the exception if needed + * (passing it the register number for the syndrome value). + * v8A doesn't have this HSTR bit. + */ + if (!arm_dc_feature(s, ARM_FEATURE_V8) && + arm_dc_feature(s, ARM_FEATURE_EL2) && + s->current_el < 2 && s->ns) { + gen_helper_check_bxj_trap(cpu_env, tcg_constant_i32(a->rm)); + } /* Trivial implementation equivalent to bx. */ gen_bx(s, load_reg(s, a->rm)); return true; --=20 2.20.1