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

Merge pull request #1542 from Sonicadvance1/armv7-fixes 

Reenables the ARMv7 FPR cache + minor ARMv7 things.
This commit is contained in:
Ryan Houdek 2014-11-14 09:25:32 -06:00
parent 00f4217382 eb7543d139
commit be44fdf0ec
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -153,9 +153,7 @@ if(NOT ENABLE_GENERIC)
set(_M_ARM 1) set(_M_ARM 1)
set(_M_ARM_32 1) set(_M_ARM_32 1)
add_definitions(-D_M_ARM=1 -D_M_ARM_32=1) add_definitions(-D_M_ARM=1 -D_M_ARM_32=1)
if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a") add_definitions(-marm -march=armv7-a)
add_definitions(-marm -march=armv7-a)
endif()
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
# This option only applies to 64bit ARM # This option only applies to 64bit ARM
set(_M_ARM 1) set(_M_ARM 1)

1
Source/Core/Core/PowerPC/JitArm32/Jit.cpp
View File

@ -444,7 +444,6 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
BKPT(0x7777); BKPT(0x7777);
} }
JitArmTables::CompileInstruction(ops[i]); JitArmTables::CompileInstruction(ops[i]);
fpr.Flush();
if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) if (js.memcheck && (opinfo->flags & FL_LOADSTORE))
{ {
// Don't do this yet // Don't do this yet

5
Source/Core/Core/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
View File

@ -27,6 +27,7 @@ void JitArm::fctiwx(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITFloatingPointOff); JITDISABLE(bJITFloatingPointOff);
FALLBACK_IF(true);
u32 b = inst.FB; u32 b = inst.FB;
u32 d = inst.FD; u32 d = inst.FD;
@ -134,6 +135,8 @@ void JitArm::fctiwzx(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITFloatingPointOff); JITDISABLE(bJITFloatingPointOff);
FALLBACK_IF(true);
u32 b = inst.FB; u32 b = inst.FB;
u32 d = inst.FD; u32 d = inst.FD;
@ -493,6 +496,8 @@ void JitArm::frsqrtex(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITPairedOff); JITDISABLE(bJITPairedOff);
FALLBACK_IF(true);
FALLBACK_IF(inst.Rc); FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD; u32 b = inst.FB, d = inst.FD;

5
Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
View File

@ -134,7 +134,7 @@ void JitArm::lfXX(UGeckoInstruction inst)
if (update) if (update)
MOV(RA, rB); MOV(RA, rB);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem) if (false)
{ {
Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK) Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK)
BIC(rB, rB, mask); // 1 BIC(rB, rB, mask); // 1
@ -301,7 +301,8 @@ void JitArm::stfXX(UGeckoInstruction inst)
MOV(RA, rB); MOV(RA, rB);
SetCC(); SetCC();
} }
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem)
if (false)
{ {
Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK) Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK)
BIC(rB, rB, mask); // 1 BIC(rB, rB, mask); // 1

2
Source/Core/Core/PowerPC/JitArm32/JitArm_Paired.cpp
View File

@ -21,6 +21,8 @@ void JitArm::ps_rsqrte(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(bJITPairedOff); JITDISABLE(bJITPairedOff);
FALLBACK_IF(true);
FALLBACK_IF(inst.Rc); FALLBACK_IF(inst.Rc);
u32 b = inst.FB, d = inst.FD; u32 b = inst.FB, d = inst.FD;