cpu_defs: Simplify CPUTLB padding logic
There was a complicated subtractive arithmetic for determining the padding on the CPUTLBEntry structure. Simplify this with a union. Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Message-Id: <1436130533-18565-1-git-send-email-crosthwaite.peter@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
02d57ea115
commit
b4a4b8d0e0
|
@ -105,17 +105,18 @@ typedef struct CPUTLBEntry {
|
||||||
bit 3 : indicates that the entry is invalid
|
bit 3 : indicates that the entry is invalid
|
||||||
bit 2..0 : zero
|
bit 2..0 : zero
|
||||||
*/
|
*/
|
||||||
|
union {
|
||||||
|
struct {
|
||||||
target_ulong addr_read;
|
target_ulong addr_read;
|
||||||
target_ulong addr_write;
|
target_ulong addr_write;
|
||||||
target_ulong addr_code;
|
target_ulong addr_code;
|
||||||
/* Addend to virtual address to get host address. IO accesses
|
/* Addend to virtual address to get host address. IO accesses
|
||||||
use the corresponding iotlb value. */
|
use the corresponding iotlb value. */
|
||||||
uintptr_t addend;
|
uintptr_t addend;
|
||||||
|
};
|
||||||
/* padding to get a power of two size */
|
/* padding to get a power of two size */
|
||||||
uint8_t dummy[(1 << CPU_TLB_ENTRY_BITS) -
|
uint8_t dummy[1 << CPU_TLB_ENTRY_BITS];
|
||||||
(sizeof(target_ulong) * 3 +
|
};
|
||||||
((-sizeof(target_ulong) * 3) & (sizeof(uintptr_t) - 1)) +
|
|
||||||
sizeof(uintptr_t))];
|
|
||||||
} CPUTLBEntry;
|
} CPUTLBEntry;
|
||||||
|
|
||||||
QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));
|
QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));
|
||||||
|
|
Loading…
Reference in a new issue