From patchwork Fri Oct 5 17:09:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12033 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 585BC24156 for ; Fri, 5 Oct 2012 17:09:10 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id EF2A5A18F6C for ; Fri, 5 Oct 2012 17:09:09 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4254594iej.11 for ; Fri, 05 Oct 2012 10:09:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=7OvSaEkAMBXbYAbzy20IZ2Gfr1Gr32EwVEMY73dvCmM=; b=IaOZ0s4cjhLbjfVMavQMq13kECcMh+XMnaCk3+DcMoLUZybiOoR9hGXo8IVIxFS3uN H6Cz4Oh7Gg0ovgcA4+DHmtKMt8eLlbO6kyz61GoKGheVurYAVZuk/9yzHFhTkQpY/DyQ z8OXTIJYLFTKk4Z3X+I3myPQ/W21Jp/BFnuGWJUobdjrxZ6XUUrgtGRkWIYlaeEcEFuz G7dbkCDPUUjaKWqaCoJB4M7b86mBceOqNGedsI+9e7UmHp/XwK8KIkC2ZPjflJ7Pmnt2 4EfFaHKT/PZaJ9SvtqEaMSDcZwY+ZdY4Z+dLy/lzyR6sFxwX/AQK2otd857VjOsin0gs luyQ== Received: by 10.50.160.165 with SMTP id xl5mr1834195igb.0.1349456949716; Fri, 05 Oct 2012 10:09:09 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp137497igc; Fri, 5 Oct 2012 10:09:08 -0700 (PDT) Received: by 10.216.213.29 with SMTP id z29mr5903961weo.8.1349456948156; Fri, 05 Oct 2012 10:09:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id k84si152095wep.152.2012.10.05.10.09.06 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 10:09:08 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TKBOY-0008Hv-C0; Fri, 05 Oct 2012 18:09:02 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: Avi Kivity , qemu-trivial@nongnu.org, patches@linaro.org, Alexander Graf Subject: [PATCH] Remove TARGET_PHYS_ADDR_BITS define completely Date: Fri, 5 Oct 2012 18:09:02 +0100 Message-Id: <1349456942-31836-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQm2KU2IzmRpUI9XiY3nBK8MblxE9gd/3Y+0lvOr4fkrayFOvkf5IHjSlKE2uXkA2/HTjWFb Following commit 4be403c81 TARGET_PHYS_ADDR_BITS is always 64, and it's only used in one place (that commit removed all the other uses). Remove it completely, to avoid confusion with the genuinely useful TARGET_PHYS_ADDR_SPACE_BITS. Signed-off-by: Peter Maydell --- target-ppc/mmu_helper.c | 2 -- targphys.h | 1 - 2 files changed, 3 deletions(-) diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 532b114..a549c4d 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -1509,10 +1509,8 @@ static void mmubooke_dump_mmu(FILE *f, fprintf_function cpu_fprintf, mask = ~(entry->size - 1); ea = entry->EPN & mask; pa = entry->RPN & mask; -#if (TARGET_PHYS_ADDR_BITS >= 36) /* Extend the physical address to 36 bits */ pa |= (target_phys_addr_t)(entry->RPN & 0xF) << 32; -#endif size /= 1024; if (size >= 1024) { snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "M", size / 1024); diff --git a/targphys.h b/targphys.h index 08cade9..f37c0c9 100644 --- a/targphys.h +++ b/targphys.h @@ -3,7 +3,6 @@ #ifndef TARGPHYS_H #define TARGPHYS_H -#define TARGET_PHYS_ADDR_BITS 64 /* target_phys_addr_t is the type of a physical address (its size can be different from 'target_ulong'). */