From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBr9t-0003Dq-OQ for qemu-devel@nongnu.org; Sun, 05 Jul 2015 17:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBr9o-0008Lk-6W for qemu-devel@nongnu.org; Sun, 05 Jul 2015 17:09:05 -0400 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:36745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBr9n-0008Le-Vq for qemu-devel@nongnu.org; Sun, 05 Jul 2015 17:09:00 -0400 Received: by pddu5 with SMTP id u5so6029015pdd.3 for ; Sun, 05 Jul 2015 14:08:59 -0700 (PDT) From: Peter Crosthwaite Date: Sun, 5 Jul 2015 14:08:53 -0700 Message-Id: <1436130533-18565-1-git-send-email-crosthwaite.peter@gmail.com> Subject: [Qemu-devel] [PATCH] cpu_defs: Simplify CPUTLB padding logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , rth@twiddle.net There was a complicated subtractive arithmetic for determining the padding on the CPUTLBEntry structure. Simplify this with a union. Signed-off-by: Peter Crosthwaite --- include/exec/cpu-defs.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 98b9cff..5093be2 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -105,17 +105,18 @@ typedef struct CPUTLBEntry { bit 3 : indicates that the entry is invalid bit 2..0 : zero */ - target_ulong addr_read; - target_ulong addr_write; - target_ulong addr_code; - /* Addend to virtual address to get host address. IO accesses - use the corresponding iotlb value. */ - uintptr_t addend; - /* padding to get a power of two size */ - uint8_t dummy[(1 << CPU_TLB_ENTRY_BITS) - - (sizeof(target_ulong) * 3 + - ((-sizeof(target_ulong) * 3) & (sizeof(uintptr_t) - 1)) + - sizeof(uintptr_t))]; + union { + struct { + target_ulong addr_read; + target_ulong addr_write; + target_ulong addr_code; + /* Addend to virtual address to get host address. IO accesses + use the corresponding iotlb value. */ + uintptr_t addend; + }; + /* padding to get a power of two size */ + uint8_t dummy[1 << CPU_TLB_ENTRY_BITS]; + }; } CPUTLBEntry; QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS)); -- 1.9.1