From patchwork Fri Aug 30 09:58:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 271204 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0F9052C0082 for ; Fri, 30 Aug 2013 19:59:27 +1000 (EST) Received: from localhost ([::1]:48506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLUD-00073H-BW for incoming@patchwork.ozlabs.org; Fri, 30 Aug 2013 05:59:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLTs-0006ve-VX for qemu-devel@nongnu.org; Fri, 30 Aug 2013 05:59:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFLTn-0006Ns-MV for qemu-devel@nongnu.org; Fri, 30 Aug 2013 05:59:04 -0400 Received: from mail-ee0-x230.google.com ([2a00:1450:4013:c00::230]:47648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLTn-0006NX-Fi for qemu-devel@nongnu.org; Fri, 30 Aug 2013 05:58:59 -0400 Received: by mail-ee0-f48.google.com with SMTP id l10so798636eei.35 for ; Fri, 30 Aug 2013 02:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=qeOSqAAxpv8v5UJgaiAw8oukajRwSj6+v7z9MuC7Gmo=; b=yNYhiYm9RJPrRa6fNCFtKlqDGzsh95tWIVlZKbWW0Nwh52dHVnNHX8FB/GFVfb3kEJ gyDTTO4yTfVYMLlq2OvIFmpHrUxer2WBZ7F838PJzPCtDIKHbYeeqdHCfRhoGNqycdKC F7inZWl+q+jeY8Ev3d5jcSYaqmhAeF10kkC6zHb5WY87wecC+FSgHmLKnXglPO+/8bG9 HkALRgVtpBlCJdudJBPGjbM0G5kPaFi9JlGpyVuPwpBYlazkCc1uhdtxVLzCqI7vtcpy 1lhcGoX/qb+V4QJewrmJp21n+LEDrM19FST0nuorGsljXkUgqVGiF9MQaQP39kf2vfsI GR4Q== X-Received: by 10.15.33.132 with SMTP id c4mr11528231eev.2.1377856737827; Fri, 30 Aug 2013 02:58:57 -0700 (PDT) Received: from yakj.lan (net-37-117-144-28.cust.dsl.vodafone.it. [37.117.144.28]) by mx.google.com with ESMTPSA id k7sm53300097eeg.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 30 Aug 2013 02:58:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 30 Aug 2013 11:58:45 +0200 Message-Id: <1377856725-32644-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::230 Cc: Richard Henderson Subject: [Qemu-devel] [PATCH] target-i386: fix disassembly with PAE=1, PG=0 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 CR4.PAE=1 will not enable paging if CR0.PG=0, but the "if" chain in x86_cpu_get_phys_page_debug says otherwise. Check CR0.PG before everything else. Fixes "-d in_asm" for a code section at the beginning of OVMF. Cc: Richard Henderson Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Max Filippov --- target-i386/helper.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index bf3e2ac..7f74e5d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -894,7 +894,10 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint32_t page_offset; int page_size; - if (env->cr[4] & CR4_PAE_MASK) { + if (!(env->cr[0] & CR0_PG_MASK)) { + pte = addr & env->a20_mask; + page_size = 4096; + } else if (env->cr[4] & CR4_PAE_MASK) { target_ulong pdpe_addr; uint64_t pde, pdpe; @@ -952,26 +955,21 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { uint32_t pde; - if (!(env->cr[0] & CR0_PG_MASK)) { - pte = addr; - page_size = 4096; + /* page directory entry */ + pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; + pde = ldl_phys(pde_addr); + if (!(pde & PG_PRESENT_MASK)) + return -1; + if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { + pte = pde & ~0x003ff000; /* align to 4MB */ + page_size = 4096 * 1024; } else { /* page directory entry */ - pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; - pde = ldl_phys(pde_addr); - if (!(pde & PG_PRESENT_MASK)) + pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; + pte = ldl_phys(pte_addr); + if (!(pte & PG_PRESENT_MASK)) return -1; - if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { - pte = pde & ~0x003ff000; /* align to 4MB */ - page_size = 4096 * 1024; - } else { - /* page directory entry */ - pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; - pte = ldl_phys(pte_addr); - if (!(pte & PG_PRESENT_MASK)) - return -1; - page_size = 4096; - } + page_size = 4096; } pte = pte & env->a20_mask; }