From nobody Fri Dec 19 17:42:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516593702250689.3307843882917; Sun, 21 Jan 2018 20:01:42 -0800 (PST) Received: from localhost ([::1]:41745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edTIh-0002eV-4J for importer@patchew.org; Sun, 21 Jan 2018 23:01:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edT0O-0005Td-Ia for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edT0N-0006Qj-Fb for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:44 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:40636) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edT0N-0006Pu-8q for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:43 -0500 Received: by mail-pf0-x244.google.com with SMTP id i66so6079449pfd.7 for ; Sun, 21 Jan 2018 19:42:43 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id z125sm182023pfz.27.2018.01.21.19.42.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 21 Jan 2018 19:42:41 -0800 (PST) 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=6DGOByGOx5XP7BAi95PSS2uJDFdBZDsbbkccAC9ToPA=; b=G2QCZ84h3B4pbsEWfrdnDsvmoAEI3f4gKuDYoZGjgQj8A3tqVyVyfPagCmmD9Y0T5C ySDRfziDt4vJoFIeCEjKCM8YbiiN9SFw4sOiWHNfCRUlAItuJRH2cPDG1ijOhHC3Pbew njjwUzMClV+j2i6FrH04PLXRxf18/3dNbNNCg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6DGOByGOx5XP7BAi95PSS2uJDFdBZDsbbkccAC9ToPA=; b=eWYH9JleemGbPHBSs5G5Fm+A9W6fsIL+a3TX4SM8dqOd6N6wu2noOGaT3FjA+PNmFL CWUjtEkoma98bi1WnKrpJqGm/D5kfoZeZprUtqd/pkGOPapTxybKfWq7Qc3PAZ+H+LUp CoewiTOKf15YEWZsky6zUEchSSKABM8htfdAgE7E/TNAkRrRyJ2DWrj9MwsrFg3C2Sq6 vJ3BIAQRxXJJf9bZrqB4RPXvYkf/qbPWrqM9rF/gaM7ldBsEzBQsy9CEtdlTyFfGwycx WFTEdP8IDaKjJKV4dhWdPhJEEiwDp1dJ4sBy5bUymUxUoGG/wiyGaizyb7Oup0/savwH yVyQ== X-Gm-Message-State: AKwxytfsZI75ck4DDp+SGh+mcFOmjr9XukPNOPeF86Xm0+hld90bCwlh KzjlyepprvqhIUB4n7lQvLC/Xsh3vtg= X-Google-Smtp-Source: AH8x224dvjp955AbJ0bxonQNE5c3HU9pgvmY5G4Vy+P73LjMin0U6UoW8YMOyaE1K71Bidi4Aq9vEg== X-Received: by 10.99.99.4 with SMTP id x4mr6278468pgb.453.1516592561905; Sun, 21 Jan 2018 19:42:41 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 21 Jan 2018 19:41:49 -0800 Message-Id: <20180122034217.19593-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180122034217.19593-1-richard.henderson@linaro.org> References: <20180122034217.19593-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PULL 15/43] target/hppa: Avoid privilege level decrease during branches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 These instructions force the destination privilege level of the branch destination to be no higher than current. Signed-off-by: Richard Henderson --- target/hppa/translate.c | 52 ++++++++++++++++++++++++++++++++++++++++++++-= ---- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 0650c3e14e..53974c994e 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -1851,6 +1851,40 @@ static DisasJumpType do_ibranch(DisasContext *ctx, T= CGv_reg dest, return DISAS_NEXT; } =20 +/* Implement + * if (IAOQ_Front{30..31} < GR[b]{30..31}) + * IAOQ_Next{30..31} =E2=86=90 GR[b]{30..31}; + * else + * IAOQ_Next{30..31} =E2=86=90 IAOQ_Front{30..31}; + * which keeps the privilege level from being increased. + */ +static TCGv_reg do_ibranch_priv(DisasContext *ctx, TCGv_reg offset) +{ +#ifdef CONFIG_USER_ONLY + return offset; +#else + TCGv_reg dest; + switch (ctx->privilege) { + case 0: + /* Privilege 0 is maximum and is allowed to decrease. */ + return offset; + case 3: + /* Privilege 3 is minimum and is never allowed increase. */ + dest =3D get_temp(ctx); + tcg_gen_ori_reg(dest, offset, 3); + break; + default: + dest =3D tcg_temp_new(); + tcg_gen_andi_reg(dest, offset, -4); + tcg_gen_ori_reg(dest, dest, ctx->privilege); + tcg_gen_movcond_reg(TCG_COND_GTU, dest, dest, offset, dest, offset= ); + tcg_temp_free(dest); + break; + } + return dest; +#endif +} + #ifdef CONFIG_USER_ONLY /* On Linux, page zero is normally marked execute only + gateway. Therefore normal read or write is supposed to fail, but specific @@ -3430,6 +3464,7 @@ static DisasJumpType trans_be(DisasContext *ctx, uint= 32_t insn, bool is_l) unsigned n =3D extract32(insn, 1, 1); unsigned b =3D extract32(insn, 21, 5); target_sreg disp =3D assemble_17(insn); + TCGv_reg tmp; =20 /* unsigned s =3D low_uextract(insn, 13, 3); */ /* ??? It seems like there should be a good way of using @@ -3438,16 +3473,19 @@ static DisasJumpType trans_be(DisasContext *ctx, ui= nt32_t insn, bool is_l) manage along side branch delay slots. Therefore we handle entry into the gateway page via absolute address. */ =20 +#ifdef CONFIG_USER_ONLY /* Since we don't implement spaces, just branch. Do notice the special case of "be disp(*,r0)" using a direct branch to disp, so that we c= an goto_tb to the TB containing the syscall. */ if (b =3D=3D 0) { return do_dbranch(ctx, disp, is_l ? 31 : 0, n); - } else { - TCGv_reg tmp =3D get_temp(ctx); - tcg_gen_addi_reg(tmp, load_gpr(ctx, b), disp); - return do_ibranch(ctx, tmp, is_l ? 31 : 0, n); } +#endif + + tmp =3D get_temp(ctx); + tcg_gen_addi_reg(tmp, load_gpr(ctx, b), disp); + tmp =3D do_ibranch_priv(ctx, tmp); + return do_ibranch(ctx, tmp, is_l ? 31 : 0, n); } =20 static DisasJumpType trans_bl(DisasContext *ctx, uint32_t insn, @@ -3479,6 +3517,7 @@ static DisasJumpType trans_blr(DisasContext *ctx, uin= t32_t insn, =20 tcg_gen_shli_reg(tmp, load_gpr(ctx, rx), 3); tcg_gen_addi_reg(tmp, tmp, ctx->iaoq_f + 8); + /* The computation here never changes privilege level. */ return do_ibranch(ctx, tmp, link, n); } =20 @@ -3497,6 +3536,7 @@ static DisasJumpType trans_bv(DisasContext *ctx, uint= 32_t insn, tcg_gen_shli_reg(dest, load_gpr(ctx, rx), 3); tcg_gen_add_reg(dest, dest, load_gpr(ctx, rb)); } + dest =3D do_ibranch_priv(ctx, dest); return do_ibranch(ctx, dest, 0, n); } =20 @@ -3506,8 +3546,10 @@ static DisasJumpType trans_bve(DisasContext *ctx, ui= nt32_t insn, unsigned n =3D extract32(insn, 1, 1); unsigned rb =3D extract32(insn, 21, 5); unsigned link =3D extract32(insn, 13, 1) ? 2 : 0; + TCGv_reg dest; =20 - return do_ibranch(ctx, load_gpr(ctx, rb), link, n); + dest =3D do_ibranch_priv(ctx, load_gpr(ctx, rb)); + return do_ibranch(ctx, dest, link, n); } =20 static const DisasInsn table_branch[] =3D { --=20 2.14.3