From patchwork Mon Jan 22 03:41:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 125311 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp948778ljf; Sun, 21 Jan 2018 20:02:41 -0800 (PST) X-Google-Smtp-Source: AH8x225+zgPMzCMfIweoEwWxz2T8GAT7AwNwvI7evnldNbBuxit5aA1n6QSBLXDFzg8XnBodjc+C X-Received: by 10.129.228.76 with SMTP id t12mr6018273ywl.257.1516593761604; Sun, 21 Jan 2018 20:02:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516593761; cv=none; d=google.com; s=arc-20160816; b=Ir0Qkm00mr1C8G4bcbYG8YBjH6Bl1R2hlBs8XvErI7SZeuDtcg1PwioM2jM4m+gJBx NtekB1yL4iq68dECWGD7lYmkjheA2pBnUI+RA0NiknglEdSo4dW/qmMnMxxyQ/q99EMN 0QuQzYmUGjpfRs8Ymuh/x1Tz9YVYnTdvpL2AxzrO9w7vgd0SzRJFqWDHXngSMvJOq8/E TF4WJ2hKYuWPnNkaSClHfkg0cPqp/rLNzSH6rR1Wtp7ufweDLDjE1tIoXf7UrEbSvU1J B7n1ktbKR3PAs5yijjJJkh97z/nkKPnbWVBpO5GRs+pB0RC//ERbO1jm07tDFI6ylcrr mKEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=6DGOByGOx5XP7BAi95PSS2uJDFdBZDsbbkccAC9ToPA=; b=Dk4hqQKssbqHgDVehymPGjYLV7U172vKSH8RVeUMw/3RHz5TLCWgoPH+/IQsaeu2/0 n7zPF01lMAvCs4ARMb7tqSqxGMBKwObE5Mw49rFxINEFG5nXBEd8sNShQZymg2gOWuQZ fO4auj3sIozTULKNNy9i9Zxa5iG2aECpPUinvniR/U1dfcot4nCvFUENYlGArPiFMUBr Ps+PMoIuphY6Gj1cbU4CHktcGn8UHjxfd1XePJ9UAmPCP3HuxAFxhBHMW0IYHxE9f6jO uklIuZr6RxZM1NMSqbVEp3jTA7dz8emCRVkd/HcEVdrzP+MmvJzGlSlUk2XCbTMusiNq 843Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=G2QCZ84h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k124si779816ywb.556.2018.01.21.20.02.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 21 Jan 2018 20:02:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=G2QCZ84h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edTJg-0002eV-Vl for patch@linaro.org; Sun, 21 Jan 2018 23:02:41 -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) 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-Received: by 10.99.99.4 with SMTP id x4mr6278468pgb.453.1516592561905; Sun, 21 Jan 2018 19:42:41 -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) 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.14.3 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, TCGv_reg dest, return DISAS_NEXT; } +/* Implement + * if (IAOQ_Front{30..31} < GR[b]{30..31}) + * IAOQ_Next{30..31} ← GR[b]{30..31}; + * else + * IAOQ_Next{30..31} ← 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 = get_temp(ctx); + tcg_gen_ori_reg(dest, offset, 3); + break; + default: + dest = 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, uint32_t insn, bool is_l) unsigned n = extract32(insn, 1, 1); unsigned b = extract32(insn, 21, 5); target_sreg disp = assemble_17(insn); + TCGv_reg tmp; /* unsigned s = 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, uint32_t insn, bool is_l) manage along side branch delay slots. Therefore we handle entry into the gateway page via absolute address. */ +#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 can goto_tb to the TB containing the syscall. */ if (b == 0) { return do_dbranch(ctx, disp, is_l ? 31 : 0, n); - } else { - TCGv_reg tmp = 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 = get_temp(ctx); + tcg_gen_addi_reg(tmp, load_gpr(ctx, b), disp); + tmp = do_ibranch_priv(ctx, tmp); + return do_ibranch(ctx, tmp, is_l ? 31 : 0, n); } static DisasJumpType trans_bl(DisasContext *ctx, uint32_t insn, @@ -3479,6 +3517,7 @@ static DisasJumpType trans_blr(DisasContext *ctx, uint32_t insn, 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); } @@ -3497,6 +3536,7 @@ static DisasJumpType trans_bv(DisasContext *ctx, uint32_t insn, tcg_gen_shli_reg(dest, load_gpr(ctx, rx), 3); tcg_gen_add_reg(dest, dest, load_gpr(ctx, rb)); } + dest = do_ibranch_priv(ctx, dest); return do_ibranch(ctx, dest, 0, n); } @@ -3506,8 +3546,10 @@ static DisasJumpType trans_bve(DisasContext *ctx, uint32_t insn, unsigned n = extract32(insn, 1, 1); unsigned rb = extract32(insn, 21, 5); unsigned link = extract32(insn, 13, 1) ? 2 : 0; + TCGv_reg dest; - return do_ibranch(ctx, load_gpr(ctx, rb), link, n); + dest = do_ibranch_priv(ctx, load_gpr(ctx, rb)); + return do_ibranch(ctx, dest, link, n); } static const DisasInsn table_branch[] = {