mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 18:13:21 +02:00
mutex: initial commit of HLE module
This commit is contained in:
parent
08e6a9bf89
commit
978e1d4653
@ -35,6 +35,7 @@ set(SRCS core.cpp
|
|||||||
hle/coprocessor.cpp
|
hle/coprocessor.cpp
|
||||||
hle/svc.cpp
|
hle/svc.cpp
|
||||||
hle/kernel/kernel.cpp
|
hle/kernel/kernel.cpp
|
||||||
|
hle/kernel/mutex.cpp
|
||||||
hle/kernel/thread.cpp
|
hle/kernel/thread.cpp
|
||||||
hle/service/apt.cpp
|
hle/service/apt.cpp
|
||||||
hle/service/gsp.cpp
|
hle/service/gsp.cpp
|
||||||
|
@ -169,6 +169,7 @@
|
|||||||
<ClCompile Include="hle\coprocessor.cpp" />
|
<ClCompile Include="hle\coprocessor.cpp" />
|
||||||
<ClCompile Include="hle\hle.cpp" />
|
<ClCompile Include="hle\hle.cpp" />
|
||||||
<ClCompile Include="hle\kernel\kernel.cpp" />
|
<ClCompile Include="hle\kernel\kernel.cpp" />
|
||||||
|
<ClCompile Include="hle\kernel\mutex.cpp" />
|
||||||
<ClCompile Include="hle\kernel\thread.cpp" />
|
<ClCompile Include="hle\kernel\thread.cpp" />
|
||||||
<ClCompile Include="hle\service\apt.cpp" />
|
<ClCompile Include="hle\service\apt.cpp" />
|
||||||
<ClCompile Include="hle\service\gsp.cpp" />
|
<ClCompile Include="hle\service\gsp.cpp" />
|
||||||
@ -217,6 +218,7 @@
|
|||||||
<ClInclude Include="hle\function_wrappers.h" />
|
<ClInclude Include="hle\function_wrappers.h" />
|
||||||
<ClInclude Include="hle\hle.h" />
|
<ClInclude Include="hle\hle.h" />
|
||||||
<ClInclude Include="hle\kernel\kernel.h" />
|
<ClInclude Include="hle\kernel\kernel.h" />
|
||||||
|
<ClInclude Include="hle\kernel\mutex.h" />
|
||||||
<ClInclude Include="hle\kernel\thread.h" />
|
<ClInclude Include="hle\kernel\thread.h" />
|
||||||
<ClInclude Include="hle\service\apt.h" />
|
<ClInclude Include="hle\service\apt.h" />
|
||||||
<ClInclude Include="hle\service\gsp.h" />
|
<ClInclude Include="hle\service\gsp.h" />
|
||||||
|
@ -162,6 +162,9 @@
|
|||||||
<ClCompile Include="hle\svc.cpp">
|
<ClCompile Include="hle\svc.cpp">
|
||||||
<Filter>hle</Filter>
|
<Filter>hle</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="hle\kernel\mutex.cpp">
|
||||||
|
<Filter>hle\kernel</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="arm\disassembler\arm_disasm.h">
|
<ClInclude Include="arm\disassembler\arm_disasm.h">
|
||||||
@ -289,6 +292,9 @@
|
|||||||
<ClInclude Include="hle\svc.h">
|
<ClInclude Include="hle\svc.h">
|
||||||
<Filter>hle</Filter>
|
<Filter>hle</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="hle\kernel\mutex.h">
|
||||||
|
<Filter>hle\kernel</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Text Include="CMakeLists.txt" />
|
<Text Include="CMakeLists.txt" />
|
||||||
|
122
src/core/hle/kernel/mutex.cpp
Normal file
122
src/core/hle/kernel/mutex.cpp
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
// Copyright 2014 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "common/common.h"
|
||||||
|
|
||||||
|
#include "core/hle/kernel/kernel.h"
|
||||||
|
#include "core/hle/kernel/thread.h"
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
|
||||||
|
class Mutex : public Object {
|
||||||
|
public:
|
||||||
|
const char* GetTypeName() { return "Mutex"; }
|
||||||
|
|
||||||
|
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
|
||||||
|
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; }
|
||||||
|
|
||||||
|
bool initial_locked; ///< Initial lock state when mutex was created
|
||||||
|
bool locked; ///< Current locked state
|
||||||
|
Handle lock_thread; ///< Handle to thread that currently has mutex
|
||||||
|
std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex
|
||||||
|
};
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
typedef std::multimap<Handle, Handle> MutexMap;
|
||||||
|
static MutexMap g_mutex_held_locks;
|
||||||
|
|
||||||
|
void __MutexAcquireLock(Mutex* mutex, Handle thread) {
|
||||||
|
g_mutex_held_locks.insert(std::make_pair(thread, mutex->GetHandle()));
|
||||||
|
mutex->lock_thread = thread;
|
||||||
|
}
|
||||||
|
|
||||||
|
void __MutexAcquireLock(Mutex* mutex) {
|
||||||
|
Handle thread = GetCurrentThread();
|
||||||
|
__MutexAcquireLock(mutex, thread);
|
||||||
|
}
|
||||||
|
|
||||||
|
void __MutexEraseLock(Mutex* mutex) {
|
||||||
|
Handle handle = mutex->GetHandle();
|
||||||
|
auto locked = g_mutex_held_locks.equal_range(mutex->lock_thread);
|
||||||
|
for (MutexMap::iterator iter = locked.first; iter != locked.second; ++iter) {
|
||||||
|
if ((*iter).second == handle) {
|
||||||
|
g_mutex_held_locks.erase(iter);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mutex->lock_thread = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool __LockMutex(Mutex* mutex) {
|
||||||
|
// Mutex alread locked?
|
||||||
|
if (mutex->locked) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
__MutexAcquireLock(mutex);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool __ReleaseMutexForThread(Mutex* mutex, Handle thread) {
|
||||||
|
__MutexAcquireLock(mutex, thread);
|
||||||
|
Kernel::ResumeThreadFromWait(thread);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool __ReleaseMutex(Mutex* mutex) {
|
||||||
|
__MutexEraseLock(mutex);
|
||||||
|
bool woke_threads = false;
|
||||||
|
auto iter = mutex->waiting_threads.begin();
|
||||||
|
|
||||||
|
// Find the next waiting thread for the mutex...
|
||||||
|
while (!woke_threads && !mutex->waiting_threads.empty()) {
|
||||||
|
woke_threads |= __ReleaseMutexForThread(mutex, *iter);
|
||||||
|
mutex->waiting_threads.erase(iter);
|
||||||
|
}
|
||||||
|
// Reset mutex lock thread handle, nothing is waiting
|
||||||
|
if (!woke_threads) {
|
||||||
|
mutex->locked = false;
|
||||||
|
mutex->lock_thread = -1;
|
||||||
|
}
|
||||||
|
return woke_threads;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Releases a mutex
|
||||||
|
* @param handle Handle to mutex to release
|
||||||
|
*/
|
||||||
|
Result ReleaseMutex(Handle handle) {
|
||||||
|
Mutex* mutex = Kernel::g_object_pool.GetFast<Mutex>(handle);
|
||||||
|
if (!__ReleaseMutex(mutex)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a mutex
|
||||||
|
* @param handle Reference to handle for the newly created mutex
|
||||||
|
* @param initial_locked Specifies if the mutex should be locked initially
|
||||||
|
*/
|
||||||
|
Result CreateMutex(Handle& handle, bool initial_locked) {
|
||||||
|
Mutex* mutex = new Mutex;
|
||||||
|
handle = Kernel::g_object_pool.Create(mutex);
|
||||||
|
|
||||||
|
mutex->locked = mutex->initial_locked = initial_locked;
|
||||||
|
|
||||||
|
// Acquire mutex with current thread if initialized as locked...
|
||||||
|
if (mutex->locked) {
|
||||||
|
__MutexAcquireLock(mutex);
|
||||||
|
|
||||||
|
// Otherwise, reset lock thread handle
|
||||||
|
} else {
|
||||||
|
mutex->lock_thread = -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
26
src/core/hle/kernel/mutex.h
Normal file
26
src/core/hle/kernel/mutex.h
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// Copyright 2014 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
|
||||||
|
#include "core/hle/kernel/kernel.h"
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Releases a mutex
|
||||||
|
* @param handle Handle to mutex to release
|
||||||
|
*/
|
||||||
|
Result ReleaseMutex(Handle handle);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a mutex
|
||||||
|
* @param handle Reference to handle for the newly created mutex
|
||||||
|
* @param initial_locked Specifies if the mutex should be locked initially
|
||||||
|
*/
|
||||||
|
Result CreateMutex(Handle& handle, bool initial_locked);
|
||||||
|
|
||||||
|
} // namespace
|
@ -3,9 +3,10 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
|
||||||
#include "common/log.h"
|
#include "common/common.h"
|
||||||
|
|
||||||
#include "core/hle/hle.h"
|
#include "core/hle/hle.h"
|
||||||
|
#include "core/hle/kernel/mutex.h"
|
||||||
#include "core/hle/service/apt.h"
|
#include "core/hle/service/apt.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -19,11 +20,8 @@ void Initialize(Service::Interface* self) {
|
|||||||
|
|
||||||
void GetLockHandle(Service::Interface* self) {
|
void GetLockHandle(Service::Interface* self) {
|
||||||
u32* cmd_buff = Service::GetCommandBuffer();
|
u32* cmd_buff = Service::GetCommandBuffer();
|
||||||
u32 flags = cmd_buff[1];
|
u32 flags = cmd_buff[1]; // TODO(bunnei): Figure out the purpose of the flag field
|
||||||
|
cmd_buff[1] = Kernel::CreateMutex(cmd_buff[5], false);
|
||||||
// TODO: This should be an actual mutex handle. Games will check that this is not non-zero
|
|
||||||
// (NULL), and fail if such. A faked non-zero value will at least enable further booting.
|
|
||||||
cmd_buff[5] = 0x12345678;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const Interface::FunctionInfo FunctionTable[] = {
|
const Interface::FunctionInfo FunctionTable[] = {
|
||||||
|
@ -187,15 +187,16 @@ Result CreateThread(void* thread, u32 priority, u32 entry_point, u32 arg, u32 st
|
|||||||
/// Create a mutex
|
/// Create a mutex
|
||||||
Result CreateMutex(void* _mutex, u32 initial_locked) {
|
Result CreateMutex(void* _mutex, u32 initial_locked) {
|
||||||
Handle* mutex = (Handle*)_mutex;
|
Handle* mutex = (Handle*)_mutex;
|
||||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) CreateMutex called initial_locked=%s",
|
DEBUG_LOG(SVC, "CreateMutex called initial_locked=%s", initial_locked ? "true" : "false");
|
||||||
initial_locked ? "true" : "false");
|
Kernel::CreateMutex(*mutex, (bool)initial_locked);
|
||||||
Core::g_app_core->SetReg(1, 0xF00D0BAD);
|
Core::g_app_core->SetReg(1, *mutex);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Release a mutex
|
/// Release a mutex
|
||||||
Result ReleaseMutex(Handle handle) {
|
Result ReleaseMutex(Handle handle) {
|
||||||
DEBUG_LOG(SVC, "(UNIMPLEMENTED) ReleaseMutex called handle=0x%08X", handle);
|
DEBUG_LOG(SVC, "ReleaseMutex called handle=0x%08X", handle);
|
||||||
|
Kernel::ReleaseMutex(handle);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user