Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make the VFPU jit use far jumps for memory access.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-01-26 23:08:19 -08:00
parent 2a2f8e6225
commit a89d61463e
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/MIPS/x86/CompVFPU.cpp
View file

@ -158,6 +158,7 @@ void Jit::Comp_SVQ(u32 op)
fpr.MapRegsV(vregs, V_Quad, MAP_DIRTY | MAP_NOINIT);
JitSafeMem safe(this, rs, imm);
safe.SetFar();
OpArg src;
if (safe.PrepareRead(src))
{
@ -191,6 +192,7 @@ void Jit::Comp_SVQ(u32 op)
fpr.MapRegsV(vregs, V_Quad, 0);
JitSafeMem safe(this, rs, imm);
safe.SetFar();
OpArg dest;
if (safe.PrepareWrite(dest))
{

10
Core/MIPS/x86/Jit.cpp
View file

@ -305,6 +305,14 @@ bool Jit::CheckJitBreakpoint(u32 addr, int downcountOffset)
Jit::JitSafeMem::JitSafeMem(Jit *jit, int raddr, s32 offset)
: jit_(jit), raddr_(raddr), offset_(offset), needsCheck_(false), needsSkip_(false)
{
// This makes it more instructions, so let's play it safe and say we need a far jump.
far_ = !g_Config.bIgnoreBadMemAccess;
}
void Jit::JitSafeMem::SetFar()
{
_dbg_assert_msg_(JIT, !needsSkip_, "Sorry, you need to call SetFar() earlier.");
far_ = true;
}
bool Jit::JitSafeMem::PrepareWrite(OpArg &dest)
@ -420,7 +428,7 @@ OpArg Jit::JitSafeMem::PrepareMemoryOpArg()
void Jit::JitSafeMem::PrepareSlowAccess()
{
// Skip the fast path (which the caller wrote just now.)
skip_ = jit_->J();
skip_ = jit_->J(far_);
needsSkip_ = true;
jit_->SetJumpTarget(tooLow_);
jit_->SetJumpTarget(tooHigh_);

9
Core/MIPS/x86/Jit.h
View file

@ -201,14 +201,16 @@ private:
// Emit code for a slow read call, and returns true if result is in EAX.
bool PrepareSlowRead(void *safeFunc);
// Cleans up final code for the memory access.
void Finish();
// Use this before anything else if you're gonna use the below.
void SetFar();
// WARNING: Only works for non-GPR. Do not use for reads into GPR.
OpArg NextFastAddress(int suboffset);
// WARNING: Only works for non-GPR. Do not use for reads into GPR.
void NextSlowRead(void *safeFunc, int suboffset);
// Cleans up final code for the memory access.
void Finish();
private:
OpArg PrepareMemoryOpArg();
void PrepareSlowAccess();
@ -218,6 +220,7 @@ private:
s32 offset_;
bool needsCheck_;
bool needsSkip_;
bool far_;
X64Reg xaddr_;
FixupBranch tooLow_, tooHigh_, skip_;
const u8 *safe_;