yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 15:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_defs: Simplify CPUTLB padding logic

Browse source 
There was a complicated subtractive arithmetic for determining the
padding on the CPUTLBEntry structure. Simplify this with a union.

Backports commit b4a4b8d0e0767c85946fd8fc404643bf5766351a from qemu
This commit is contained in:
Peter Crosthwaite 2018-02-14 21:34:38 -05:00 committed by Lioncash
parent 88f7e01d44
commit 590c3dbb76
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
qemu/include/exec/cpu-defs.h
View file

@ -105,36 +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
*/ */
target_ulong addr_read; union {
target_ulong addr_write; struct {
target_ulong addr_code; target_ulong addr_read;
/* Addend to virtual address to get host address. IO accesses target_ulong addr_write;
use the corresponding iotlb value. */ target_ulong addr_code;
uintptr_t addend; /* Addend to virtual address to get host address. IO accesses
/* padding to get a power of two size */ use the corresponding iotlb value. */
uintptr_t addend;
#ifdef _MSC_VER };
# define TARGET_ULONG_SIZE (TARGET_LONG_BITS/8) /* padding to get a power of two size */
# ifdef _WIN64 uint8_t dummy[1 << CPU_TLB_ENTRY_BITS];
# define UINTPTR_SIZE 8 };
# else
# define UINTPTR_SIZE 4
# endif
#define DUMMY_SIZE (1 << CPU_TLB_ENTRY_BITS) - \
(TARGET_ULONG_SIZE * 3 + \
((-TARGET_ULONG_SIZE * 3) & (UINTPTR_SIZE - 1)) + \
UINTPTR_SIZE)
#if DUMMY_SIZE > 0
uint8_t dummy[DUMMY_SIZE];
#endif
#else // _MSC_VER
uint8_t dummy[(1 << CPU_TLB_ENTRY_BITS) -
(sizeof(target_ulong) * 3 +
((-sizeof(target_ulong) * 3) & (sizeof(uintptr_t) - 1)) +
sizeof(uintptr_t))];
#endif // _MSC_VER
} CPUTLBEntry; } CPUTLBEntry;
QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS)); QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));