From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qjv2c-00018o-IA for qemu-devel@nongnu.org; Thu, 21 Jul 2011 11:19:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qjv00-000335-2h for qemu-devel@nongnu.org; Thu, 21 Jul 2011 11:17:18 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:57574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qjuzz-00032g-T6 for qemu-devel@nongnu.org; Thu, 21 Jul 2011 11:17:16 -0400 Received: by mail-pv0-f173.google.com with SMTP id 3so1492015pvg.4 for ; Thu, 21 Jul 2011 08:17:15 -0700 (PDT) From: Tsuneo Saito Date: Fri, 22 Jul 2011 00:16:31 +0900 Message-Id: <1311261393-47400-6-git-send-email-tsnsaito@gmail.com> In-Reply-To: <1311261393-47400-1-git-send-email-tsnsaito@gmail.com> References: <1311261393-47400-1-git-send-email-tsnsaito@gmail.com> Subject: [Qemu-devel] [PATCH 5/7] SPARC64: fix fault status overwritten on nonfaulting load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Tsuneo Saito cpu_get_phys_page_nofault() calls get_physical_address() twice, that results in overwriting the fault status in the SFSR. We need this change in order for nonfaulting loads to raising MMU faults as normal loads do. Also removed the call to cpu_get_physical_page_desc() since we are going to modify nonfaulting loads raising MMU faults. Signed-off-by: Tsuneo Saito --- target-sparc/helper.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target-sparc/helper.c b/target-sparc/helper.c index cb8d706..b6e62a7 100644 --- a/target-sparc/helper.c +++ b/target-sparc/helper.c @@ -752,13 +752,9 @@ target_phys_addr_t cpu_get_phys_page_nofault(CPUState *env, target_ulong addr, { target_phys_addr_t phys_addr; - if (cpu_sparc_get_phys_page(env, &phys_addr, addr, 2, mmu_idx) != 0) { - if (cpu_sparc_get_phys_page(env, &phys_addr, addr, 0, mmu_idx) != 0) { - return -1; - } - } - if (cpu_get_physical_page_desc(phys_addr) == IO_MEM_UNASSIGNED) + if (cpu_sparc_get_phys_page(env, &phys_addr, addr, 0, mmu_idx) != 0) { return -1; + } return phys_addr; } #endif -- 1.7.5.4