From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54734 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pi5TR-0003pG-1M
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:31:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aurelien@aurel32.net>) id 1Pi5TC-0006ZL-UD
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:31:48 -0500
Received: from hall.aurel32.net ([88.191.126.93]:56764)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aurelien@aurel32.net>) id 1Pi5TC-0006Wl-PQ
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:31:34 -0500
Date: Wed, 26 Jan 2011 14:31:25 +0100
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PATCH v2] target-sh4: update PTEH upon MMU exception
Message-ID: <20110126133125.GB21635@hall.aurel32.net>
References: <20110125080510.GD23331@hall.aurel32.net>
	<1296010673-3841-1-git-send-email-gnurou@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <1296010673-3841-1-git-send-email-gnurou@gmail.com>
Sender: Aurelien Jarno <aurelien@aurel32.net>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alexandre Courbot <gnurou@gmail.com>
Cc: qemu-devel@nongnu.org

On Wed, Jan 26, 2011 at 11:57:53AM +0900, Alexandre Courbot wrote:
> Update the PTEH register to contain the VPN at which an MMU
> exception occured as specified by the SH4 reference.
> 
> Signed-off-by: Alexandre Courbot <gnurou@gmail.com>
> ---
>  target-sh4/helper.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)

Thanks, applied.

> diff --git a/target-sh4/helper.c b/target-sh4/helper.c
> index 19b309b..8f8c66c 100644
> --- a/target-sh4/helper.c
> +++ b/target-sh4/helper.c
> @@ -453,6 +453,10 @@ 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:
> -- 
> 1.7.3.5
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net