[Qemu-devel] [PATCH] Remove TARGET_PHYS_ADDR_BITS define completely

[Qemu-devel] [PATCH] Remove TARGET_PHYS_ADDR_BITS define completely

[Peter Maydell]

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 <peter.maydell@linaro.org>
---
 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').  */
 
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH] Remove TARGET_PHYS_ADDR_BITS define completely

[Alexander Graf]

On 05.10.2012, at 19:09, Peter Maydell wrote:

> 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 <peter.maydell@linaro.org>

Thanks, applied to ppc-next

(But I wouldn't mind it going through trivial either. Whoever sends a pull request first ...)


Alex