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

cputlb: cast size_t to target_ulong before using for address masks

Browse Source 
While size_t is defined to happily access the biggest host object this
isn't the case when generating masks for 64 bit guests on 32 bit
hosts. Otherwise we end up truncating the address when we fall back to
our unaligned helper.

Fixes: https://bugs.launchpad.net/qemu/+bug/1831545

Backports commit ab7a2009df66241a3742cbdfe8f9a1f66c6af21f from qemu
This commit is contained in:
Alex Bennée 2019-06-13 16:06:59 -04:00 committed by Lioncash
parent 9aef73f5fb
commit 938f8465a0
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu/accel/tcg/cputlb.c
View File

@ -1088,7 +1088,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
uint64_t r1, r2;
unsigned shift;
do_unaligned_access:
addr1 = addr & ~(size - 1);
addr1 = addr & ~((target_ulong)size - 1);
addr2 = addr1 + size;
r1 = full_load(env, addr1, oi, retaddr);
r2 = full_load(env, addr2, oi, retaddr);