From 810a04db58ca32570983f7ff1a2980134aebebc7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 28 May 2015 21:50:39 -0400 Subject: [PATCH] x64Emitter: Remove 'Gen::' namespace prefix from some parameters The emitter is already within the Gen namespace, so this isn't necessary. --- Source/Core/Common/x64Emitter.cpp | 4 ++-- Source/Core/Common/x64Emitter.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 538604a1d8..ec0f61cdb7 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -886,7 +886,7 @@ void XEmitter::WriteMOVBE(int bits, u8 op, X64Reg reg, OpArg arg) void XEmitter::MOVBE(int bits, X64Reg dest, const OpArg& src) {WriteMOVBE(bits, 0xF0, dest, src);} void XEmitter::MOVBE(int bits, const OpArg& dest, X64Reg src) {WriteMOVBE(bits, 0xF1, src, dest);} -void XEmitter::LoadAndSwap(int size, Gen::X64Reg dst, const Gen::OpArg& src) +void XEmitter::LoadAndSwap(int size, X64Reg dst, const OpArg& src) { if (cpu_info.bMOVBE) { @@ -899,7 +899,7 @@ void XEmitter::LoadAndSwap(int size, Gen::X64Reg dst, const Gen::OpArg& src) } } -void XEmitter::SwapAndStore(int size, const Gen::OpArg& dst, Gen::X64Reg src) +void XEmitter::SwapAndStore(int size, const OpArg& dst, X64Reg src) { if (cpu_info.bMOVBE) { diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index 88c73d364d..b93df86d55 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -503,8 +503,8 @@ public: // Available only on Atom or >= Haswell so far. Test with cpu_info.bMOVBE. void MOVBE(int bits, X64Reg dest, const OpArg& src); void MOVBE(int bits, const OpArg& dest, X64Reg src); - void LoadAndSwap(int size, Gen::X64Reg dst, const Gen::OpArg& src); - void SwapAndStore(int size, const Gen::OpArg& dst, Gen::X64Reg src); + void LoadAndSwap(int size, X64Reg dst, const OpArg& src); + void SwapAndStore(int size, const OpArg& dst, X64Reg src); // Available only on AMD >= Phenom or Intel >= Haswell void LZCNT(int bits, X64Reg dest, OpArg src); @@ -931,7 +931,7 @@ public: void ABI_CallFunctionRR(const void* func, X64Reg reg1, X64Reg reg2); // Helper method for the above, or can be used separately. - void MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, s32 offset, Gen::X64Reg dst2, Gen::X64Reg src2); + void MOVTwo(int bits, X64Reg dst1, X64Reg src1, s32 offset, X64Reg dst2,X64Reg src2); // Saves/restores the registers and adjusts the stack to be aligned as // required by the ABI, where the previous alignment was as specified.