Added basic semaphore skeleton code

This commit is contained in:
inspuration 2014-06-11 03:52:40 -04:00
parent 5c4c5f6c52
commit 7e0ef82f27
7 changed files with 170 additions and 2 deletions

View file

@ -37,6 +37,7 @@ set(SRCS core.cpp
hle/kernel/event.cpp hle/kernel/event.cpp
hle/kernel/kernel.cpp hle/kernel/kernel.cpp
hle/kernel/mutex.cpp hle/kernel/mutex.cpp
hle/kernel/semaphore.cpp
hle/kernel/thread.cpp hle/kernel/thread.cpp
hle/kernel/shared_memory.cpp hle/kernel/shared_memory.cpp
hle/service/apt.cpp hle/service/apt.cpp
@ -85,6 +86,7 @@ set(HEADERS core.h
hle/svc.h hle/svc.h
hle/kernel/kernel.h hle/kernel/kernel.h
hle/kernel/mutex.h hle/kernel/mutex.h
hle/kernel/semaphore.h
hle/kernel/shared_memory.h hle/kernel/shared_memory.h
hle/kernel/thread.h hle/kernel/thread.h
hle/function_wrappers.h hle/function_wrappers.h

View file

@ -181,6 +181,7 @@
<ClCompile Include="hle\kernel\event.cpp" /> <ClCompile Include="hle\kernel\event.cpp" />
<ClCompile Include="hle\kernel\kernel.cpp" /> <ClCompile Include="hle\kernel\kernel.cpp" />
<ClCompile Include="hle\kernel\mutex.cpp" /> <ClCompile Include="hle\kernel\mutex.cpp" />
<ClCompile Include="hle\kernel\semaphore.cpp" />
<ClCompile Include="hle\kernel\shared_memory.cpp" /> <ClCompile Include="hle\kernel\shared_memory.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" />
@ -234,6 +235,7 @@
<ClInclude Include="hle\kernel\event.h" /> <ClInclude Include="hle\kernel\event.h" />
<ClInclude Include="hle\kernel\kernel.h" /> <ClInclude Include="hle\kernel\kernel.h" />
<ClInclude Include="hle\kernel\mutex.h" /> <ClInclude Include="hle\kernel\mutex.h" />
<ClInclude Include="hle\kernel\semaphore.h" />
<ClInclude Include="hle\kernel\shared_memory.h" /> <ClInclude Include="hle\kernel\shared_memory.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" />

View file

@ -52,6 +52,7 @@
<ClCompile Include="mem_map.cpp" /> <ClCompile Include="mem_map.cpp" />
<ClCompile Include="mem_map_funcs.cpp" /> <ClCompile Include="mem_map_funcs.cpp" />
<ClCompile Include="system.cpp" /> <ClCompile Include="system.cpp" />
<ClCompile Include="hle\kernel\semaphore.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="hw\gpu.h" /> <ClInclude Include="hw\gpu.h" />
@ -104,6 +105,7 @@
<ClInclude Include="core_timing.h" /> <ClInclude Include="core_timing.h" />
<ClInclude Include="loader.h" /> <ClInclude Include="loader.h" />
<ClInclude Include="mem_map.h" /> <ClInclude Include="mem_map.h" />
<ClInclude Include="hle\kernel\semaphore.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />

View file

@ -90,6 +90,20 @@ template<s32 func(u32*, const char*)> void Wrap() {
RETURN(retval); RETURN(retval);
} }
template<s32 func(u32*,s32, s32)> void Wrap() {
u32 param_1 = 0;
u32 retval = func(&param_1, (s32)PARAM(1), (s32)PARAM(2));
Core::g_app_core->SetReg(1, param_1);
RETURN(retval);
}
template<s32 func(s32 *, u32, s32)> void Wrap() {
s32 param_0 = 0;
u32 retval = func(&param_0, PARAM(1), (s32)PARAM(2));
Core::g_app_core->SetReg(1, param_0);
RETURN(retval);
}
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Function wrappers that return type u32 // Function wrappers that return type u32

View file

@ -0,0 +1,100 @@
// 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/mutex.h"
#include "core/hle/kernel/thread.h"
namespace Kernel {
class Semaphore : public Object {
public:
const char* GetTypeName() const { return "Semaphore"; }
const char* GetName() const { return name.c_str(); }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Semaphore; }
s32 initial_count; ///< Initial count state when semaphore was created
s32 count; ///< Current count state
s32 max_count; ///< Max count state
Handle lock_thread; ///< Handle to thread that currently has semaphore
std::string name;
/**
* Synchronize kernel object
* @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code
*/
Result SyncRequest(bool* wait) {
// TODO(bravia): ImplementMe
return 0;
}
/**
* Wait for kernel object to synchronize
* @param wait Boolean wait set if current thread should wait as a result of sync operation
* @return Result of operation, 0 on success, otherwise error code
*/
Result WaitSynchronization(bool* wait) {
// TODO(bravia): ImplementMe
return 0;
}
};
////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Releases a semaphore
* @param unknown
* @param handle Handle to mutex to release
* @param unknown
*/
Result ReleaseSemaphore(s32 * count, Handle handle, s32 release_count) {
Semaphore* sem = Kernel::g_object_pool.GetFast<Semaphore>(handle);
_assert_msg_(KERNEL, (sem != nullptr), "ReleaseSemaphore tried to release a nullptr sem!");
//TODO(bravia): ImplementMe
return 0;
}
/**
* Creates a semaphore
* @param handle Reference to handle for the newly created semaphore
* @param initial_count Specifies if the semaphore is initialized with a count
* @param max_count Specifies the max count of the semaphore
* @param name Optional name of semaphore
* @return Pointer to new Semaphore object
*/
Semaphore* CreateSemaphore(Handle& handle, s32 initial_count, s32 max_count, const std::string& name) {
Semaphore* sem = new Semaphore;
handle = Kernel::g_object_pool.Create(sem);
sem->initial_count = sem->count = initial_count;
sem->name = name;
return sem;
}
/**
* Creates a semaphore
* @param handle Reference to handle for the newly created semaphore
* @param initial_count Specifies if the semaphore is initialized with a count
* @param max_count Specifies the max count of the semaphore
* @param name Optional name of semaphore
* @return Handle to new Semaphore object
*/
Handle CreateSemaphore(s32 initial_count, s32 max_count, const std::string& name) {
Handle handle;
Semaphore* sem = CreateSemaphore(handle, initial_count, max_count, name);
return handle;
}
} // namespace

