From patchwork Tue Jan 25 04:51:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 80313 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2AD561007D4 for ; Tue, 25 Jan 2011 15:52:36 +1100 (EST) Received: from localhost ([127.0.0.1]:47019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhatN-0008A1-FO for incoming@patchwork.ozlabs.org; Mon, 24 Jan 2011 23:52:33 -0500 Received: from [140.186.70.92] (port=44293 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Phasa-000890-Pd for qemu-devel@nongnu.org; Mon, 24 Jan 2011 23:51:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhasZ-0008Ga-DZ for qemu-devel@nongnu.org; Mon, 24 Jan 2011 23:51:44 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:36483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhasZ-0008D2-AW for qemu-devel@nongnu.org; Mon, 24 Jan 2011 23:51:43 -0500 Received: by mail-iy0-f173.google.com with SMTP id 19so4913805iye.4 for ; Mon, 24 Jan 2011 20:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=bcTkqwXL0UodCr2SFGS3Mdxlby+3PkPPj+VTHj8jLME=; b=M0Vumxlx/n+4bm2e3+IbtQVNXgzdifXinA47aPuajAMBlCEneXedpgB/9x+cmWoqUJ x3qnOBWgN5agXGjyTVEi9UhwN/bi9sLyqwBu2vlyX57Pc3Q9eRFhyB/JamjocIPUaf9U iPvqKLXqK0Y7/vv4olstsoANO65h3imHyLMi8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=FFUPOArBM6IL5ClpZOH4Hl/dgzA+ComojPKZN48jA9l9Qf+tGZymi5d0d4fZLbNW11 kMBxhJh+Ixyd5D6bfnInomNTcoSS2upvtzsz3qttu9Wl3E4z6TYchNZzi4J4XRaaImgw m/ywiFYBQaz0FWDrRolysZfAjtgKLlPIiacKw= Received: by 10.42.169.2 with SMTP id z2mr5958203icy.436.1295931102968; Mon, 24 Jan 2011 20:51:42 -0800 (PST) Received: from localhost.localdomain (fw-cisco.dcl.info.waseda.ac.jp [133.9.216.204]) by mx.google.com with ESMTPS id u5sm10437069ics.6.2011.01.24.20.51.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Jan 2011 20:51:36 -0800 (PST) From: Alexandre Courbot To: Aurelien Jarno Date: Tue, 25 Jan 2011 13:51:17 +0900 Message-Id: <1295931077-29499-2-git-send-email-gnurou@gmail.com> X-Mailer: git-send-email 1.7.3.5 In-Reply-To: <1295931077-29499-1-git-send-email-gnurou@gmail.com> References: <1295931077-29499-1-git-send-email-gnurou@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Alexandre Courbot , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] target-sh4: update PTEH upon MMU exception X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Update the PTEH register to contain the VPN at which an MMU exception occured as specified by the SH4 reference. --- target-sh4/helper.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index 2d76f22..c34d2f5 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -453,6 +453,9 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, if (ret != MMU_OK) { env->tea = address; + if (ret != MMU_DTLB_MULTIPLE && ret != MMU_ITLB_MULTIPLE) + env->pteh = (env->pteh & PTEH_ASID_MASK) | + (address & PTEH_VPN_MASK); switch (ret) { case MMU_ITLB_MISS: case MMU_DTLB_MISS_READ: