From 4be403c8158e1b6be743f0fef004310cea4e3975 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 4 Oct 2012 12:36:04 +0200 Subject: Make target_phys_addr_t 64 bits unconditionally The hassle and compile time overhead of maintaining both 32-bit and 64-bit capable source isn't worth the tiny performance advantage which is seen on a minority of configurations. Switch to compiling libhw only once, with target_phys_addr_t unconditionally typedefed to uint64_t. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- hw/intel-hda.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'hw/intel-hda.c') diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 127e81888b..d8e1b23a60 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -210,13 +210,7 @@ static target_phys_addr_t intel_hda_addr(uint32_t lbase, uint32_t ubase) { target_phys_addr_t addr; -#if TARGET_PHYS_ADDR_BITS == 32 - addr = lbase; -#else - addr = ubase; - addr <<= 32; - addr |= lbase; -#endif + addr = ((uint64_t)ubase << 32) | lbase; return addr; } -- cgit v1.2.3