ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x64 rec: wrong arg0 reg for windows. need to handle 512mb addr space

This commit is contained in:
Flyinghead 2021-03-29 17:30:56 +02:00
parent a7d8d31566
commit a5eecf59b3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/rec-x64/rec_x64.cpp
View File

@ -768,7 +768,14 @@ public:
//found !
const u8 *start = getCurr();
if (op == MemOp::W && size >= MemSize::S32 && (context.rdi >> 26) == 0x38)
u32 memAddress = _nvmem_4gb_space() ?
#ifdef _WIN32
context.rcx
#else
context.rdi
#endif
: context.r9;
if (op == MemOp::W && size >= MemSize::S32 && (memAddress >> 26) == 0x38)
call(MemHandlers[MemType::StoreQueue][size][MemOp::W]);
else
call(MemHandlers[MemType::Slow][size][op]);
@ -782,9 +789,9 @@ public:
if (!_nvmem_4gb_space())
//restore the addr from r9 to arg0 (rcx or rdi) so it's valid again
#ifdef _WIN32
context.rcx = context.r9;
context.rcx = memAddress;
#else
context.rdi = context.r9;
context.rdi = memAddress;
#endif
return true;