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

Fix Fastmem on CPUs without MOVBE 

The problem was that when BSWAP was used, UnsafeWriteRegToReg() returned
the address of that instead of the MOV.
This commit is contained in:
Tillmann Karras 2014-04-25 01:11:52 +02:00
parent 47373af9d9
commit 886c887e80
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/x64Analyzer.cpp
View File

@ -154,6 +154,7 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
info->immediate = *(u32*)codePtr;
codePtr += 4;
break;
case 8:
info->zeroExtend = true;
info->immediate = *(u32*)codePtr;

14
Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
View File

@ -428,13 +428,23 @@ u8 *EmuCodeBlock::UnsafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acc
}
#if _M_X86_64
result = GetWritableCodePtr();
OpArg dest = MComplex(RBX, reg_addr, SCALE_1, offset);
if (swap)
{
SwapAndStore(accessSize, MComplex(RBX, reg_addr, SCALE_1, offset), reg_value);
if (cpu_info.bMOVBE)
{
MOVBE(accessSize, dest, R(reg_value));
}
else
{
MOV(accessSize, MComplex(RBX, reg_addr, SCALE_1, offset), R(reg_value));
BSWAP(accessSize, reg_value);
result = GetWritableCodePtr();
MOV(accessSize, dest, R(reg_value));
}
}
else
{
MOV(accessSize, dest, R(reg_value));
}
#else
if (swap)