New shared_mutex

Experimental sync utils New semaphore<> New cond_variable New owned_mutex
RPCS3 · Jan 24, 2017 · 1c14d87 · 1c14d87
1 parent 98fc131
commit 1c14d87
Show file tree

Hide file tree

Showing 20 changed files with 940 additions and 543 deletions.
diff --git a/Utilities/Atomic.h b/Utilities/Atomic.h
@@ -300,21 +300,24 @@ struct atomic_storage<T, 2> : atomic_storage<T, 0>
 	static inline bool bts(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btsw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ushort _bit = (ushort)bit;
+		__asm__("lock btsw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 
 	static inline bool btr(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btrw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ushort _bit = (ushort)bit;
+		__asm__("lock btrw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 
 	static inline bool btc(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btcw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ushort _bit = (ushort)bit;
+		__asm__("lock btcw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 #endif
@@ -498,21 +501,24 @@ struct atomic_storage<T, 8> : atomic_storage<T, 0>
 	static inline bool bts(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btsq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ullong _bit = bit;
+		__asm__("lock btsq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 
 	static inline bool btr(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btrq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ullong _bit = bit;
+		__asm__("lock btrq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 
 	static inline bool btc(T& dest, uint bit)
 	{
 		bool result;
-		__asm__("lock btcq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
+		ullong _bit = bit;
+		__asm__("lock btcq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
 		return result;
 	}
 #endif

diff --git a/Utilities/File.cpp b/Utilities/File.cpp
@@ -1,6 +1,6 @@
 #include "File.h"
+#include "mutex.h"
 #include "StrFmt.h"
-#include "SharedMutex.h"
 #include "BEType.h"
 #include "Crypto/sha1.h"
 

diff --git a/Utilities/Semaphore.cpp b/Utilities/Semaphore.cpp
diff --git a/Utilities/Semaphore.h b/Utilities/Semaphore.h
diff --git a/Utilities/SharedMutex.cpp b/Utilities/SharedMutex.cpp