Refactor fastmem/trampoline code to avoid reading back the generated …

…instructions.
dolphin-emu · Feb 4, 2016 · 3dd3018 · 3dd3018
1 parent ff3b84f
commit 3dd3018
Show file tree

Hide file tree

Showing 20 changed files with 332 additions and 875 deletions.
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
@@ -28,7 +28,6 @@ set(SRCS BreakPoints.cpp
          TraversalClient.cpp
          Version.cpp
          x64ABI.cpp
-         x64Analyzer.cpp
          x64Emitter.cpp
          Crypto/bn.cpp
          Crypto/ec.cpp

diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
@@ -129,7 +129,6 @@
     <ClInclude Include="TraversalClient.h" />
     <ClInclude Include="TraversalProto.h" />
     <ClInclude Include="x64ABI.h" />
-    <ClInclude Include="x64Analyzer.h" />
     <ClInclude Include="x64Emitter.h" />
     <ClInclude Include="Crypto\bn.h" />
     <ClInclude Include="Crypto\ec.h" />
@@ -173,7 +172,6 @@
     <ClCompile Include="ucrtFreadWorkaround.cpp" />
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="x64ABI.cpp" />
-    <ClCompile Include="x64Analyzer.cpp" />
     <ClCompile Include="x64CPUDetect.cpp" />
     <ClCompile Include="x64Emitter.cpp" />
     <ClCompile Include="x64FPURoundMode.cpp" />

diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
@@ -62,7 +62,6 @@
     <ClInclude Include="Thread.h" />
     <ClInclude Include="Timer.h" />
     <ClInclude Include="x64ABI.h" />
-    <ClInclude Include="x64Analyzer.h" />
     <ClInclude Include="x64Emitter.h" />
     <ClInclude Include="Logging\ConsoleListener.h">
       <Filter>Logging</Filter>
@@ -243,7 +242,6 @@
     <ClCompile Include="Timer.cpp" />
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="x64ABI.cpp" />
-    <ClCompile Include="x64Analyzer.cpp" />
     <ClCompile Include="x64CPUDetect.cpp" />
     <ClCompile Include="x64Emitter.cpp" />
     <ClCompile Include="x64FPURoundMode.cpp" />

diff --git a/Source/Core/Common/x64Analyzer.cpp b/Source/Core/Common/x64Analyzer.cpp
diff --git a/Source/Core/Common/x64Analyzer.h b/Source/Core/Common/x64Analyzer.h
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
@@ -889,8 +889,14 @@ void XEmitter::WriteMOVBE(int bits, u8 op, X64Reg reg, const 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, X64Reg dst, const OpArg& src, bool sign_extend)
+void XEmitter::LoadAndSwap(int size, X64Reg dst, const OpArg& src, bool sign_extend, MovInfo* info)
 {
+	if (info)
+	{
+		info->address = GetWritableCodePtr();
+		info->nonAtomicSwapStore = false;
+	}
+
 	switch (size)
 	{
 	case 8:
@@ -926,23 +932,30 @@ void XEmitter::LoadAndSwap(int size, X64Reg dst, const OpArg& src, bool sign_ext
 	}
 }
 
-u8* XEmitter::SwapAndStore(int size, const OpArg& dst, X64Reg src)
+void XEmitter::SwapAndStore(int size, const OpArg& dst, X64Reg src, MovInfo* info)
 {
-	u8* mov_location = GetWritableCodePtr();
 	if (cpu_info.bMOVBE)
 	{
+		if (info)
+		{
+			info->address = GetWritableCodePtr();
+			info->nonAtomicSwapStore = false;
+		}
 		MOVBE(size, dst, src);
 	}
 	else
 	{
 		BSWAP(size, src);
-		mov_location = GetWritableCodePtr();
+		if (info)
+		{
+			info->address = GetWritableCodePtr();
+			info->nonAtomicSwapStore = true;
+			info->nonAtomicSwapStoreSrc = src;
+		}
 		MOV(size, dst, R(src));
 	}
-	return mov_location;
 }
 
-
 void XEmitter::LEA(int bits, X64Reg dest, OpArg src)
 {
 	_assert_msg_(DYNA_REC, !src.IsImm(), "LEA - Imm argument");