Merge pull request #246 from Subv/cbranch_1
SVC: Implemented Semaphores
This commit is contained in:
commit
17b4d6747a
|
@ -28,6 +28,7 @@ set(SRCS
|
||||||
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/shared_memory.cpp
|
hle/kernel/shared_memory.cpp
|
||||||
hle/kernel/thread.cpp
|
hle/kernel/thread.cpp
|
||||||
hle/service/ac_u.cpp
|
hle/service/ac_u.cpp
|
||||||
|
@ -106,6 +107,7 @@ set(HEADERS
|
||||||
hle/kernel/event.h
|
hle/kernel/event.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/service/ac_u.h
|
hle/service/ac_u.h
|
||||||
|
|
|
@ -114,6 +114,20 @@ template<s32 func(u32*, const char*)> void Wrap() {
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<s32 func(u32*, s32, s32)> void Wrap() {
|
||||||
|
u32 param_1 = 0;
|
||||||
|
u32 retval = func(¶m_1, PARAM(1), PARAM(2));
|
||||||
|
Core::g_app_core->SetReg(1, param_1);
|
||||||
|
FuncReturn(retval);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<s32 func(s32*, u32, s32)> void Wrap() {
|
||||||
|
s32 param_1 = 0;
|
||||||
|
u32 retval = func(¶m_1, PARAM(1), PARAM(2));
|
||||||
|
Core::g_app_core->SetReg(1, param_1);
|
||||||
|
FuncReturn(retval);
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Function wrappers that return type u32
|
// Function wrappers that return type u32
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
// Copyright 2014 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2+
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <queue>
|
||||||
|
|
||||||
|
#include "common/common.h"
|
||||||
|
|
||||||
|
#include "core/hle/kernel/kernel.h"
|
||||||
|
#include "core/hle/kernel/semaphore.h"
|
||||||
|
#include "core/hle/kernel/thread.h"
|
||||||
|
|
||||||
|
namespace Kernel {
|
||||||
|
|
||||||
|
class Semaphore : public Object {
|
||||||
|
public:
|
||||||
|
std::string GetTypeName() const override { return "Semaphore"; }
|
||||||
|
std::string GetName() const override { return name; }
|
||||||
|
|
||||||
|
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; }
|
||||||
|
Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Semaphore; }
|
||||||
|
|
||||||
|
u32 max_count; ///< Maximum number of simultaneous holders the semaphore can have
|
||||||
|
u32 available_count; ///< Number of free slots left in the semaphore
|
||||||
|
std::queue<Handle> waiting_threads; ///< Threads that are waiting for the semaphore
|
||||||
|
std::string name; ///< Name of semaphore (optional)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests whether a semaphore still has free slots
|
||||||
|
* @return Whether the semaphore is available
|
||||||
|
*/
|
||||||
|
bool IsAvailable() const {
|
||||||
|
return available_count > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
ResultVal<bool> WaitSynchronization() override {
|
||||||
|
bool wait = !IsAvailable();
|
||||||
|
|
||||||
|
if (wait) {
|
||||||
|
Kernel::WaitCurrentThread(WAITTYPE_SEMA, GetHandle());
|
||||||
|
waiting_threads.push(GetCurrentThreadHandle());
|
||||||
|
} else {
|
||||||
|
--available_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
return MakeResult<bool>(wait);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
ResultCode CreateSemaphore(Handle* handle, u32 initial_count,
|
||||||
|
u32 max_count, const std::string& name) {
|
||||||
|
|
||||||
|
if (initial_count > max_count)
|
||||||
|
return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel,
|
||||||
|
ErrorSummary::WrongArgument, ErrorLevel::Permanent);
|
||||||
|
|
||||||
|
Semaphore* semaphore = new Semaphore;
|
||||||
|
*handle = g_object_pool.Create(semaphore);
|
||||||
|
|
||||||
|
// When the semaphore is created, some slots are reserved for other threads,
|
||||||
|
// and the rest is reserved for the caller thread
|
||||||
|
semaphore->max_count = max_count;
|
||||||
|
semaphore->available_count = initial_count;
|
||||||
|
semaphore->name = name;
|
||||||
|
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count) {
|
||||||
|
Semaphore* semaphore = g_object_pool.Get<Semaphore>(handle);
|
||||||
|
if (semaphore == nullptr)
|
||||||
|
return InvalidHandle(ErrorModule::Kernel);
|
||||||
|
|
||||||
|
if (semaphore->max_count - semaphore->available_count < release_count)
|
||||||
|
return ResultCode(ErrorDescription::OutOfRange, ErrorModule::Kernel,
|
||||||
|
ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
|
||||||
|
|
||||||
|
*count = semaphore->available_count;
|
||||||
|
semaphore->available_count += release_count;
|
||||||
|
|
||||||
|
// Notify some of the threads that the semaphore has been released
|
||||||
|
// stop once the semaphore is full again or there are no more waiting threads
|
||||||
|
while (!semaphore->waiting_threads.empty() && semaphore->IsAvailable()) {
|
||||||
|
Kernel::ResumeThreadFromWait(semaphore->waiting_threads.front());
|
||||||
|
semaphore->waiting_threads.pop();
|
||||||
|
--semaphore->available_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
|
@ -0,0 +1,32 @@
|
||||||
|
// 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 {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a semaphore.
|
||||||
|
* @param handle Pointer to the handle of the newly created object
|
||||||
|
* @param initial_count Number of slots reserved for other threads
|
||||||
|
* @param max_count Maximum number of slots the semaphore can have
|
||||||
|
* @param name Optional name of semaphore
|
||||||
|
* @return ResultCode of the error
|
||||||
|
*/
|
||||||
|
ResultCode CreateSemaphore(Handle* handle, u32 initial_count, u32 max_count, const std::string& name = "Unknown");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Releases a certain number of slots from a semaphore.
|
||||||
|
* @param count The number of free slots the semaphore had before this call
|
||||||
|
* @param handle The handle of the semaphore to release
|
||||||
|
* @param release_count The number of slots to release
|
||||||
|
* @return ResultCode of the error
|
||||||
|
*/
|
||||||
|
ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count);
|
||||||
|
|
||||||
|
} // namespace
|
|
@ -12,6 +12,7 @@
|
||||||
#include "core/hle/kernel/address_arbiter.h"
|
#include "core/hle/kernel/address_arbiter.h"
|
||||||
#include "core/hle/kernel/event.h"
|
#include "core/hle/kernel/event.h"
|
||||||
#include "core/hle/kernel/mutex.h"
|
#include "core/hle/kernel/mutex.h"
|
||||||
|
#include "core/hle/kernel/semaphore.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
#include "core/hle/kernel/shared_memory.h"
|
||||||
#include "core/hle/kernel/thread.h"
|
#include "core/hle/kernel/thread.h"
|
||||||
|
|
||||||
|
@ -288,6 +289,21 @@ static Result GetThreadId(u32* thread_id, Handle handle) {
|
||||||
return result.raw;
|
return result.raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Creates a semaphore
|
||||||
|
static Result CreateSemaphore(Handle* semaphore, s32 initial_count, s32 max_count) {
|
||||||
|
ResultCode res = Kernel::CreateSemaphore(semaphore, initial_count, max_count);
|
||||||
|
LOG_TRACE(Kernel_SVC, "called initial_count=%d, max_count=%d, created handle=0x%08X",
|
||||||
|
initial_count, max_count, *semaphore);
|
||||||
|
return res.raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Releases a certain number of slots in a semaphore
|
||||||
|
static Result ReleaseSemaphore(s32* count, Handle semaphore, s32 release_count) {
|
||||||
|
LOG_TRACE(Kernel_SVC, "called release_count=%d, handle=0x%08X", release_count, semaphore);
|
||||||
|
ResultCode res = Kernel::ReleaseSemaphore(count, semaphore, release_count);
|
||||||
|
return res.raw;
|
||||||
|
}
|
||||||
|
|
||||||
/// Query memory
|
/// Query memory
|
||||||
static Result QueryMemory(void* info, void* out, u32 addr) {
|
static Result QueryMemory(void* info, void* out, u32 addr) {
|
||||||
LOG_ERROR(Kernel_SVC, "(UNIMPLEMENTED) called addr=0x%08X", addr);
|
LOG_ERROR(Kernel_SVC, "(UNIMPLEMENTED) called addr=0x%08X", addr);
|
||||||
|
@ -366,8 +382,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"},
|
||||||
|
|
Reference in New Issue