mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

{a32,a64}_emit_x64_memory: Ensure return value of fastmem callback are zero-extended

Browse source
This commit is contained in:
merry 2022-02-27 19:54:35 +00:00
parent dc3e70c552
commit 6c4fa780e0
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dynarmic/backend/x64/a32_emit_x64_memory.cpp
View file

@ -53,6 +53,7 @@ void A32EmitX64::GenFastmemFallbacks() {
code.mov(Xbyak::Reg64{value_idx}, code.ABI_RETURN); code.mov(Xbyak::Reg64{value_idx}, code.ABI_RETURN);
} }
ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocRegIdx(value_idx)); ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocRegIdx(value_idx));
code.ZeroExtendFrom(bitsize, Xbyak::Reg64{value_idx});
code.ret(); code.ret();
PerfMapRegister(read_fallbacks[std::make_tuple(bitsize, vaddr_idx, value_idx)], code.getCurr(), fmt::format("a32_read_fallback_{}", bitsize)); PerfMapRegister(read_fallbacks[std::make_tuple(bitsize, vaddr_idx, value_idx)], code.getCurr(), fmt::format("a32_read_fallback_{}", bitsize));
} }

1
src/dynarmic/backend/x64/a64_emit_x64_memory.cpp
View file

@ -141,6 +141,7 @@ void A64EmitX64::GenFastmemFallbacks() {
code.mov(Xbyak::Reg64{value_idx}, code.ABI_RETURN); code.mov(Xbyak::Reg64{value_idx}, code.ABI_RETURN);
} }
ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocRegIdx(value_idx)); ABI_PopCallerSaveRegistersAndAdjustStackExcept(code, HostLocRegIdx(value_idx));
code.ZeroExtendFrom(bitsize, Xbyak::Reg64{value_idx});
code.ret(); code.ret();
PerfMapRegister(read_fallbacks[std::make_tuple(bitsize, vaddr_idx, value_idx)], code.getCurr(), fmt::format("a64_read_fallback_{}", bitsize)); PerfMapRegister(read_fallbacks[std::make_tuple(bitsize, vaddr_idx, value_idx)], code.getCurr(), fmt::format("a64_read_fallback_{}", bitsize));
} }

18
src/dynarmic/backend/x64/block_of_code.h
View file

@ -96,6 +96,24 @@ public:
CallFunction(Common::FptrCast(l)); CallFunction(Common::FptrCast(l));
} }
void ZeroExtendFrom(size_t bitsize, Xbyak::Reg64 reg) {
switch (bitsize) {
case 8:
movzx(reg.cvt32(), reg.cvt8());
return;
case 16:
movzx(reg.cvt32(), reg.cvt16());
return;
case 32:
mov(reg.cvt32(), reg.cvt32());
return;
case 64:
return;
default:
UNREACHABLE();
}
}
Xbyak::Address MConst(const Xbyak::AddressFrame& frame, u64 lower, u64 upper = 0); Xbyak::Address MConst(const Xbyak::AddressFrame& frame, u64 lower, u64 upper = 0);
/// Far code sits far away from the near code. Execution remains primarily in near code. /// Far code sits far away from the near code. Execution remains primarily in near code.