View file

@ -0,0 +1,31 @@
// 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 semaphore
* @param unknown
* @param handle Handle to mutex to release
* @param unknown
*/
Result ReleaseSemaphore(s32 * count, Handle handle, s32 release_count);
/**
* Creates a semaphore
* @param handle Reference to handle for the newly created semaphore
* @param initial_count Specifies if the semaphore is initialized with a count
* @param max_count Specifies the max count of the semaphore
* @param name Optional name of semaphore
* @return Handle to new Semaphore object
*/
Handle CreateSemaphore(s32 initial_count, s32 max_count, const std::string& name = "Unknown");
} // namespace

View file

@ -12,6 +12,7 @@
#include "core/hle/kernel/event.h" #include "core/hle/kernel/event.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h" #include "core/hle/kernel/mutex.h"
#include "core/hle/kernel/semaphore.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h" #include "core/hle/function_wrappers.h"
@ -275,6 +276,22 @@ Result ReleaseMutex(Handle handle) {
return 0; return 0;
} }
/// Create a semaphore
Result CreateSemaphore(Handle* sem, s32 initial_count, s32 max_count) {
*sem = Kernel::CreateSemaphore(initial_count, max_count);
DEBUG_LOG(SVC, "called initial_count=%d , max_count=%d : created handle=0x%08X",
initial_count, max_count, *sem);
return 0;
}
/// Release a mutex
Result ReleaseSemaphore(s32* count, Handle handle, s32 releaseCount) {
DEBUG_LOG(SVC, "called handle=0x%08X", handle);
_assert_msg_(KERNEL, (handle != 0), "called, but handle is nullptr!");
Kernel::ReleaseSemaphore(count, handle, releaseCount);
return 0;
}
/// Get current thread ID /// Get current thread ID
Result GetThreadId(u32* thread_id, Handle thread) { Result GetThreadId(u32* thread_id, Handle thread) {
ERROR_LOG(SVC, "(UNIMPLEMENTED) called thread=0x%08X", thread); ERROR_LOG(SVC, "(UNIMPLEMENTED) called thread=0x%08X", thread);
@ -359,8 +376,8 @@ const HLE::FunctionDef SVC_Table[] = {
{0x12, nullptr, "Run"}, {0x12, nullptr, "Run"},
{0x13, HLE::Wrap<CreateMutex>, "CreateMutex"}, {0x13, HLE::Wrap<CreateMutex>, "CreateMutex"},
{0x14, HLE::Wrap<ReleaseMutex>, "ReleaseMutex"}, {0x14, HLE::Wrap<ReleaseMutex>, "ReleaseMutex"},
{0x15, nullptr, "CreateSemaphore"}, {0x15, HLE::Wrap<CreateSemaphore>, "CreateSemaphore" },
{0x16, nullptr, "ReleaseSemaphore"}, {0x16, HLE::Wrap<ReleaseSemaphore>, "ReleaseSemaphore"},
{0x17, HLE::Wrap<CreateEvent>, "CreateEvent"}, {0x17, HLE::Wrap<CreateEvent>, "CreateEvent"},
{0x18, HLE::Wrap<SignalEvent>, "SignalEvent"}, {0x18, HLE::Wrap<SignalEvent>, "SignalEvent"},
{0x19, HLE::Wrap<ClearEvent>, "ClearEvent"}, {0x19, HLE::Wrap<ClearEvent>, "ClearEvent"},