From patchwork Sun May 27 14:34:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 161551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 67A69B6F62 for ; Mon, 28 May 2012 01:03:20 +1000 (EST) Received: from localhost ([::1]:53349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYeZg-0004aL-GK for incoming@patchwork.ozlabs.org; Sun, 27 May 2012 10:36:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYeYw-0002PZ-Lq for qemu-devel@nongnu.org; Sun, 27 May 2012 10:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYeYu-00070a-KD for qemu-devel@nongnu.org; Sun, 27 May 2012 10:35:18 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:61149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYeYu-00070F-Ad for qemu-devel@nongnu.org; Sun, 27 May 2012 10:35:16 -0400 Received: by lbok6 with SMTP id k6so1844613lbo.4 for ; Sun, 27 May 2012 07:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vJoNCaavHoYIGY84DiaWyXBjHBoSMpU1VFti2L9orUk=; b=s/ilKz/PK9F2k4oroIMb6TaAHVdP0+t/mdvNIm4hs4qLeTacpZqtCxlR+pbxpkQdvz PqCEA6djEsbxHU1vQ05X1vLsteLh+9F80hC8E+wamFsxMyQr9dpj36ag8O23xn4Yzu/k e+7l/I8VjOzg/vtrGCJPCks1ktO8juHGOpDrpIuDYbuDz0aIHXU507vSsQkqV+86fPvP ojf0veHA/mn46mt+wSsD1190bT5J6sYykx6nERmr0/nmtIwTw/MCdGm1qfXozyPVXUKj T/Bhp3fJQPtjSuWcD5WOnnvVdwuefToZc/yO+yJzA6Mk1ZlxAjZYSC750JOWTjXCaGar g8ug== Received: by 10.112.41.35 with SMTP id c3mr2270583lbl.11.1338129314172; Sun, 27 May 2012 07:35:14 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id ta2sm13810664lab.15.2012.05.27.07.35.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 27 May 2012 07:35:13 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Sun, 27 May 2012 18:34:50 +0400 Message-Id: <1338129294-16742-3-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1338129294-16742-1-git-send-email-jcmvbkbc@gmail.com> References: <1338129294-16742-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.217.173 Cc: Blue Swirl , Max Filippov , Anthony Liguori Subject: [Qemu-devel] [PATCH 1.1 2/6] target-xtensa: update EXCVADDR in case of page table lookup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org According to ISA, 4.4.2.6, EXCVADDR may be changed by any TLB miss, even if the miss is handled entirely by processor hardware. Signed-off-by: Max Filippov --- target-xtensa/helper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 2094227..43a6611 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -516,6 +516,7 @@ static int autorefill_mmu(CPUXtensaState *env, uint32_t vaddr, bool dtlb, *wi = (++env->autorefill_idx) & 0x3; split_tlb_entry_spec_way(env, vaddr, dtlb, &vpn, *wi, ei); xtensa_tlb_set_entry(env, dtlb, *wi, *ei, vpn, pte); + env->sregs[EXCVADDR] = vaddr; qemu_log("%s: autorefill(%08x): %08x -> %08x\n", __func__, vaddr, vpn, pte); }