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

JitArm64: Fix dcbz. 

This fixes the hidden wall in xenoblade.
This commit is contained in:
degasus 2017-01-23 00:23:26 +01:00
parent ba5c3f4c46
commit a19993c2a0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
View File

@ -672,7 +672,7 @@ void JitArm64::dcbz(UGeckoInstruction inst)
{ {
// full imm_addr // full imm_addr
u32 imm_addr = gpr.GetImm(b) + gpr.GetImm(a); u32 imm_addr = gpr.GetImm(b) + gpr.GetImm(a);
MOVI2R(addr_reg, imm_addr); MOVI2R(addr_reg, imm_addr & ~31);
} }
else if (is_imm_a || is_imm_b) else if (is_imm_a || is_imm_b)
{ {
@ -680,11 +680,13 @@ void JitArm64::dcbz(UGeckoInstruction inst)
ARM64Reg base = is_imm_a ? gpr.R(b) : gpr.R(a); ARM64Reg base = is_imm_a ? gpr.R(b) : gpr.R(a);
u32 imm_offset = is_imm_a ? gpr.GetImm(a) : gpr.GetImm(b); u32 imm_offset = is_imm_a ? gpr.GetImm(a) : gpr.GetImm(b);
ADDI2R(addr_reg, base, imm_offset, addr_reg); ADDI2R(addr_reg, base, imm_offset, addr_reg);
ANDI2R(addr_reg, addr_reg, ~31);
} }
else else
{ {
// Both are registers // Both are registers
ADD(addr_reg, gpr.R(a), gpr.R(b)); ADD(addr_reg, gpr.R(a), gpr.R(b));
ANDI2R(addr_reg, addr_reg, ~31);
} }
} }
else else
@ -693,11 +695,11 @@ void JitArm64::dcbz(UGeckoInstruction inst)
if (gpr.IsImm(b)) if (gpr.IsImm(b))
{ {
u32 imm_addr = gpr.GetImm(b); u32 imm_addr = gpr.GetImm(b);
MOVI2R(addr_reg, imm_addr); MOVI2R(addr_reg, imm_addr & ~31);
} }
else else
{ {
MOV(addr_reg, gpr.R(b)); ANDI2R(addr_reg, gpr.R(b), ~31);
} }
} }