From patchwork Tue Mar 12 16:18:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160124 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13312470jad; Tue, 12 Mar 2019 09:38:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJzYEPEeAuK1FMuG1Qtb3j89t7/Qa1Xilpw2dyurJOBBfIvPD0gGBck7J1snsY7wWsUz7X X-Received: by 2002:a81:a1d0:: with SMTP id y199mr5250208ywg.246.1552408686698; Tue, 12 Mar 2019 09:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408686; cv=none; d=google.com; s=arc-20160816; b=R3kX4wYD8VrVlutM28G0lmHZ6stpAW7Q+I35dPvpIKC0RAKle+FumuX55n7AMk9anz NRSX1Ys+AkDL70k4kW88e7p3JWFU7h7RYpiuZ2CFhTqVFmG4y4faMbl0Pjcd5s2LszmA 1Oicy3AjeV2mqLIWPCfy4xqciguS4QtSVgzMCnJ8ROAquETEFkXFezb7EWozP0Gt0EpV OISHNf4/xMw9/CZmzz2o3pCJZI7pD4EoZKA9Fp8sAqXvkBGvLOPyYXjNLrLcTclzvmWp 7oD6vj6ISmL0C4sQRRmBBwlrolIpFHC4gvun36CSr4OjrIt2rKfWs/eeuhX15/CRWcM9 kuEg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=eKdJsAp5WaEF3EySWxuA0BaWi1vRHTXw6KMMMazuThvX3vzo7gCTuy/mI2PIyN+K5h 1DS3j/GSiRg7CU94n35EMSRTaHrC8jNru3X+UxoeB28TYBzj3XEs7iYGDajVqjpFK3jW s5Ly1gRsmmK15Sp+hqWlahxbAe+vPGDKBISx/cmUMnSb3Ql3nfNd865i/OK6xXGaZq1t PoK8Cxo3mDx0Ia3URmLDsDgFz39QB5q9uC+c70poeiR/j4Puqgtret4w97+WxFAaUmyS EuIBMfvKLTlOe5H+FMVyt+2zXu6ObAGk1i7gaTPhnjpCuaDrnAEgbum3lWevS44AQg7d hBVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hz7BuSj1; 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=fail (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 i130si5187557yba.322.2019.03.12.09.38.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:38:06 -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=fail header.i=@linaro.org header.s=google header.b=Hz7BuSj1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kPm-0004Xd-5w for patch@linaro.org; Tue, 12 Mar 2019 12:38:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7V-0005th-8g for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7T-0003qQ-1W for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:13 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:34666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7S-0003oW-Ph for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:10 -0400 Received: by mail-pg1-x531.google.com with SMTP id v12so2217069pgq.1 for ; Tue, 12 Mar 2019 09:19:10 -0700 (PDT) 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; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=Hz7BuSj1ETnnWLFkFuE8Q6Cc5ZCkoYv2pEPaLT0TSeu3OxQABoRMZBdg289zxEph+N bXN3UOiFBTNeBaMVJ969C6gDl94vL0wgUqFCfLPrOWYU3JeDCsfzJPHI4noixGcTEsSB yy9ot4Ckc/QUGRUfZDPn/fI/hvcfypO2u02h89nbKy3xt/61LXU/GmiYXOix+OL9rM50 BkS00zfB9CMivQZRb6AA/1DzyJG6Gge6xAdfEwoXWZMahBPsFvCj35TiOKTgU2y/xhNM 5hhsIdn9zNXTKtnzm3PxEPTe8rsuzpquTapTyyrQGo6yhQNgfmlosJe1JK+zBoxJErOE Ulhg== 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; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=BX2P1JKdnLzdHKXY1wGhNYVHehtC7/GQShNpZg76f6UvR38Fqe/8oDgJc9f51EEwVC xydBGKGRv2QE5gz9IPyoJIV4Cw6VKx/6eOC+7P7JR51e0lKlIMUirkLM/oFUfiChq1aK WV3NKPbA/lVo/10lJu/vRuzLaNKCcIa58kr/d1D3M+rcF2CIODkn2hB4NLRZgGm21DQZ dWVYWiZtkYPywbaXPJwZGuYhpTSEJrFDZB9tgB85A1xVAUBWbLk/FLJ4vL6386WLpkZT tmbA6PcNBYmUyI0v9ft6PzLIxtMwP+UFIasYATP5ldwAxCQIuIogeK1PSirIQavby0rh 33Rg== X-Gm-Message-State: APjAAAXy8QeOlghDFjeZAi9O8vpa3lw4bHmpyebgcaL+muQTzq7Q24Ed IlD4tMxB2QiLuQ9WMCPhSqSAKJPVpSo= X-Received: by 2002:a63:7843:: with SMTP id t64mr35859422pgc.178.1552407549191; Tue, 12 Mar 2019 09:19:09 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:54 -0700 Message-Id: <20190312161904.31130-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::531 Subject: [Qemu-devel] [PULL 01/11] target/hppa: Check for page crossings in use_goto_tb 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" We got away with eliding this check when target/hppa was user-only, but missed adding this check when adding system support. Fixes an early crash in the HP-UX 11 installer. Reported-by: Sven Schnelle Signed-off-by: Richard Henderson --- target/hppa/translate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index dc5636fe94..6c815e05c2 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -816,12 +816,10 @@ static bool gen_illegal(DisasContext *ctx) static bool use_goto_tb(DisasContext *ctx, target_ureg dest) { - /* Suppress goto_tb in the case of single-steping and IO. */ - if ((tb_cflags(ctx->base.tb) & CF_LAST_IO) - || ctx->base.singlestep_enabled) { - return false; - } - return true; + /* Suppress goto_tb for page crossing, IO, or single-steping. */ + return !(((ctx->base.pc_first ^ dest) & TARGET_PAGE_MASK) + || (tb_cflags(ctx->base.tb) & CF_LAST_IO) + || ctx->base.singlestep_enabled); } /* If the next insn is to be nullified, and it's on the same page, From patchwork Tue Mar 12 16:18:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160128 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13315198jad; Tue, 12 Mar 2019 09:40:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqyo4SdFrIVE6OH1k5AzVtIZso+TsK40OyJJfukPCh4xq6ZIowkF5886kQ58m/fClZjGT9Bi X-Received: by 2002:a25:7ac1:: with SMTP id v184mr16327770ybc.348.1552408859275; Tue, 12 Mar 2019 09:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408859; cv=none; d=google.com; s=arc-20160816; b=Vb+o0/K0VGFY0Mz/qbZocYP0GM+683T2AIJL0rLNijUe9C5pWnh+Sm808Asp/Cd2ml mrYmUjVUZyRHytuEqFgylGM6JjkLgkfwDqBQD5hUFw8G2tPGK77+I5WFUoelCqb2vrqI 4cVs3LX4hUOUXeBRBQHYFDDZaaH88UgaDOx7j9fk8IlUg/SmgYToFjdtrqv3GlbDZxNP J6L6KOZXlTk69C2hE7UgqAa/mg8ZI50EbXqPZY9PE7H3HGsLEV9D3HUaaYK/PmbFLJxL ieqvthxS1sh3H0uz4QirmBCpnZ55GQvJwapYNiEJvBmVcaubkz5ysr1pP11KfpwhrVt1 JneQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=lgmFLWb2AoBtsnhfwAW1Z+5LTMVI/a7+ZtnRExYBsYY=; b=f+Q9CauXvXQ1cBm649siLYruWwSdml161y8gB4BufBtDto1Q5pVVx3P5G/kYUDtWYu JP4QjXvcEgQNKaa5qg3s5dcivLP+MD2xhIhT5LP2fKM3iLgpwBVJTeebAk8nbW0CC/M+ L36uoglnuKgFZIzL0f9KOLqnJ/VZ5wTxsjCsVCmLCGEbf6cqDTlGMlknjK4xuZd0zhM2 RURIWoPG436P7/5j1zxsGWj7iMx6J0mVogz6a32P7+vaGNNCU5nSrbl2k+g9de41s1UY bGNr45JubwT64s270NokKjzz9er/gYWpD1pswR2BqGq+pD7ejBoxkcA5xSuMPhMWsQrA vhsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yncss9S0; 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=fail (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 s15si5913407ybc.182.2019.03.12.09.40.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:40:59 -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=fail header.i=@linaro.org header.s=google header.b=yncss9S0; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kSY-0007Jo-OP for patch@linaro.org; Tue, 12 Mar 2019 12:40:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7W-0005vf-W6 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7V-0003rh-I8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:14 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:46173) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7V-0003qb-4a for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:13 -0400 Received: by mail-pf1-x436.google.com with SMTP id s23so2151939pfe.13 for ; Tue, 12 Mar 2019 09:19:11 -0700 (PDT) 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; bh=lgmFLWb2AoBtsnhfwAW1Z+5LTMVI/a7+ZtnRExYBsYY=; b=yncss9S0IjsjLgykvQKaveLciaoYw1AHk9ISDV7jIdwjVjbcG0K485DRVToFQYFW+I 7yxzomihx9W0gA/0e5cdScqpo53bgF6rIL96TgQhqAaVlVDJIDNtCmud5u87lNAVO439 QgeM9663G4tJjq5XQVEa3ThkReIjwWBjrzuDGxWoWLr0qGPOShYUATi9uu1YV1KWrm/H MC1hcVPQPQV3seYBFu+X8/oEtfxUekvEcr/nM1fUo3279mp4hJELZK5dzZ4U516QxL/e 79z/ceUc+m2rrTicPwgnMQKSWDrB/V3jYjxQFATIqCSZCc1Y9lq0aw24pfqJ4xKea3v5 CTJQ== 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; bh=lgmFLWb2AoBtsnhfwAW1Z+5LTMVI/a7+ZtnRExYBsYY=; b=m29kyVoR7FUyp3sSoeKK3WSCfeW00OlG8O3z7FL+xnh2r4Gj0+YLqLZi63AjUnrjI2 9OVWdUCEh77f+K3W58xZKDcF+pWM2avE5PbqvwJzhT9D6DAVA2PgP1nl6JQqskTrutz4 p93ro0sF9mW0B/Oj7ctVqVtlUHP2NVv70svjSqpRmF9rwDkImju5cC1IO+SJxn180Oqf qupf7taGnVLSofa+uTHCmxWO6qc4WSuqPsEMRc/qIv6qpxQUJ1BhB8blelgbeiIBWJP4 Do9pH5ArqEqdqqW0+DASaZZcrlFekm5kaZKxZVwO1T0P9SHj7KeEEM5batPeOF2xejlH vCMQ== X-Gm-Message-State: APjAAAWA4u3dBp5Nrze7OM0dtW+17tUftx6QLYxoMoQCFhyfUoQMAibq UMjI6S7K1yTEgFPdT/5UpX+DUZBhIN4= X-Received: by 2002:a63:3d0e:: with SMTP id k14mr18293294pga.302.1552407550511; Tue, 12 Mar 2019 09:19:10 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:55 -0700 Message-Id: <20190312161904.31130-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::436 Subject: [Qemu-devel] [PULL 02/11] target/hppa: fix overwriting source reg in addb 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle When one of the source registers is the same as the destination register, the source register gets overwritten with the destionation value before do_add_sv() is called, which leads to unexpection condition matches. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-2-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/translate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 6c815e05c2..c4815d7e1a 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3031,7 +3031,7 @@ static bool do_addb(DisasContext *ctx, unsigned r, TCGv_reg in1, DisasCond cond; in2 = load_gpr(ctx, r); - dest = dest_gpr(ctx, r); + dest = tcg_temp_new(); sv = NULL; cb_msb = NULL; @@ -3047,6 +3047,8 @@ static bool do_addb(DisasContext *ctx, unsigned r, TCGv_reg in1, } cond = do_cond(c * 2 + f, dest, cb_msb, sv); + save_gpr(ctx, r, dest); + tcg_temp_free(dest); return do_cbranch(ctx, disp, n, &cond); } From patchwork Tue Mar 12 16:18:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160126 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13312621jad; Tue, 12 Mar 2019 09:38:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFsoXco7VT8C4fB13i2rnEx/NIDi9TVPdtuwzMkFjYU7XZjx4cdwRLHk81ZY5aMOLgsUQG X-Received: by 2002:a0d:f7c1:: with SMTP id h184mr2302084ywf.170.1552408697062; Tue, 12 Mar 2019 09:38:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408697; cv=none; d=google.com; s=arc-20160816; b=C4eEMi1lmOubk+Q25rWtQM8YJlVxcT8kTg3IAwViF/NPrQqdKJKn2hmJJYx2e8QMnf ByxPVYL62rgDTYoPiuKSVDzCa2YM36D8iqnknaCW6CUi3RUlSEX7Hi17oCu9I2vhQooa KV5WnaSErnbiBuhjhec1w7XY7Cgg9GmURCvVjhYA17Dg1SCGtvD5pqhRXix7phljttbm RheQ9ffasFS2ojpmrVGVI2gn3dL+QzzBi0oJ9Gyqvt0TD/UrKVax2ZZIf5dzqXS4NTuo c8LbFbEWzcmJJFAAf1PLZq/w8AozqU2anfEOa7Ii/GHj31Qn//YxunY/tFlF9ynsu0RD bPKA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=FbaVxm/TsZJvR2OuDOVMoD8m1rAoYZpNENsEpdiMaYk=; b=eKOXhY89VKW5k8Iaam931Z+YDdk57FjNSKQADRaaAyzqHOK15j0DLnHzFfiN9IAqqg V35TSWgGct8oiDGBS8wDPwuX8XqR/aUgLbBTxiRZkUuYPsXqN+nDGu5S6BGnXZ2ySMP+ Zd93me89W7EXpkxzP8+PYUQ9IehN7ffmp/7b+fhepT+LzZnrMP5U0r7to8lTHzzYppEc Dh8k1Oyz4dI+qyjI9PHC8VbWTagDXXo4FmVTvS8SPSUDs7fFqUd6Gv0nfsZ1nvsQJj0M lSudSmWQC16UTrBVsww67ysnX4TzIqpHaYfnMwlOt2r/psJA8JpXLaSkWJQO6qvYsH9w PeKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BJq3DgAD; 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=fail (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 y84si5634785ywg.213.2019.03.12.09.38.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:38:17 -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=fail header.i=@linaro.org header.s=google header.b=BJq3DgAD; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kPw-0004jK-G5 for patch@linaro.org; Tue, 12 Mar 2019 12:38:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7Y-0005xH-Sk for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7X-0003sk-6x for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:16 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:46162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7V-0003rK-IQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:15 -0400 Received: by mail-pf1-x42a.google.com with SMTP id s23so2152016pfe.13 for ; Tue, 12 Mar 2019 09:19:13 -0700 (PDT) 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; bh=FbaVxm/TsZJvR2OuDOVMoD8m1rAoYZpNENsEpdiMaYk=; b=BJq3DgADOerEnSp/yqW4wRrVctkH97akeHu5vFq9CCgL0TDjoL1bZG0fngY7Daw3Yh 3rajLGfPgcgmHmF9rpwzJfdx95W8LXpcKG1dozJXo1cPDjZuqax/jwRBUokv/LSN5NqM lzMyebiTLslei6LWy7TXGBSAf6kThkMzXlZnk4Ty0mZDzqxXN3UvjZZ8bJOx0l/1+5EZ kBjXhqMzRNpDIHw2rmXQIpX8un2AgamIkRvENQdeFO8+gwZh4DRIi8je0VMewGHzwFHz NYOuVf8FWfwnYhyTWCiZo54vjSA85k68IkEp+uN6uf9XSsCG3oTQMc9mMYbvgxaBKiXE /+UA== 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; bh=FbaVxm/TsZJvR2OuDOVMoD8m1rAoYZpNENsEpdiMaYk=; b=cRMAwvuVm6z0XiKOHsuCoAC0c3xRtv7+763SKAV+qCHh4+xXqC+RS+mxyFn1cAnAB4 Ka2xbJ1zU5SLZw6UsOTwkP1kRwQH4HMfh266jN1VwTMkZ1UZ8/lPQPpHx0GsSHI5IkpS z6J2Ttz2rMAp1r7KxtUywzaKHK3jqxw3EmE8ju7D5Rpzze4gfhWjm0t/Hf6BE9gy+rQ7 gE+MJ9o7vSbvKVwS3zuuO1o3wWSr9IUW/wFMmqxlKU7c8hEMrwyzHqw22sqRXkS3qeJU e3OTfOqWnQy5zFRL852UMW4iZiBsqXPUzUgX0kz0acLIe2yilkQjQUjvQbN+qiEzmeC/ jnfQ== X-Gm-Message-State: APjAAAVtSNfUncpAkGOI++R9YRbxZr+XVvpuYLdh1vglJz3prWunF9Df RRvMR+6A+qMejiZx2XGrgzeVjGz01jE= X-Received: by 2002:a63:eb56:: with SMTP id b22mr36005118pgk.287.1552407552106; Tue, 12 Mar 2019 09:19:12 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:56 -0700 Message-Id: <20190312161904.31130-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42a Subject: [Qemu-devel] [PULL 03/11] target/hppa: fix TLB handling for page 0 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle Assume the following sequence: pitlbe r0(sr0,r0) iitlba r4,(sr0,r0) ldil L%3000000,r5 iitlbp r5,(sr0,r0) This will purge the whole TLB and add an entry for page 0. However the current TLB implementation in helper_iitlba() will store to the last empty TLB entry, while helper_iitlbp() will write to the first empty entry. That is because an empty entry will match address 0 in helper_iitlba() Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-3-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.17.2 diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index aecf3075f6..648b94cc12 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -242,11 +242,13 @@ void HELPER(itlba)(CPUHPPAState *env, target_ulong addr, target_ureg reg) /* Zap any old entries covering ADDR; notice empty entries on the way. */ for (i = 0; i < ARRAY_SIZE(env->tlb); ++i) { hppa_tlb_entry *ent = &env->tlb[i]; - if (!ent->entry_valid) { - empty = ent; - } else if (ent->va_b <= addr && addr <= ent->va_e) { - hppa_flush_tlb_ent(env, ent); - empty = ent; + if (ent->va_b <= addr && addr <= ent->va_e) { + if (ent->entry_valid) { + hppa_flush_tlb_ent(env, ent); + } + if (!empty) { + empty = ent; + } } } From patchwork Tue Mar 12 16:18:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160119 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13301007jad; Tue, 12 Mar 2019 09:25:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZOmnlQlVf2zmDzddMJ9RLZMu//E56EPj24QMYXfjUvBbBQYAIjLDgYrxEBC5/V+oDZzTy X-Received: by 2002:a81:6c86:: with SMTP id h128mr31180780ywc.477.1552407956940; Tue, 12 Mar 2019 09:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552407956; cv=none; d=google.com; s=arc-20160816; b=0rc5cOYJUonQz22fBNTjYEn/6YRafT4Z4y4VFmSLsoGAvNvDXQTtTENBicRZgoW9Gh TRI+08k2x/XVxEfvO8A87qmZUT+UC0aOTRLRCRFNP/QmQGCPumQYMSnq6/Eo1Mmq+5wa krxtXB1ckXasZPrCH8H73YJiN84QZj5+++XQJ0uOUrs47R08K4qopGSHKk0iTnN2m2g4 v5a3fOYfow2nyDCjStnpWn/zA6nWyB11FlNMqpSQe4ME1SvnmtknGkeJKPXp73WtqzCl 7IE/kr4vWYlslh7ei4NuGDON8/bOuvDZ3xCCQz7ThyDSyCtPBSP6b8XeDFnpstM76d9/ Zdsw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=NJH19TquLWycaOqdKAD7ffw3vyOIRwwOSUA6RxBHhYo=; b=c0qXVhs5+0iyqKxXSFhNpUnXrpoDaoUs/xvsxpQZWitzE+KMYm2/KIdmkBEGhxR2yA 0Mu4mSOTccsD5oofdT7geqvEOe9fogAr/BeHw5ZyYIugovyXWX7Z0wt9oZBmbgwhjRjd xmoojIiFS5wgePrmTFSusPZ0+/B9qYSP469sBPome2JmDI0WyBNAwsDmeGaXGP9lUSag rX5uXkYoN9YyAI5Lj1n+X6ekC40qs4TaE6NNKOaoH2CPCAZHpW8HBV6yiEBug98Cqxbg 2FfTn77GQm67868hLWgIf+5MBzA5mcD3FnI9XLtYxuYA7ud/2srSh7wlPJh/bQcLYaui wQPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wicJ7HSW; 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=fail (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 g135si4463874ywe.406.2019.03.12.09.25.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:25:56 -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=fail header.i=@linaro.org header.s=google header.b=wicJ7HSW; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kDz-0002f5-Tl for patch@linaro.org; Tue, 12 Mar 2019 12:25:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7c-00060j-Fv for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7Y-0003tp-TK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:18 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:34439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7W-0003rx-Ve for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:15 -0400 Received: by mail-pf1-x433.google.com with SMTP id u9so2196398pfn.1 for ; Tue, 12 Mar 2019 09:19:14 -0700 (PDT) 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; bh=NJH19TquLWycaOqdKAD7ffw3vyOIRwwOSUA6RxBHhYo=; b=wicJ7HSWng8Jx6UyHUIV9WtoG1oI5khK3ipeBzmwqPOsuvJXYJWrnhqi1eCpvn3Y32 vFpecQlonjMiZKkDRBsBkT4FpBLZQyuEewyRHRlg01yefhBoOyhyjqI02Z7V8wtVkNEW HMHJtt+34ItxME0goOz+aVeez0NWRtVXCkQcXDyp38gNZF+XPN3QprS88Sfy1oNFo2cw X30gyEAENMAQpuVahXVw7POh6QJTAMMLOCrK1vctHayax7TgiX17729fG10XfP+ivFzj Z3poYtBOgxAmko/9jBzRjMyi8+KK/Z8Pz9HmYOdeffOTb80/gqAc3BEsget4JOSPX0O7 UpDA== 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; bh=NJH19TquLWycaOqdKAD7ffw3vyOIRwwOSUA6RxBHhYo=; b=Kvc8BWdwOiNbketfpDx0hF95NWJyLjTzW190idCTuWvOshMjPxX+KsVdMhiM7lCw0G iwFjDqpD21iDSxJEeu83RyZmEQt8H59LR1CxnowVDCN4TfG39lR9KmEFbdw6HcUBUMaF g30GkqPxahAx2tdoKcmm3CbrDR8qfjJQIRtdpnEE+CpFe+FJ7lAL2U+vA54skJnYKcPk x8c0bbZBxlQjDXL3Mp0mNbsRuaLMKrhUlG8DHnTX6acQV+9spHy2bu9FMrXtgeJiq1hL z6+DNAfnD2WRFo79DlqxWiN1OElJ1SR6T7F4ecRKDr7vzdWBYxziHIpcwmRFPc3txg5Y XCaA== X-Gm-Message-State: APjAAAUYl07AroGrcv6dgxCpbvYzs1+pEvkxgyAvRnjYxdDk62cBJTNw s6l2JZDCeZIC2XEMPzc9H+cNvYI7N6I= X-Received: by 2002:a63:4142:: with SMTP id o63mr10919047pga.81.1552407553217; Tue, 12 Mar 2019 09:19:13 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:57 -0700 Message-Id: <20190312161904.31130-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::433 Subject: [Qemu-devel] [PULL 04/11] target/hppa: report ITLB_EXCP_MISS for ITLB misses 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-4-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.17.2 diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 648b94cc12..867449084f 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -96,9 +96,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, if (ent == NULL || !ent->entry_valid) { phys = 0; prot = 0; - /* ??? Unconditionally report data tlb miss, - even if this is an instruction fetch. */ - ret = EXCP_DTLB_MISS; + ret = (type == PAGE_EXEC) ? EXCP_ITLB_MISS : EXCP_DTLB_MISS; goto egress; } From patchwork Tue Mar 12 16:18:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160132 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13327649jad; Tue, 12 Mar 2019 09:55:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoz9eVirK/palqzqSb0RYKuCP8a+8u5HCJMjPwPJ6+tZdAC6gg9NOS9i94vQ7vxpgp9Ayz X-Received: by 2002:a25:e6d3:: with SMTP id d202mr32211883ybh.385.1552409700641; Tue, 12 Mar 2019 09:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552409700; cv=none; d=google.com; s=arc-20160816; b=b+WSq+9sVIvN+ZiEw8SpsNAdhUy5exf8jd1Ca3CqP6xxUKCUZu2dDOKrmPlEwnq0Tl oOw++z/VPBYa9knuOa8z3f6zcwEc4Waeq2VeYSY0ByVatkKSbAcBUOlR79iiKRuQVQcu GfXxbpAt1kvv3ezxp04zh4AO+k6mZkqPff3Lxa5fnfpPJ+2yUlskUUHKBhAIyCmkQTa7 3clszKFt9brUmGavrbRSCZh1Xtwzue9QCwCEEyYrmlnrPNuT0pcSZt185UR7F1iyEttf oLKaWWN6+H99UnLV188+BP8yYrD1tRq3+3z0BkJnHX5WNa+0ZG5zX/18lbpA4PPm6jKp amtA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=CO30Mmi0Pz31RwqfLd5JpSz6ZCAKRLB3kQpltwM5JFM=; b=L3JgFHYaFUZtKx79dQgrclLXsn0ItZ2UbLvwLEaR2rQVMIFqF+gczB+RgBExqsrsxW LpAN8MlazR12KHKgKK4mZgOCLvbmHpkSKuxfrVbPVRr35kYpsuyWTRyS6BN5Wy3dDQQN RKDMrIOciekC0n5J2Ithws5PoYwNME0g6lzknd7iRqnN2fycdrofZx53tbV1T1yEyW8u qs8B5sTN388QaEmelSiwTGbvDSjomdNLB8wWwNurilaohYfzpmaeV9a8fD0wu+jnJuBx xDxTDb6OuLcXTrlNd2bAMVG3n82E1+ST6Yg5ftXT4JzpOCfG/EOwUp8saf5AFpdl7bMq k7yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QTVvqWcS; 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=fail (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 a4si673809ybr.471.2019.03.12.09.55.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:55:00 -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=fail header.i=@linaro.org header.s=google header.b=QTVvqWcS; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kg8-0002uh-4Y for patch@linaro.org; Tue, 12 Mar 2019 12:55:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7c-00060n-Gl for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7Z-0003uB-74 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:18 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:33241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7Y-0003t0-SU for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:17 -0400 Received: by mail-pf1-x442.google.com with SMTP id i19so2201103pfd.0 for ; Tue, 12 Mar 2019 09:19:16 -0700 (PDT) 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; bh=CO30Mmi0Pz31RwqfLd5JpSz6ZCAKRLB3kQpltwM5JFM=; b=QTVvqWcSPnvOd0HNcFPG3C9fM4fjL+7RaLBnReNubl9lL3xx3B4nJxFBImgiuNLHmJ 6ZvJNeyVJPBR2ZawQD2g3RP1jQusUTqC2WYejXfz5IX5NPQz89Vg9qpfFVVCMCir3s3Y aw1g4KFMQ7C/MUnCwFOZWIECzsn2EG/hgUqVrfP+f3FYR1DXgWkRc2hqFAzi1zsJX26g QkuaRCpIuMZ4iiD87mWNg+HNmgnRRLlAFe7ASZFS4jlew6hn3U0raF3IPkAQSltLdTQg BhQ57iJq0VRafRH6kmfiTBCm0UevLUNjPQpJKdQBxtUfrFKvXdGvql8K1OxHk0Vxlm6p 74nQ== 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; bh=CO30Mmi0Pz31RwqfLd5JpSz6ZCAKRLB3kQpltwM5JFM=; b=P/hgEX6DPAIKJsTSo0uuDx2fZJ7QBsjd2o9LBCi7X4OaWZfY2Y9fgjYZ8ML1j9Nty+ StEp+XpWVmbDxQ4tR33LJpGsGQ4l859XXvmin9/M5O7SKf53hlAr1In765yrZ5lDLSF9 sIhwaeQsYK/RLt2BfQBngiIvKNg1ciykav5tHdr+1IJplcZAvTjzBax8vvaDC981C4q0 Yf0rWrr6bKYJaaxNomPbwXk4sdMEyJz8hxs8RUsR6tahQfu29K3kY2s/BYTI15ccOsmS ZJaGEmnMWeuv07bDiEsfINvB3cO6adeTUhMWDpN88Wf2wV18waPNWBNWqN0tRL0W/Zmf FhAg== X-Gm-Message-State: APjAAAXzYMX9ihsKzx6JDO+eOt2UiuN+0oqC5jP5tN7nASUGmO5/07E7 6Dj2B3/dpYFlrtVCD3dyseo6mOMlAx8= X-Received: by 2002:a17:902:f209:: with SMTP id gn9mr40941375plb.50.1552407554730; Tue, 12 Mar 2019 09:19:14 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:58 -0700 Message-Id: <20190312161904.31130-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PULL 05/11] target/hppa: add TLB trace events 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle To ease TLB debugging add a few trace events, which are disabled by default so that there's no performance impact. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-5-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- Makefile.objs | 1 + target/hppa/mem_helper.c | 21 +++++++++++++++++++-- target/hppa/op_helper.c | 2 ++ target/hppa/trace-events | 18 ++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 target/hppa/trace-events -- 2.17.2 diff --git a/Makefile.objs b/Makefile.objs index 31a84b7d41..72debbf5c5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -182,6 +182,7 @@ trace-events-subdirs += qapi trace-events-subdirs += qom trace-events-subdirs += scsi trace-events-subdirs += target/arm +trace-events-subdirs += target/hppa trace-events-subdirs += target/i386 trace-events-subdirs += target/mips trace-events-subdirs += target/ppc diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 867449084f..d32ae6e7d9 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -22,6 +22,7 @@ #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qom/cpu.h" +#include "trace.h" #ifdef CONFIG_USER_ONLY int hppa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, @@ -43,9 +44,12 @@ static hppa_tlb_entry *hppa_find_tlb(CPUHPPAState *env, vaddr addr) for (i = 0; i < ARRAY_SIZE(env->tlb); ++i) { hppa_tlb_entry *ent = &env->tlb[i]; if (ent->va_b <= addr && addr <= ent->va_e) { + trace_hppa_tlb_find_entry(env, ent + i, ent->entry_valid, + ent->va_b, ent->va_e, ent->pa); return ent; } } + trace_hppa_tlb_find_entry_not_found(env, addr); return NULL; } @@ -55,6 +59,8 @@ static void hppa_flush_tlb_ent(CPUHPPAState *env, hppa_tlb_entry *ent) unsigned i, n = 1 << (2 * ent->page_size); uint64_t addr = ent->va_b; + trace_hppa_tlb_flush_ent(env, ent, ent->va_b, ent->va_e, ent->pa); + for (i = 0; i < n; ++i, addr += TARGET_PAGE_SIZE) { /* Do not flush MMU_PHYS_IDX. */ tlb_flush_page_by_mmuidx(cs, addr, 0xf); @@ -169,6 +175,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, egress: *pphys = phys; *pprot = prot; + trace_hppa_tlb_get_physical_address(env, ret, prot, addr, phys); return ret; } @@ -198,6 +205,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, MMUAccessType type, int mmu_idx, uintptr_t retaddr) { HPPACPU *cpu = HPPA_CPU(cs); + CPUHPPAState *env = &cpu->env; int prot, excp, a_prot; hwaddr phys; @@ -213,9 +221,10 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, break; } - excp = hppa_get_physical_address(&cpu->env, addr, mmu_idx, + excp = hppa_get_physical_address(env, addr, mmu_idx, a_prot, &phys, &prot); if (unlikely(excp >= 0)) { + trace_hppa_tlb_fill_excp(env, addr, size, type, mmu_idx); /* Failure. Raise the indicated exception. */ cs->exception_index = excp; if (cpu->env.psw & PSW_Q) { @@ -226,6 +235,8 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, cpu_loop_exit_restore(cs, retaddr); } + trace_hppa_tlb_fill_success(env, addr & TARGET_PAGE_MASK, + phys & TARGET_PAGE_MASK, size, type, mmu_idx); /* Success! Store the translation into the QEMU TLB. */ tlb_set_page(cs, addr & TARGET_PAGE_MASK, phys & TARGET_PAGE_MASK, prot, mmu_idx, TARGET_PAGE_SIZE); @@ -259,6 +270,7 @@ void HELPER(itlba)(CPUHPPAState *env, target_ulong addr, target_ureg reg) empty->va_b = addr & TARGET_PAGE_MASK; empty->va_e = empty->va_b + TARGET_PAGE_SIZE - 1; empty->pa = extract32(reg, 5, 20) << TARGET_PAGE_BITS; + trace_hppa_tlb_itlba(env, empty, empty->va_b, empty->va_e, empty->pa); } /* Insert (Insn/Data) TLB Protection. Note this is PA 1.1 only. */ @@ -280,6 +292,8 @@ void HELPER(itlbp)(CPUHPPAState *env, target_ulong addr, target_ureg reg) ent->d = extract32(reg, 28, 1); ent->t = extract32(reg, 29, 1); ent->entry_valid = 1; + trace_hppa_tlb_itlbp(env, ent, ent->access_id, ent->u, ent->ar_pl2, + ent->ar_pl1, ent->ar_type, ent->b, ent->d, ent->t); } /* Purge (Insn/Data) TLB. This is explicitly page-based, and is @@ -299,6 +313,7 @@ void HELPER(ptlb)(CPUHPPAState *env, target_ulong addr) { CPUState *src = CPU(hppa_env_get_cpu(env)); CPUState *cpu; + trace_hppa_tlb_ptlb(env); run_on_cpu_data data = RUN_ON_CPU_TARGET_PTR(addr); CPU_FOREACH(cpu) { @@ -314,7 +329,7 @@ void HELPER(ptlb)(CPUHPPAState *env, target_ulong addr) void HELPER(ptlbe)(CPUHPPAState *env) { CPUState *src = CPU(hppa_env_get_cpu(env)); - + trace_hppa_tlb_ptlbe(env); memset(env->tlb, 0, sizeof(env->tlb)); tlb_flush_by_mmuidx(src, 0xf); } @@ -335,8 +350,10 @@ target_ureg HELPER(lpa)(CPUHPPAState *env, target_ulong addr) if (excp == EXCP_DTLB_MISS) { excp = EXCP_NA_DTLB_MISS; } + trace_hppa_tlb_lpa_failed(env, addr); hppa_dynamic_excp(env, excp, GETPC()); } + trace_hppa_tlb_lpa_success(env, addr, phys); return phys; } diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 268caaaa20..a05681d480 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -25,6 +25,7 @@ #include "sysemu/sysemu.h" #include "qemu/timer.h" #include "fpu/softfloat.h" +#include "trace.h" void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp) { @@ -165,6 +166,7 @@ target_ureg HELPER(probe)(CPUHPPAState *env, target_ulong addr, int prot, excp; hwaddr phys; + trace_hppa_tlb_probe(addr, level, want); /* Fail if the requested privilege level is higher than current. */ if (level < (env->iaoq_f & 3)) { return 0; diff --git a/target/hppa/trace-events b/target/hppa/trace-events new file mode 100644 index 0000000000..80dae5bd8b --- /dev/null +++ b/target/hppa/trace-events @@ -0,0 +1,18 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# target/hppa/mem_helper.c +disable hppa_tlb_flush_ent(void *env, void *ent, uint64_t va_b, uint64_t va_e, uint64_t pa) "env=%p ent=%p va_b=0x%lx va_e=0x%lx pa=0x%lx" +disable hppa_tlb_find_entry(void *env, void *ent, int valid, uint64_t va_b, uint64_t va_e, uint64_t pa) "env=%p ent=%p valid=%d va_b=0x%lx va_e=0x%lx pa=0x%lx" +disable hppa_tlb_find_entry_not_found(void *env, uint64_t addr) "env=%p addr=%08lx" +disable hppa_tlb_get_physical_address(void *env, int ret, int prot, uint64_t addr, uint64_t phys) "env=%p ret=%d prot=%d addr=0x%lx phys=0x%lx" +disable hppa_tlb_fill_excp(void *env, uint64_t addr, int size, int type, int mmu_idx) "env=%p addr=0x%lx size=%d type=%d mmu_idx=%d" +disable hppa_tlb_fill_success(void *env, uint64_t addr, uint64_t phys, int size, int type, int mmu_idx) "env=%p addr=0x%lx phys=0x%lx size=%d type=%d mmu_idx=%d" +disable hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e, uint64_t pa) "env=%p ent=%p va_b=0x%lx va_e=0x%lx pa=0x%lx" +disable hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2, int pl1, int type, int b, int d, int t) "env=%p ent=%p access_id=%x u=%d pl2=%d pl1=%d type=%d b=%d d=%d t=%d" +disable hppa_tlb_ptlb(void *env) "env=%p" +disable hppa_tlb_ptlbe(void *env) "env=%p" +disable hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env=%p addr=0x%lx phys=0x%lx" +disable hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=%p addr=0x%lx" + +# target/hppa/op_helper.c +disable hppa_tlb_probe(uint64_t addr, int level, int want) "addr=0x%lx level=%d want=%d" From patchwork Tue Mar 12 16:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160121 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13303446jad; Tue, 12 Mar 2019 09:28:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqwuHNLjPWUH9/UnY4f1db6NJbfysxxk+2knVk1JnWy/iXmdOE1tZHfEJkllaQAxcy2ZimGI X-Received: by 2002:a0d:eb09:: with SMTP id u9mr10463613ywe.91.1552408123297; Tue, 12 Mar 2019 09:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408123; cv=none; d=google.com; s=arc-20160816; b=QqSxX9LLj5DYmQ1ANTJgrQyxzgwNquCSznK15+aqn8PTj5NPWviMVaaUU3Vxq7dOBd mIdIGm8kEXHrw//ukWirqOHOb7jnie+GLWtSbWtdoDgbl0hg+Ez1mx7AgzhqqmzDAFWo VnGh8RlV3UKoggwXTTz8F2EU329M7GZzNdQuW3fO0MDR/AnY63q1bviRbUYZJp/6O01W d2+/PzzvounlDKPjjLjr/gcYNnKJh6qn/KYU9ry9TREb0jAOT1DolZ1qHPy1QZDw88gr smtGFORkELDta/or5c9zfYYN9GNQGcS0VeY4vFSlYY2H2a+fiCU2lEGU2yVttSnKFogv 87qw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=gvBn1oFPxdecBnMqY3F27gHaqyuY4YgyVT6y3G8ypTI=; b=RJ5UMIzazKMSwR+HquguPlMa3W90aVeVc9Mbuy/jFg/d1q0PVWx10FdcRWHJlTeB7J hbAraGbtAHm/oamuEFp6DzD2UCJ+8xPyLK59V+6r5nwssxnWTM1w1I89WMCT8r5NYqR2 rRQH305COB4GE6YNY2F9o/NVfUMizzeaubvJ0en11ZCt6VgWrp7qanwPUPjTUYPKyTlF 4+J6CDaSxTD7nP/RJPsWH54ExOCTNtM5TJtrnOSW0P77FQZhy0xyhfhbAisMdWcqHTsE kHd8ssb7PzAhFWXja45kBMyX7xhS1LlZQpzN1GWRhi1VpzzSdruB1j0U4SIiBAautXx+ MmFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fFy1wfXh; 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=fail (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 y128si443293ywe.25.2019.03.12.09.28.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:28:43 -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=fail header.i=@linaro.org header.s=google header.b=fFy1wfXh; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kGg-00054e-N0 for patch@linaro.org; Tue, 12 Mar 2019 12:28:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7j-00065W-3Y for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7c-0003wL-Gh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:22 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:36443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7Z-0003tg-Af for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:18 -0400 Received: by mail-pg1-x536.google.com with SMTP id r124so2208409pgr.3 for ; Tue, 12 Mar 2019 09:19:17 -0700 (PDT) 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; bh=gvBn1oFPxdecBnMqY3F27gHaqyuY4YgyVT6y3G8ypTI=; b=fFy1wfXhyoWw7W52QA6TPx4crVYh240x0M4+CLHA2leMUu/bMHPb9Qvy/F8X2IUNo+ UQY/klEIVl3I6HyzIksaSBqqpXLkilR0WDXxpCO053nVQPM1T4ZPXeDfkqmKNqGjNNIP ks5XrDcUhSRX+fk+/LcIbksR/X7SbNMwHKLrySnQeajJ5NAh+iMPR4mYZwCv9v4kmLTe TSwUZYMnRwnu31VUkjN5Cywd16lrzHKD8s9ZRGVDFC3NzxaBsNfHC7EH1hvmbYuW6gVR BcnN3waF1yaT0XdKls0U5z7iizEWD64fOenRXH4t6Tks97m0mEcpV64MkP6BhMuVY/7/ 0tBQ== 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; bh=gvBn1oFPxdecBnMqY3F27gHaqyuY4YgyVT6y3G8ypTI=; b=h2c1Vne9JRUpMauNKo61tSNARpstEaKaBX3UrgTedvaD3XT1iKU+3NVwm67fUBYdaJ tiYRaDn0sZwPCAgjTIoANEZElfmtCcRqd9N2AaTmDARpcQuuluwU5LWGUPh2B55iImzj j5qSU5ev6hy2/3EFdoo+G8p7FuqqsCDvUTUwx9k/kPB4wrChoJIQMbOm46yB5DLhZ6Od nl1ByEsfNmdeBP8rh3S1b6JjDFbwIjoM6UndVpkln7vn54fxKKflCUK0Sj5F8Tn8R9/G BCS0KhqpqZ7SsqiNJtwbqHiWHvSD4NQyyAW7ti6PhlYl6OAHSf+e1VrYu0Pk25IvJdtR ZN1g== X-Gm-Message-State: APjAAAVQpWJtiG6UbR77MsNqAmGrcrfo5Op8sM6KN/6ozWepyq3CQM4v yJPRMLYj0NqB1Q1Db2hq6UH9yB2tndU= X-Received: by 2002:a17:902:1008:: with SMTP id b8mr39441673pla.120.1552407555927; Tue, 12 Mar 2019 09:19:15 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:59 -0700 Message-Id: <20190312161904.31130-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::536 Subject: [Qemu-devel] [PULL 06/11] target/hppa: remove PSW I/R/Q bit check 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle HP ODE use rfi to set the Q bit, and i don't see anything in the documentation that this is forbidden. So remove it. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-6-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/op_helper.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.17.2 diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index a05681d480..a55a5dfc02 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -678,11 +678,6 @@ target_ureg HELPER(swap_system_mask)(CPUHPPAState *env, target_ureg nsm) void HELPER(rfi)(CPUHPPAState *env) { - /* ??? On second reading this condition simply seems - to be undefined rather than a diagnosed trap. */ - if (env->psw & (PSW_I | PSW_R | PSW_Q)) { - helper_excp(env, EXCP_ILL); - } env->iasq_f = (uint64_t)env->cr[CR_IIASQ] << 32; env->iasq_b = (uint64_t)env->cr_back[0] << 32; env->iaoq_f = env->cr[CR_IIAOQ]; From patchwork Tue Mar 12 16:19:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160122 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13306188jad; Tue, 12 Mar 2019 09:31:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaBm5ZJJEqXnqcbltFOiueQJixMloiKeh/L7knyDx9z/wXW07YVyC1pAo+SPXFN3edY5J1 X-Received: by 2002:a25:888a:: with SMTP id d10mr33012675ybl.254.1552408293049; Tue, 12 Mar 2019 09:31:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408293; cv=none; d=google.com; s=arc-20160816; b=XsbDsBnEspefo1c/rqQ4seWQJ667RVFBDakHunF+vlTvmlEbIFPQHVup84q3jB1u6L le40oQiOsawcB70+k7sQRhmx8RoqfLyO6DDFBYjp6Aaz8/iaUWSmdVW89nZ4bPwkNQMc qchEcbZbt2LDwzSfr5mRFMZRkHMhdRktEaRQJ4xj9GgNkbxGoTuvAeOTXKzD+pE/RdSM 0sh07lnqWukBmyIInXdHSeD90+lY1zPCkkRZaNXjkyd98eIE3I7sq7jjP+Ticwx6yzWP guQz+rdSTk6Nk/hl0UmugVV+WFLmL1LWcrG6FKfuhDQyuIqHAXQ5/qBslDl/oTVMvE/G D4FQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=qKUZoF/a2Kkdnv24SRPFQ5wuvupHDLeUIyF9pRIxhQc=; b=Mke9JVeujFxMQUPcC8h8b3yXpvvlbPTTlqcn2kxZvzg1Gc+QdjAWL0XgJMldq1DDAG qWJ2Sgah8EZQPr1vJHKi8nv0Tky+i9ZcpJIzI6fkPU9UHog7rbjSq+ndeexssi9PF8WP 1Fqf2HJ/vhm2dUloz1Z6ke0zHLgjjEI+d5Njpo8bkExg9HfbDc8+zhZYWrG7ieMwUqVL uHF4e18qS9F/cq5ZTRldfuVSTOpBoY9gZRwiul2BO9GFJZAiamGEqsw9EmB20B7HkQ4a XHA4J1LY9e3qBJMXrGYsvjiN3yiEYmhHGa/vz8ffozahiNXi2mCErznTfKibI/oWTuUH oJ1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZHsnqOCU; 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=fail (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 84si5151230ywm.387.2019.03.12.09.31.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:31:33 -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=fail header.i=@linaro.org header.s=google header.b=ZHsnqOCU; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kJQ-0007Wo-FK for patch@linaro.org; Tue, 12 Mar 2019 12:31:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7o-000689-Q1 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7h-0003zM-Pu for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:29 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:40047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7c-0003uY-LP for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:22 -0400 Received: by mail-pg1-x52d.google.com with SMTP id u9so2188033pgo.7 for ; Tue, 12 Mar 2019 09:19:18 -0700 (PDT) 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; bh=qKUZoF/a2Kkdnv24SRPFQ5wuvupHDLeUIyF9pRIxhQc=; b=ZHsnqOCU5MwAcNbBCt5T/I1p7yvtyJM3YELgKGhYC9H6omqpobmsCFgKGzeIfilc5r Gg93k/4o/YNFPEkQprfPnUlvEpkSVxkqlgVrYVC67zXV6y9VK1glmxpsQksZhgs/j+L1 hc7a33Nsi33pW2vZRxs6hsP8bDSixP/6f9D4gjeFyEydKMuZYEmC1MeVbDBfk7k7PW7d /mnReKbmSUdNwSbjWna7txl+eD+UAnP56vJtJJA/o+5Qak6VdzGxQk7rNOQPNACxcmkK rEDgNXNfqYPizXbiqTNtI0+myrXbOyNc+cImNoK5uRC0A97on962fUNzhPqj5bFJasOX XRog== 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; bh=qKUZoF/a2Kkdnv24SRPFQ5wuvupHDLeUIyF9pRIxhQc=; b=JMvBXG2CF3AINSByTVWrJw1hbvP44KAbSGu87PqUerYnM+P5poWSDK8aKLNLKLSmYO aO/Xh1P8tEVhaeBA5463sJQKURIzKn+XfygBl3ivoWEK1Rlgegyec5dherG6o8vZwS+r XBIO6aOQ5F8DAGGAmQ4fHXEDw3ojpxsO5Z52F6tx8+nQ07cVqj0UmQpHbQGB96eNis80 ZepaQHjmZ3F/+K7w/zsYhzVVhWVDf95Gfuhz5RH60VZpLpZuG94GGjfoam7phvwtjPF3 1fyKXHM74Vosm6cJN2iheBzVMvWDIIN3ehnVB7SjxU46oY2Zy6YQpiseEFysFMAendo5 Slvw== X-Gm-Message-State: APjAAAWbG0bpJYLGyTxw2Y/MBIR4NbEkfh3rksbAHe8u8Tf6a4HalAIQ UuhGsj0Ah2pezJCp3Kp1Ap4sDwTvhSs= X-Received: by 2002:a63:7341:: with SMTP id d1mr36532084pgn.405.1552407557155; Tue, 12 Mar 2019 09:19:17 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:00 -0700 Message-Id: <20190312161904.31130-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52d Subject: [Qemu-devel] [PULL 07/11] target/hppa: ignore DIAG opcode 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle DIAG is usually only used by diagnostics software as it's CPU specific. In most of the cases it's better to ignore it and log a message that it's not implemented. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-7-svens@stackframe.org> [rth: Free the nullify condition.] Signed-off-by: Richard Henderson --- target/hppa/translate.c | 7 +++++++ target/hppa/insns.decode | 3 +++ 2 files changed, 10 insertions(+) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index c4815d7e1a..f3e78b8e22 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4048,6 +4048,13 @@ static bool trans_fmpyfadd_d(DisasContext *ctx, arg_fmpyfadd_d *a) return nullify_end(ctx); } +static bool trans_diag(DisasContext *ctx, arg_diag *a) +{ + qemu_log_mask(LOG_UNIMP, "DIAG opcode ignored\n"); + cond_free(&ctx->null_cond); + return true; +} + static void hppa_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) { DisasContext *ctx = container_of(dcbase, DisasContext, base); diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 55ff39dd05..098370c2f0 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -525,3 +525,6 @@ fmpy_d 001110 ..... ..... 010 ..... ... ..... @f0e_d_3 fdiv_d 001110 ..... ..... 011 ..... ... ..... @f0e_d_3 xmpyu 001110 ..... ..... 010 .0111 .00 t:5 r1=%ra64 r2=%rb64 + +# diag +diag 000101 ----- ----- ---- ---- ---- ---- From patchwork Tue Mar 12 16:19:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160134 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13335795jad; Tue, 12 Mar 2019 10:03:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVWFxVEEKLHcJgEA6w6g+1qHGdKSOPD29JnNFRdEI8X17B6JVq9l84vLbiOBsSKWMx+ExN X-Received: by 2002:a0d:f8c2:: with SMTP id i185mr30837471ywf.372.1552410210490; Tue, 12 Mar 2019 10:03:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552410210; cv=none; d=google.com; s=arc-20160816; b=jPbV+4OM7SKQ93le+r3OtygSBRHcrU5WDseKJdS0F3ZbuCWbvYkJXVwN5aYX9XksSZ xMdZg+ctyBfdqnJXhqSv08Ph4hIzwPtNcadgAXWteiVhQNeJsvaw8FTK/kff02CqMSkQ gvV1oj+GUaQOH1kAKpO4o7BaCKt0boPlNdhGq0eI/qVEcUXOAqKe9L0PIZMITOEHIuPy mj3ZcAxbOD1QhiVbYOiLx3MRysBYOPCJTeU8rLPekBQ1DmXayErJIIPSVIz/+mS85I/Y ncID5/SffoS+ZGaZIiEZ61l5NWw1VuZ/Z7rX4JirMrpHj8UtZ1dfUMX6+7i8nU5pZNSI 8/Fw== 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; bh=HoG29gvhoy6tueA/Y/lrtkLqoQljlEC6sudLJfhyjCY=; b=aLcBrYFsONy8QF2yFq2tVMp2UcGKZ7MRcrfLZ/sebG/qwLTHyhHcbqgjgt+ftw8EB7 t3ml08Hk6n+5941h3PMHLkMDJRlhpA9KpfvBNRkBkbC0iw7LCelQUeiAxxuJwftG/Piv dQ1oqEpf+Zivkopsv13bgAEUefXl7WF5VdZiuL+WuGx31FExK5UUP8z42CNgyaFm1MyZ ghHqc06Mpx8C3xG0oBjkQFK47VqJMs1KPdOgdKYe2/ZRldAFgkXPOHLlPDnOeZEMwsWO 56FnkBi5CGFb4S+Pi8hQiulOXqS2RQ1dYXG+CoYCmCWmP36zGD0OhPI0werlxUr0rJ6a nyMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IYQxeERR; 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=fail (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 b205si5224256ybc.339.2019.03.12.10.03.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:03:30 -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=fail header.i=@linaro.org header.s=google header.b=IYQxeERR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3koL-0000sG-U3 for patch@linaro.org; Tue, 12 Mar 2019 13:03:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7o-000687-Ph for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7j-00042F-4m for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:29 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:41941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7c-0003vD-Lg for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:22 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d25so2169805pfn.8 for ; Tue, 12 Mar 2019 09:19:19 -0700 (PDT) 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=HoG29gvhoy6tueA/Y/lrtkLqoQljlEC6sudLJfhyjCY=; b=IYQxeERRfHL9dxA01rG6YUHBA4YibMK2elu5vb8NjSER6/FX7K/RKDcJaHlF+vcvQ0 rh46Ti+F0mlfitTAe8fOEFrRXE7nd9i4R88JI7SnSCVDt70IhKKpHozrvlt6xLWNA4rA +piCCkDScMinkGtipxDh7rRdGxaDOsOcNdr/LvB5aVOA8tX0U8XbLxcwUIQK+3vfx9+M Tk2j9T81eI2aD3vKAndzJ1pWb6ojVdUT7eQPitE0cxjyfMH/kpDHzActgEZOPZqTnWgb MXvo+BzIVtyeMstuL52amBmmejkKi9EgIPeKT9KAmbMYqIg4vi6lYZbvpoMULcnUKMgh cD5A== 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=HoG29gvhoy6tueA/Y/lrtkLqoQljlEC6sudLJfhyjCY=; b=Cx3G6Z58fnfxLVnMdBkB4IMenX//v1ernQkd2FrYlPmhlTSHU8fbIc3BwhIW+D/Xlt GHlY3lTqQDw5IXxH2YS+UZYqifYNOQm8XmA1OJvWzhBG4vP+Vsb8veJ3pJtDxEa5Qqfu bN62WbApdCuTDt01DepUFq2o6sTEThJ99bhlf8Htbo7f/hO5Vnom9G2AsmttzfJZVnA9 qrsQpO6W0Ap73diJ4p3vkD8tz2fR69OqYcKyudnHfQPiiNkjkgm4bSnpginlUAQT1E3a 7Ipig8hJe9jUDnTZYkd/PJwXyzKQ1LGNi/GGq8NIcV5Z7MQYZO48rNihb8vfY4l9G5fT Vy9Q== X-Gm-Message-State: APjAAAW9+mExT+nFZFFftQRithfcQXD3ZL7GATIcaz/y1dO2GdBNpNRT CYmFTOfB+ERVRbfEeO3WtEAU5EmfldE= X-Received: by 2002:a65:43c7:: with SMTP id n7mr23116129pgp.173.1552407558383; Tue, 12 Mar 2019 09:19:18 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:01 -0700 Message-Id: <20190312161904.31130-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-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:4864:20::42c Subject: [Qemu-devel] [PULL 08/11] target/hppa: fix b,gate instruction 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle b,gate does GR[t] ← cat(GR[t]{0..29},IAOQ_Front{30..31}); instead of saving the link address to register t. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-8-svens@stackframe.org> [rth: Move link check outside of ifndef CONFIG_USER_ONLY; use ctx->privilege; nullify the insn earlier.] Signed-off-by: Richard Henderson --- target/hppa/translate.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index f3e78b8e22..6ac196804b 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3446,6 +3446,8 @@ static bool trans_b_gate(DisasContext *ctx, arg_b_gate *a) { target_ureg dest = iaoq_dest(ctx, a->disp); + nullify_over(ctx); + /* Make sure the caller hasn't done something weird with the queue. * ??? This is not quite the same as the PSW[B] bit, which would be * expensive to track. Real hardware will trap for @@ -3483,7 +3485,16 @@ static bool trans_b_gate(DisasContext *ctx, arg_b_gate *a) } #endif - return do_dbranch(ctx, dest, a->l, a->n); + if (a->l) { + TCGv_reg tmp = dest_gpr(ctx, a->l); + if (ctx->privilege < 3) { + tcg_gen_andi_reg(tmp, tmp, -4); + } + tcg_gen_ori_reg(tmp, tmp, ctx->privilege); + save_gpr(ctx, a->l, tmp); + } + + return do_dbranch(ctx, dest, 0, a->n); } static bool trans_blr(DisasContext *ctx, arg_blr *a) From patchwork Tue Mar 12 16:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160133 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13330224jad; Tue, 12 Mar 2019 09:57:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqzk1uRZpXukeXroSqUd2eEra9eyno9cSiSk0qDYtTELgQTcp3Ohzx6rMK6phWZaImTKLr6x X-Received: by 2002:a81:5a06:: with SMTP id o6mr12722568ywb.8.1552409878352; Tue, 12 Mar 2019 09:57:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552409878; cv=none; d=google.com; s=arc-20160816; b=cb7oU+ZDFoZ/RFlYzILcQNOvFRuBHw7j6/HX3ue0KtGSmz/fq0YF8cA1d4QxeRr7gB ComVplxp537PKQL0trrZO9cZ/VdO0DeN/Qtr6fHmTTCrR2N5wwoQk2GC74okPa7K0Wk2 NqKjAbiabVPmiFc0Qr4AzUJcn+BD8L0yXxi/RCV/MjuSNKDOZsnMQH7pKZ7qixyWhDW2 84kzLdBCYS783/40NTKWkno8nr6XIDZalQzRQcJk1ugbeQck2rXwcRZiu4ODCnQTyWId e68PdW81xQLRUx6PZuWQIfaXz5oTgNB4AmAysbsqzpvtEKozqO38aOrd+0utLNwoyy95 0OZw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=/OsS4tNr9ZMYHuULfhS05VN2vAKDB0y9il2P8ildqH4=; b=pFE4iByKbNRBhCRGsmN0OXnah1L2q1cXKen0uSvSRlQssG8BZ3dbrPcCO6xnl/fNV8 PLIulhmPvayDo6rvaiLc2q9dDgNKwRRqWJMDcAFXdY6VDKnDQ830J/nOtIWh6iogjMhh 1+Xq9hgknKfjXTKW2ApwJHfsjyG5HplCuvhwch3hq6UQW0MRoHq88BiJt79noOeEX5AW hixHUonqKWR1kxClRD5TlPX6i74qrRowvi5wXHdqPLH27wr+fg1ifdqA7yY3cwfe1Q76 Lj6hCqTFxKE2rdJsO3g8RMDdhjZRzjnnYtrAT4Bh7MbVD8y2x0itVrOqkKG5h2NZLtAl LPSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X3jcs08s; 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=fail (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 v2si5478829ybj.483.2019.03.12.09.57.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:57:58 -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=fail header.i=@linaro.org header.s=google header.b=X3jcs08s; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kiz-0005XD-SI for patch@linaro.org; Tue, 12 Mar 2019 12:57:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7o-000688-Pk for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7j-00042O-6X for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:29 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:34659) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7f-0003wM-HD for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:25 -0400 Received: by mail-pg1-x529.google.com with SMTP id v12so2217408pgq.1 for ; Tue, 12 Mar 2019 09:19:21 -0700 (PDT) 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; bh=/OsS4tNr9ZMYHuULfhS05VN2vAKDB0y9il2P8ildqH4=; b=X3jcs08ssxuO0LyA4oUCkzdV5D278FsIVE4Ws7UNEoB79vDTtMYu7y9oc1eNQ8RdcU vu32yFS9DiPFdRsd9aEfQ/Mc/6pczrvxdllde9GdkX+SNBX7y3/6gooloqh7Uj0LrXwG BwyKonD/brb/lirRlwDgjUlp2XhY8RbgUMoOkx2M6jJuH3R+rjia27KuPDlX0UtIHJ/o akTiL03Rbwo/Sbcngc6HwulRs1FMxfEcPW/M8jaXKf4CWCKl1HQPxe2hq3Cu690L7ZTR MZOY1fI4SGaJEIpaDXCpu8u4JOsZfjVrt8oZeG2TRkW4+V8K4y14PRnxjp66Rn2q9r7L RuUA== 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; bh=/OsS4tNr9ZMYHuULfhS05VN2vAKDB0y9il2P8ildqH4=; b=XAcWO/qmTczutqau3XQabsicIW6vNDYIotA3j4Egknb5DaGAf+dob6uhr0H4eLcmtk vo/9unGvX5hzWDCsAdNsnnnM5hnvgsDZG4GFfyHHmzx2DNj+P83Wfsxxa8oUt0eMFxyR fTQjPuh9nFJRUQH/B9WEjtoOX9c9dYRiqMNSzI3Aoe5b3Qe5bTSQMHtqCP1MCqMJk1I8 n4AmSpFnyMZy9H6hgOjRcdTb5rqYkCd1yWtS7BBV4KsHLFzdSXEiVuIiWV+WPMYxrfpV EUHYEH51YAJm8dR3IW5BsSb3xdRKjD1hv+fMfURUAnKeZpSNiM6Ux3vVmyOg5bYW6Oay gITA== X-Gm-Message-State: APjAAAXMikJ3qpwMOYCq9EAjrnhe2Hw35X8HL6AZE2NtD5h074MUg2vC kYJLpikCho/hFP3tDzfDIBra/8h/fCo= X-Received: by 2002:a63:29c3:: with SMTP id p186mr36124528pgp.24.1552407559626; Tue, 12 Mar 2019 09:19:19 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:02 -0700 Message-Id: <20190312161904.31130-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::529 Subject: [Qemu-devel] [PULL 09/11] target/hppa: allow multiple itlbp without itlba 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle The ODE software calls itlbp on existing TLB entries without calling itlba first, so this seems to be valid. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-9-svens@stackframe.org> Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.2 diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index d32ae6e7d9..a69cca9c5d 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -278,7 +278,7 @@ void HELPER(itlbp)(CPUHPPAState *env, target_ulong addr, target_ureg reg) { hppa_tlb_entry *ent = hppa_find_tlb(env, addr); - if (unlikely(ent == NULL || ent->entry_valid)) { + if (unlikely(ent == NULL)) { qemu_log_mask(LOG_GUEST_ERROR, "ITLBP not following ITLBA\n"); return; } From patchwork Tue Mar 12 16:19:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160135 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13336363jad; Tue, 12 Mar 2019 10:04:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzAhvxX/jC4Hw4nN6Sk9MgTbcLMRMyAXa4byRc9DD/L19c3LI5cLp3rqdU+UZoL63PKxe0t X-Received: by 2002:a81:5503:: with SMTP id j3mr31209386ywb.355.1552410244224; Tue, 12 Mar 2019 10:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552410244; cv=none; d=google.com; s=arc-20160816; b=mnOW+51y9c2xOk1MIqFdlYBQcTrz2mLyxfFCjQ4M/ts3ldfy9mEDUqzseHr7kXcQUx xnDmDfoLRvxR+UFwOKUcuMUDHCVZnR8ZlnaB+javImDFgxVKr5vTNNmg1neydP2uQyQA KqTau6Ydk0Mq49vbh/nzgoyIGK6BsS/Gs+qeoOHj2GsD9c4EQKyx9MHwo7mHB4RGStRo Zet4q6OapCyNyzQgE6RzSXuVHISYi4Szzn8yam4k4YAiq1/1Lj9B8zC8PT4Nsoz6X7nm mO6RL2VH6gvhQ2m6dWQXQF5m8dhUo8upzMNb1QiY9e8OfiAB6dXjTzo43iXZZYHWWdyT KR0g== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=2R2HF6vZiOsEmaQiHzoXBMfK3k9K0ilofjjPdJHUkAY=; b=M9SpDlWF2rRFTXK3gLQBZOZnwdLG8wUnok+pBELE2c59kqbztjiIAlyIniAaZCus8f 4bgjX46AD0S1HX6vxcDYcp9P2SoO1WWr7mBFD/FMNzN/jJErZRw/wgqeYqvBBUcDDS2X 2bcpmk8CoZCnS819Io1Rtm0qKu0+63AWwtAF7IPcgyDLRWLJvzipvKo4EeYT1+XFqxRo hRDlSa1yBS/1TEoB9KH/t9OOgc1gutdbZbVph0DUYqO6pAiK6pvcDJKUmLbaeOu71IX3 QOly2UQIAJrVj2nFfOmnl9bm+QHZLckJhNf/oMeHkMq/hY04cpUoY2QokwXkKfaatsXm FM2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=x5JkhasH; 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=fail (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 126si5093284ybv.310.2019.03.12.10.04.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:04:04 -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=fail header.i=@linaro.org header.s=google header.b=x5JkhasH; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kot-0002BO-Kw for patch@linaro.org; Tue, 12 Mar 2019 13:04:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7u-0006C7-HG for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7o-00044X-RI for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:35 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:38149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7j-0003xG-Ax for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:29 -0400 Received: by mail-pg1-x52e.google.com with SMTP id m2so2195652pgl.5 for ; Tue, 12 Mar 2019 09:19:22 -0700 (PDT) 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; bh=2R2HF6vZiOsEmaQiHzoXBMfK3k9K0ilofjjPdJHUkAY=; b=x5JkhasH1VeZnH9xOSFS5mH+ZqZxD4xG257M5+Q1Wy3N6ARfJ93UsAd6grUdQ3x3Pm gBojahRZxBtM1fYPNlHP+M3oFp+Ob6weWi/fMsQNrb6/GQVtaJGtRfa71s4ycQzVU71X LeEyQwPXXX+g4Dqd1twPlBnK9vlYRDiEhwOvW8/zOmMi4LuDPdEQwCY/AWYSpfJIN/jA gPCJA+U9WBuzV4QsQDRPA6u7+pW8ytjgRppiUjTMJPnVhdwKR7XvHMDOo9pB+In5wHLY kOixeobGxz3Y/drTMs5nRtK8BwSmojiEjmAEVRF3DgvcF+1ZqptPzP5t42lpibDefRMx 88fg== 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; bh=2R2HF6vZiOsEmaQiHzoXBMfK3k9K0ilofjjPdJHUkAY=; b=SwW+kHbJyMtL6AFHIffXpAHgKf9FXAgWhRZ7ej42R02LPvqx3/0k74Fd2VtJoF83b0 yzz2W6IO1HS1x5LaosEIN2zysxhs5IX1LiO19b961gDfFqQHwKVrEuxqnq+whMpmLboZ IdwE8B6zGfmf38HW3xOSXPnpdPAu6FK6Q2dus5yp+bmSRqEjag12t8UKZ5mlBqk6pjdJ o5n4jgjFTZUcm21U0F+BN1Ob+3N4lXgCOq0/QgYcC3M/Y4LJi+ygP2a8cVRTyATWmIGL qnISzJvxOVTxAPuRKxEP+bMRKr35X5xqNNkGcu4yG0ZIkBevJjR7Km1Kce2aZj/Bfy5P pz9g== X-Gm-Message-State: APjAAAUNHRbAYlMSEJEFY8j6sludc+8j0sOkCg4iS4r/3oRor5AJsRuG XE1BSVkRCTzOtl8tvsszEDFtmgnc4Bg= X-Received: by 2002:a65:5303:: with SMTP id m3mr35477544pgq.292.1552407561044; Tue, 12 Mar 2019 09:19:21 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:03 -0700 Message-Id: <20190312161904.31130-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52e Subject: [Qemu-devel] [PULL 10/11] target/hppa: add TLB protection id check 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-10-svens@stackframe.org> [rth: Add required tlb flushing when prot id registers change.] Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 10 ++++++++++ target/hppa/helper.h | 1 + target/hppa/gdbstub.c | 20 ++++++++++++-------- target/hppa/helper.c | 10 ++++++++++ target/hppa/mem_helper.c | 28 +++++++++++++++++++++++++++- target/hppa/translate.c | 10 ++++++++++ 6 files changed, 70 insertions(+), 9 deletions(-) -- 2.17.2 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 861bbb1f16..c062c7969c 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -143,6 +143,10 @@ #endif #define CR_RC 0 +#define CR_PID1 8 +#define CR_PID2 9 +#define CR_PID3 12 +#define CR_PID4 13 #define CR_SCRCCR 10 #define CR_SAR 11 #define CR_IVA 14 @@ -341,6 +345,12 @@ target_ureg cpu_hppa_get_psw(CPUHPPAState *env); void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg); void cpu_hppa_loaded_fr0(CPUHPPAState *env); +#ifdef CONFIG_USER_ONLY +static inline void cpu_hppa_change_prot_id(CPUHPPAState *env) { } +#else +void cpu_hppa_change_prot_id(CPUHPPAState *env); +#endif + #define cpu_signal_handler cpu_hppa_signal_handler int cpu_hppa_signal_handler(int host_signum, void *pinfo, void *puc); diff --git a/target/hppa/helper.h b/target/hppa/helper.h index bfe0dd1db1..38d834ef6b 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -92,4 +92,5 @@ DEF_HELPER_FLAGS_3(itlbp, TCG_CALL_NO_RWG, void, env, tl, tr) DEF_HELPER_FLAGS_2(ptlb, TCG_CALL_NO_RWG, void, env, tl) DEF_HELPER_FLAGS_1(ptlbe, TCG_CALL_NO_RWG, void, env) DEF_HELPER_FLAGS_2(lpa, TCG_CALL_NO_WG, tr, env, tl) +DEF_HELPER_FLAGS_1(change_prot_id, TCG_CALL_NO_RWG, void, env) #endif diff --git a/target/hppa/gdbstub.c b/target/hppa/gdbstub.c index 3157a690f2..983bf92aaf 100644 --- a/target/hppa/gdbstub.c +++ b/target/hppa/gdbstub.c @@ -93,19 +93,19 @@ int hppa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) val = env->cr[CR_RC]; break; case 52: - val = env->cr[8]; + val = env->cr[CR_PID1]; break; case 53: - val = env->cr[9]; + val = env->cr[CR_PID2]; break; case 54: val = env->cr[CR_SCRCCR]; break; case 55: - val = env->cr[12]; + val = env->cr[CR_PID3]; break; case 56: - val = env->cr[13]; + val = env->cr[CR_PID4]; break; case 57: val = env->cr[24]; @@ -224,19 +224,23 @@ int hppa_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) env->cr[CR_RC] = val; break; case 52: - env->cr[8] = val; + env->cr[CR_PID1] = val; + cpu_hppa_change_prot_id(env); break; case 53: - env->cr[9] = val; + env->cr[CR_PID2] = val; + cpu_hppa_change_prot_id(env); break; case 54: env->cr[CR_SCRCCR] = val; break; case 55: - env->cr[12] = val; + env->cr[CR_PID3] = val; + cpu_hppa_change_prot_id(env); break; case 56: - env->cr[13] = val; + env->cr[CR_PID4] = val; + cpu_hppa_change_prot_id(env); break; case 57: env->cr[24] = val; diff --git a/target/hppa/helper.c b/target/hppa/helper.c index 6539061e52..ac750b62ef 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "fpu/softfloat.h" +#include "exec/exec-all.h" #include "exec/helper-proto.h" target_ureg cpu_hppa_get_psw(CPUHPPAState *env) @@ -49,6 +50,7 @@ target_ureg cpu_hppa_get_psw(CPUHPPAState *env) void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg psw) { + target_ureg old_psw = env->psw; target_ureg cb = 0; env->psw = psw & ~(PSW_N | PSW_V | PSW_CB); @@ -64,6 +66,14 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ureg psw) cb |= ((psw >> 9) & 1) << 8; cb |= ((psw >> 8) & 1) << 4; env->psw_cb = cb; + + /* If PSW_P changes, it affects how we translate addresses. */ + if ((psw ^ old_psw) & PSW_P) { +#ifndef CONFIG_USER_ONLY + CPUState *src = CPU(hppa_env_get_cpu(env)); + tlb_flush_by_mmuidx(src, 0xf); +#endif + } } void hppa_cpu_dump_state(CPUState *cs, FILE *f, diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index a69cca9c5d..c9b57d07c3 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -131,7 +131,20 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, break; } - /* ??? Check PSW_P and ent->access_prot. This can remove PAGE_WRITE. */ + /* access_id == 0 means public page and no check is performed */ + if ((env->psw & PSW_P) && ent->access_id) { + /* If bits [31:1] match, and bit 0 is set, suppress write. */ + int match = ent->access_id * 2 + 1; + + if (match == env->cr[CR_PID1] || match == env->cr[CR_PID2] || + match == env->cr[CR_PID3] || match == env->cr[CR_PID4]) { + prot &= PAGE_READ | PAGE_EXEC; + if (type == PAGE_WRITE) { + ret = EXCP_DMPI; + goto egress; + } + } + } /* No guest access type indicates a non-architectural access from within QEMU. Bypass checks for access, D, B and T bits. */ @@ -334,6 +347,19 @@ void HELPER(ptlbe)(CPUHPPAState *env) tlb_flush_by_mmuidx(src, 0xf); } +void cpu_hppa_change_prot_id(CPUHPPAState *env) +{ + if (env->psw & PSW_P) { + CPUState *src = CPU(hppa_env_get_cpu(env)); + tlb_flush_by_mmuidx(src, 0xf); + } +} + +void HELPER(change_prot_id)(CPUHPPAState *env) +{ + cpu_hppa_change_prot_id(env); +} + target_ureg HELPER(lpa)(CPUHPPAState *env, target_ulong addr) { hwaddr phys; diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 6ac196804b..70a7cd4a89 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2256,6 +2256,16 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtctl *a) offsetof(CPUHPPAState, cr_back[ctl - CR_IIASQ])); break; + case CR_PID1: + case CR_PID2: + case CR_PID3: + case CR_PID4: + tcg_gen_st_reg(reg, cpu_env, offsetof(CPUHPPAState, cr[ctl])); +#ifndef CONFIG_USER_ONLY + gen_helper_change_prot_id(cpu_env); +#endif + break; + default: tcg_gen_st_reg(reg, cpu_env, offsetof(CPUHPPAState, cr[ctl])); break; From patchwork Tue Mar 12 16:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160129 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13317789jad; Tue, 12 Mar 2019 09:43:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqy9HrL3xHJ9uG8ZCBCsQ53TrGjs6l2gmL5CpR15zQandLo2LzG9SK3juUwmv7W/FyU3cau8 X-Received: by 2002:a25:db8d:: with SMTP id g135mr32117094ybf.474.1552409034667; Tue, 12 Mar 2019 09:43:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552409034; cv=none; d=google.com; s=arc-20160816; b=Y6zpgUd8jNV50nnB1nXdevDM9klqMqyCcMMSegAARbyBduFexpNfbaC93GIKPF6QbJ ctXEteE94FIkicJDe9SCpgltT0co3xBi9S+JVppAahmCHKEMU9Z+AQlUlcFpjdS2jhcj lg6Gkoas2QroiumiAfognvFZt16XUKDxDgQMfmgrJt3CHpqOSy+rrEWI729tToqJm6AS rMslfeRiBeI3ZWfkhB17P330wBJcaUyEfXvvsiYM11YDMksm5lkJmTNDQIhMfwf+qsYS YIMH8M+yMWRv38poQhmRRwHBPUijpQepE92he4lagonbmSyNqDkDV42vaiTlTAPmOvF2 5ehg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=2oD8fcQwkAapZc8IcOr4/np/dBqn/2xhFjzyXT52fTs=; b=swkysp7ztFuMgQluHasrdxzif7cmuifnU5ZMr/4CehO+GVMbjWl5Ngsnye+QdQm3on nzRZprlPuqGlF0svTr9tFKD38hznRqLKx6zYzEG6c2qXcGYOfH2JvlBJLPKtTEvOV2Uk eX3JbQuqRE+MYk0syeqte8FxXJgGv6PvHYLXHmZW4WQq+PppkJ6hE50+c6w9muFBIeha EJl7qWc5yoHeZ6o0WT00Q0V9H11Jcde8nmtT2E7lb+XAVSruE6pVpdVdrT1a1lY1vhmA OGLk7HLgdsvEoTP+SoZLOE3MZQj3/At73ThDVk0FwTqUoQGuTa9z1y68H3rV6JFu1ZPA celA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CTvXRIeL; 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=fail (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 123si5242474ywo.158.2019.03.12.09.43.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:43:54 -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=fail header.i=@linaro.org header.s=google header.b=CTvXRIeL; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kVO-0001iY-6b for patch@linaro.org; Tue, 12 Mar 2019 12:43:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7w-0006Dy-Ct for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7t-00049R-Ao for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:38 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:38005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7o-0003xo-R1 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:33 -0400 Received: by mail-pf1-x435.google.com with SMTP id n125so2181808pfn.5 for ; Tue, 12 Mar 2019 09:19:23 -0700 (PDT) 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; bh=2oD8fcQwkAapZc8IcOr4/np/dBqn/2xhFjzyXT52fTs=; b=CTvXRIeLsfs81PpQAdWj4P1Aa7labYqT+COeYWBXY0s6GCHSw1FAawrWBXkC/2SFC9 3QwoUxBUg/Ds/cNzBN+rfBZhXy0VHBTVRJM5/0t75tnnKa4It7NembMx5G+1GBlFm57N SaCKq3YftJcfEAc4fdwKScUPLiPIK3RF9cMs4xyqQNUtcTYNK1yq4ZQeBM30FDeRWBl/ Vly7o8BPVkjiDf7KIJBNTsUnjkfzF2vtl1uT/btiQ5fuNfVoeHibCoL6RqR4KCL/LEFN iOnaLvK7fL5hf46FsA2OrqiA6q2pyu1z3HCPzoLsCmgU8xoIWXTQGYNLgXqw6MWLhi/y WxbA== 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; bh=2oD8fcQwkAapZc8IcOr4/np/dBqn/2xhFjzyXT52fTs=; b=PDlUUKv2IG9+MhMyeitn2IM+87tWkKqqB57SKr/HKBJbkg/vgaUx1pDL79nruL7o+x u0N0rNhwD5/wDds42pLsyVlOJgAzt8sGS4qFGJNybLHfgIxO2bDjH27fb6Lh3W1iwNWk RxbkDlI99Rr5CdK4JJ2+3386r1wlr624ff2q03zGyJNlmnynq5CRHE8MMiz/SgOSS46E mO6Qo0Dbzo7zjEksXXRxmxR3z2lXEehxL3Yx1ANoHNYwTYysC6M08CiagWHKGu+dfGMY bnjIu2/EKUOFRYjuvFeQ1grOBMS4znj+DAonpqhKPL6dik3LdzZ601BAs92nkSV9xZ+d zPBg== X-Gm-Message-State: APjAAAUTy5cTt2OhmB+FVd4nCU8626CI0kmpjXn/WZvTFHwEKEpE+J0y goRvhbrYEGs+0yfFQlyc3LsP2Nfigg0= X-Received: by 2002:a62:564d:: with SMTP id k74mr39089255pfb.19.1552407562269; Tue, 12 Mar 2019 09:19:22 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:19:04 -0700 Message-Id: <20190312161904.31130-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::435 Subject: [Qemu-devel] [PULL 11/11] target/hppa: exit TB if either Data or Instruction TLB changes 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, Sven Schnelle Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle The current code assumes that we don't need to exit the TB if a Data Cache Flush or Insert has happend. However, as we have a shared Data/Instruction TLB, a Data cache flush also flushes Instruction TLB entries, and a Data cache TLB insert might also evict a Instruction TLB entry. So exit the TB in all cases if Instruction translation is enabled. Signed-off-by: Sven Schnelle Message-Id: <20190311191602.25796-11-svens@stackframe.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/translate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 70a7cd4a89..35c504087f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2482,9 +2482,8 @@ static bool trans_ixtlbx(DisasContext *ctx, arg_ixtlbx *a) gen_helper_itlbp(cpu_env, addr, reg); } - /* Exit TB for ITLB change if mmu is enabled. This *should* not be - the case, since the OS TLB fill handler runs with mmu disabled. */ - if (!a->data && (ctx->tb_flags & PSW_C)) { + /* Exit TB for TLB change if mmu is enabled. */ + if (ctx->tb_flags & PSW_C) { ctx->base.is_jmp = DISAS_IAQ_N_STALE; } return nullify_end(ctx); @@ -2511,7 +2510,7 @@ static bool trans_pxtlbx(DisasContext *ctx, arg_pxtlbx *a) } /* Exit TB for TLB change if mmu is enabled. */ - if (!a->data && (ctx->tb_flags & PSW_C)) { + if (ctx->tb_flags & PSW_C) { ctx->base.is_jmp = DISAS_IAQ_N_STALE; } return nullify_end(ctx);