Another try

Utilities/SMutex.cpp

@@ -6,7 +6,12 @@
 
 #include "Utilities/SMutex.h"
 
-__forceinline void SM_Sleep()
+bool SM_IsAborted()
+{
+	return Emu.IsStopped();
+}
+
+void SM_Sleep()
 {
 	if (NamedThreadBase* t = GetCurrentNamedThread())
 	{
@@ -20,12 +25,12 @@ __forceinline void SM_Sleep()
 
 thread_local size_t g_this_thread_id = 0;
 
-__forceinline size_t SM_GetCurrentThreadId()
+size_t SM_GetCurrentThreadId()
 {
 	return g_this_thread_id ? g_this_thread_id : g_this_thread_id = std::hash<std::thread::id>()(std::this_thread::get_id());
 }
 
-__forceinline u32 SM_GetCurrentCPUThreadId()
+u32 SM_GetCurrentCPUThreadId()
 {
 	if (CPUThread* t = GetCurrentCPUThread())
 	{
@@ -34,7 +39,7 @@ __forceinline u32 SM_GetCurrentCPUThreadId()
 	return 0;
 }
 
-__forceinline be_t<u32> SM_GetCurrentCPUThreadIdBE()
+be_t<u32> SM_GetCurrentCPUThreadIdBE()
 {
 	return be_t<u32>::MakeFromLE(SM_GetCurrentCPUThreadId());
 }

Utilities/SMutex.h

@@ -1,11 +1,10 @@
 #pragma once
-#include "BEType.h"
-#include "Emu/System.h"
 
-extern void SM_Sleep();
-extern size_t SM_GetCurrentThreadId();
-extern u32 SM_GetCurrentCPUThreadId();
-extern be_t<u32> SM_GetCurrentCPUThreadIdBE();
+bool SM_IsAborted();
+void SM_Sleep();
+size_t SM_GetCurrentThreadId();
+u32 SM_GetCurrentCPUThreadId();
+be_t<u32> SM_GetCurrentCPUThreadIdBE();
 
 enum SMutexResult
 {
@@ -66,7 +65,7 @@ public:
 
 	SMutexResult trylock(T tid)
 	{
-		if (Emu.IsStopped())
+		if (SM_IsAborted())
 		{
 			return SMR_ABORT;
 		}
@@ -90,7 +89,7 @@ public:
 
 	SMutexResult unlock(T tid, T to = GetFreeValue())
 	{
-		if (Emu.IsStopped())
+		if (SM_IsAborted())
 		{
 			return SMR_ABORT;
 		}
@@ -148,7 +147,7 @@ public:
 	{
 		if (!tid)
 		{
-			if (!Emu.IsStopped())
+			if (!SM_IsAborted())
 			{
 				assert(!"SMutexLockerBase: thread id == 0");
 			}