From patchwork Mon Jul 31 12:22:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 109013 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp3585109obm; Mon, 31 Jul 2017 05:24:06 -0700 (PDT) X-Received: by 10.200.57.81 with SMTP id t17mr15679041qtb.45.1501503846254; Mon, 31 Jul 2017 05:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501503846; cv=none; d=google.com; s=arc-20160816; b=r879hAScN3h2IiHu/u7M5kv4YzMDqspIbgS9EcX8SQQFoipgTV1+u+Q/GAUMD0HDrn rsQA4LYR0Lz7bQCEWAbTKKebZaSceS2NDfijSTiNmplLxOqRYrK8IGjz1pwO5qTcUYW4 AT7S518OShzmFPmtl2iCL+sRKVtkW91QJ6ZZkYKq++Iaw8VFsGeCxj8/NSZLpqoa7YXz nM/EgdTLrcyR2gQ0MT2Tt96yaoLKHToLlTs+nC0gPxOO8nQARHJLdrC6xqiqTFdKAXtq ZDy9Ih/LsNAR44Y7wFrsVNWTmHTZ3zJ5b7TOTon1GFCbLfXw4ERkTcZXz/NeuqYhAs7f jeyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=tlM2FcSoblkzq6xAEo5gDGTj9OcWxEgRk3+zSAUO6fo=; b=u/LM9j8gO66KtPzD8qw+FHdT9Bylqt+a+lJuAOt7P45YyQLFYyGxb2CbPtFDD/clME FVcvKKaOWVglpraw7pV/1IG9Sks6h+DpABXHrWGAWCZxMLDjODfl/ZX7i6yTwR7juj7e nbvuBFpoW5WfEDJWmWQxxnSImkRYZp+eimxnqXle/eqL08DurZHjhzZVfrmNVMq72pRM HNzr4JPPEdAGN6m1uSJiXP00myDdMi2cekJLhVLynedxLuTRZqRD2FyzBmdoG9rEwuTt Mqb8wZea+jrThBd148bHFG6qy595NDkMrd1CiN3ofOuma6PwQXRDtDk+n5z8UUq+kG83 nv1A== ARC-Authentication-Results: i=1; mx.google.com; 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 m2si24430002qtd.445.2017.07.31.05.24.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 31 Jul 2017 05:24:06 -0700 (PDT) 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; 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]:59292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dc9jv-0002HY-JI for patch@linaro.org; Mon, 31 Jul 2017 08:24:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dc9iu-0001fI-0Q for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dc9ip-0003g8-9k for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:23:00 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dc9ip-0003ax-2i for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:22:55 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dc9ig-0000s6-FD for qemu-devel@nongnu.org; Mon, 31 Jul 2017 13:22:46 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 31 Jul 2017 13:22:39 +0100 Message-Id: <1501503765-15639-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501503765-15639-1-git-send-email-peter.maydell@linaro.org> References: <1501503765-15639-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 1/7] target/arm: Correct MPU trace handling of write vs execute 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Correct off-by-one bug in the PSMAv7 MPU tracing where it would print a write access as "reading", an insn fetch as "writing", and a read access as "execute". Since we have an MMUAccessType enum now, we can make the code clearer in the process by using that rather than the raw 0/1/2 values. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 1500906792-18010-1-git-send-email-peter.maydell@linaro.org --- target/arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/target/arm/helper.c b/target/arm/helper.c index 4ed32c5..9ed5096 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8558,8 +8558,8 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address, phys_ptr, prot, fsr); qemu_log_mask(CPU_LOG_MMU, "PMSAv7 MPU lookup for %s at 0x%08" PRIx32 " mmu_idx %u -> %s (prot %c%c%c)\n", - access_type == 1 ? "reading" : - (access_type == 2 ? "writing" : "execute"), + access_type == MMU_DATA_LOAD ? "reading" : + (access_type == MMU_DATA_STORE ? "writing" : "execute"), (uint32_t)address, mmu_idx, ret ? "Miss" : "Hit", *prot & PAGE_READ ? 'r' : '-',