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 ARM

This commit is contained in:
Ryan Houdek 2013-04-12 20:19:42 +00:00
parent 6d9c0c8863
commit 62adcaf552
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
View File

@ -33,6 +33,7 @@ using namespace ArmGen;
{ {
ARMXEmitter emit(location); ARMXEmitter emit(location);
emit.B(address); emit.B(address);
emit.FlushIcache();
} }
void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address) void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address)
{ {
@ -41,6 +42,7 @@ using namespace ArmGen;
emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher); emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher);
emit.STR(R11, R9, PPCSTATE_OFF(pc)); emit.STR(R11, R9, PPCSTATE_OFF(pc));
emit.B(R12); emit.B(R12);
emit.FlushIcache();
} }

9
Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
View File

@ -50,33 +50,32 @@ static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress)
bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store) bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store)
{ {
u8 op = (inst >> 20) & 0xFF; u8 op = (inst >> 20) & 0xFF;
printf("op: 0x%08x\n", op);
switch (op) switch (op)
{ {
case 0x58: // STR case 0x58: // STR
{ {
rD = (ARMReg)((inst >> 16) & 0xF); rD = (ARMReg)((inst >> 12) & 0xF);
Store = true; Store = true;
accessSize = 32; accessSize = 32;
} }
break; break;
case 0x59: // LDR case 0x59: // LDR
{ {
rD = (ARMReg)((inst >> 16) & 0xF); rD = (ARMReg)((inst >> 12) & 0xF);
Store = false; Store = false;
accessSize = 32; accessSize = 32;
} }
break; break;
case 0x05: // LDRH case 0x05: // LDRH
{ {
rD = (ARMReg)((inst >> 16) & 0xF); rD = (ARMReg)((inst >> 12) & 0xF);
Store = false; Store = false;
accessSize = 16; accessSize = 16;
} }
break; break;
case 0x45 + 0x18: // LDRB case 0x45 + 0x18: // LDRB
{ {
rD = (ARMReg)((inst >> 16) & 0xF); rD = (ARMReg)((inst >> 12) & 0xF);
Store = false; Store = false;
accessSize = 8; accessSize = 8;
} }

2
Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
View File

@ -34,7 +34,7 @@
#ifdef ANDROID #ifdef ANDROID
#define FASTMEM 0 #define FASTMEM 0
#else #else
#define FASTMEM 0 #define FASTMEM 1
#endif #endif
void JitArm::stw(UGeckoInstruction inst) void JitArm::stw(UGeckoInstruction inst)
{ {