From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2UQ-0002sJ-Vg for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZD2UM-0005HN-1C for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:27:10 -0400 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]:34266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2UL-0005Gm-QE for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:27:05 -0400 Received: by pdbep18 with SMTP id ep18so156604052pdb.1 for ; Wed, 08 Jul 2015 20:27:04 -0700 (PDT) From: Peter Crosthwaite Date: Wed, 8 Jul 2015 20:26:53 -0700 Message-Id: <1436412413-27389-1-git-send-email-crosthwaite.peter@gmail.com> Subject: [Qemu-devel] [PATCH v2] cpu_defs: Simplify CPUTLB padding logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, 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 --- Changed since v1: Remove un-needed anonymous union (Paolo review) --- include/exec/cpu-defs.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 98b9cff..c6828cc 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -98,24 +98,23 @@ typedef uint64_t target_ulong; #define CPU_TLB_SIZE (1 << CPU_TLB_BITS) -typedef struct CPUTLBEntry { +typedef union CPUTLBEntry { /* bit TARGET_LONG_BITS to TARGET_PAGE_BITS : virtual address bit TARGET_PAGE_BITS-1..4 : Nonzero for accesses that should not go directly to ram. 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; + 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) - - (sizeof(target_ulong) * 3 + - ((-sizeof(target_ulong) * 3) & (sizeof(uintptr_t) - 1)) + - sizeof(uintptr_t))]; + uint8_t dummy[1 << CPU_TLB_ENTRY_BITS]; } CPUTLBEntry; QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS)); -- 1.9.1