From 834cc3f2c50ecceb02bdb7bb0833c10bb8fab69c Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 27 Nov 2015 09:17:51 +0100 Subject: [PATCH] core|x86emitter: port basic jump instruction --- common/include/x86emitter/legacy_instructions.h | 4 ---- common/src/x86emitter/legacy.cpp | 12 ------------ pcsx2/x86/sVU_zerorec.cpp | 6 +++--- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/common/include/x86emitter/legacy_instructions.h b/common/include/x86emitter/legacy_instructions.h index 670a3b6a4f..ebd126a14a 100644 --- a/common/include/x86emitter/legacy_instructions.h +++ b/common/include/x86emitter/legacy_instructions.h @@ -45,10 +45,6 @@ ATTR_DEP extern u8* JMP8( u8 to ); // jmp rel32 ATTR_DEP extern u32* JMP32( uptr to ); -// jmp r32 (r64 if __x86_64__) -ATTR_DEP extern void JMPR( x86IntRegType to ); -// jmp m32 -ATTR_DEP extern void JMP32M( uptr to ); // jp rel8 ATTR_DEP extern u8* JP8( u8 to ); diff --git a/common/src/x86emitter/legacy.cpp b/common/src/x86emitter/legacy.cpp index 0a7b3e6ef9..1bd5c4e859 100644 --- a/common/src/x86emitter/legacy.cpp +++ b/common/src/x86emitter/legacy.cpp @@ -169,18 +169,6 @@ emitterT u32* JMP32( uptr to ) return (u32*)(x86Ptr - 4 ); } -/* jmp r32/r64 */ -emitterT void JMPR( x86IntRegType to ) -{ - xJMP( xRegister32(to) ); -} - -// jmp m32 -emitterT void JMP32M( uptr to ) -{ - xJMP( ptr32[(u32*)to] ); -} - /* jp rel8 */ emitterT u8* JP8( u8 to ) { return J8Rel( 0x7A, to ); diff --git a/pcsx2/x86/sVU_zerorec.cpp b/pcsx2/x86/sVU_zerorec.cpp index 3f857990f0..6c3668f3d7 100644 --- a/pcsx2/x86/sVU_zerorec.cpp +++ b/pcsx2/x86/sVU_zerorec.cpp @@ -3113,9 +3113,9 @@ void VuBaseBlock::Recompile() SuperVUTestVU0Condition(0); if (s_JumpX86 == -1) - JMP32M((uptr)&g_recWriteback); + xJMP(ptr32[&g_recWriteback]); else - JMPR(s_JumpX86); + xJMP(xRegister32(s_JumpX86)); break; case 4: // jalr @@ -3132,7 +3132,7 @@ void VuBaseBlock::Recompile() // already onto stack xCALL((void*)(uptr)SuperVUGetProgram); xADD(esp, 8); - JMPR(EAX); + xJMP(eax); break; }