be_t<> constructor elimination

Utilities/BEType.h

@@ -63,24 +63,6 @@ class be_t
 
 public:
 	typedef T type;
-
-#ifdef _WIN32
-	be_t(){}
-#else
-	be_t()	noexcept = default;
-#endif
-
-	be_t(const be_t<T,size>& value) = default;
-	be_t(const T& value)
-	{
-		FromLE(value);
-	}
-
-	template<typename T1>
-	explicit be_t(const be_t<T1>& value)
-	{
-		FromBE(value.ToBE());
-	}
 	
 	const T& ToBE() const
 	{
@@ -130,7 +112,18 @@ public:
 	operator const be_t<T1>() const
 	{
 		be_t<T1> res;
-		res.FromBE(ToBE());
+		if (sizeof(T1) < sizeof(T))
+		{
+			res.FromBE(ToBE() >> ((sizeof(T)-sizeof(T1)) * 8));
+		}
+		else if (sizeof(T1) > sizeof(T))
+		{
+			res.FromBE((T1)ToBE() << ((sizeof(T1)-sizeof(T)) * 8));
+		}
+		else
+		{
+			res.FromBE(ToBE());
+		}
 		return res;
 	}
 

Utilities/SMutex.cpp

@@ -36,5 +36,5 @@ __forceinline u32 SM_GetCurrentCPUThreadId()
 
 __forceinline be_t<u32> SM_GetCurrentCPUThreadIdBE()
 {
-	return SM_GetCurrentCPUThreadId();
+	return be_t<u32>::MakeFromLE(SM_GetCurrentCPUThreadId());
 }

Utilities/SMutex.h

@@ -22,8 +22,8 @@ enum SMutexResult
 template
 <
 	typename T,
-	u64 free_value = 0,
-	u64 dead_value = 0xffffffff,
+	const u64 free_value = 0,
+	const u64 dead_value = 0xffffffffffffffffull,
 	void (*wait)() = SM_Sleep
 >
 class SMutexBase
@@ -32,20 +32,26 @@ class SMutexBase
 	std::atomic<T> owner;
 
 public:
-	SMutexBase()
-		: owner((T)free_value)
+	static const T GetFreeValue()
 	{
+		static const u64 value = free_value;
+		return (const T&)value;
+	}
+
+	static const T GetDeadValue()
+	{
+		static const u64 value = dead_value;
+		return (const T&)value;
 	}
 
 	void initialize()
 	{
-		(T&)owner = free_value;
+		owner = GetFreeValue();
 	}
 
-	~SMutexBase()
+	void finalize()
 	{
-		lock((T)dead_value);
-		owner = (T)dead_value;
+		owner = GetDeadValue();
 	}
 
 	__forceinline T GetOwner() const
@@ -53,23 +59,13 @@ public:
 		return (T&)owner;
 	}
 
-	__forceinline T GetFreeValue() const
-	{
-		return (T)free_value;
-	}
-
-	__forceinline T GetDeadValue() const
-	{
-		return (T)dead_value;
-	}
-
 	SMutexResult trylock(T tid)
 	{
 		if (Emu.IsStopped())
 		{
 			return SMR_ABORT;
 		}
-		T old = (T)free_value;
+		T old = GetFreeValue();
 
 		if (!owner.compare_exchange_strong(old, tid))
 		{
@@ -77,7 +73,7 @@ public:
 			{
 				return SMR_DEADLOCK;
 			}
-			if (old == (T)dead_value)
+			if (old == GetDeadValue())
 			{
 				return SMR_DESTROYED;
 			}
@@ -87,7 +83,7 @@ public:
 		return SMR_OK;
 	}
 
-	SMutexResult unlock(T tid, T to = (T)free_value)
+	SMutexResult unlock(T tid, T to = GetFreeValue())
 	{
 		if (Emu.IsStopped())
 		{
@@ -97,11 +93,11 @@ public:
 
 		if (!owner.compare_exchange_strong(old, to))
 		{
-			if (old == (T)free_value)
+			if (old == GetFreeValue())
 			{
 				return SMR_FAILED;
 			}
-			if (old == (T)dead_value)
+			if (old == GetDeadValue())
 			{
 				return SMR_DESTROYED;
 			}