Merge branch 'master' into d3d12
This commit is contained in:
commit
55fa9e6917
|
@ -188,8 +188,9 @@ void* X64CodeCache::PlaceGuestCode(uint32_t guest_address, void* machine_code,
|
||||||
std::memcpy(code_address, machine_code, code_size);
|
std::memcpy(code_address, machine_code, code_size);
|
||||||
|
|
||||||
// Fill unused slots with 0xCC
|
// Fill unused slots with 0xCC
|
||||||
std::memset(code_address + code_size, 0xCC,
|
std::memset(
|
||||||
xe::round_up(code_size, 16) - code_size);
|
code_address + code_size, 0xCC,
|
||||||
|
xe::round_up(code_size + unwind_reservation.data_size, 16) - code_size);
|
||||||
|
|
||||||
// Notify subclasses of placed code.
|
// Notify subclasses of placed code.
|
||||||
PlaceCode(guest_address, machine_code, code_size, stack_size, code_address,
|
PlaceCode(guest_address, machine_code, code_size, stack_size, code_address,
|
||||||
|
|
Loading…
Reference in New Issue