c2588403c0
All service calls in the CTR OS return result codes indicating the success or failure of the call. Previous to this commit, Citra's HLE emulation of services and the kernel universally either ignored errors or returned dummy -1 error codes. This commit makes an initial effort to provide an infrastructure for error reporting and propagation which can be use going forward to make HLE calls accurately return errors as the original system. A few parts of the code have been updated to use the new system where applicable. One part of this effort is the definition of the `ResultCode` type, which provides facilities for constructing and parsing error codes in the structured format used by the CTR. The `ResultVal` type builds on `ResultCode` by providing a container for values returned by function that can report errors. It enforces that correct error checking will be done on function returns by preventing the use of the return value if the function returned an error code. Currently this change is mostly internal since errors are still suppressed on the ARM<->HLE border, as a temporary compatibility hack. As functionality is implemented and tested this hack can be eventually removed.
88 lines
2.8 KiB
C++
88 lines
2.8 KiB
C++
// Copyright 2014 Citra Emulator Project
|
|
// Licensed under GPLv2
|
|
// Refer to the license.txt file included.
|
|
|
|
#include "common/common_types.h"
|
|
|
|
#include "core/mem_map.h"
|
|
|
|
#include "core/hle/hle.h"
|
|
#include "core/hle/kernel/address_arbiter.h"
|
|
#include "core/hle/kernel/thread.h"
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Kernel namespace
|
|
|
|
namespace Kernel {
|
|
|
|
class AddressArbiter : public Object {
|
|
public:
|
|
std::string GetTypeName() const override { return "Arbiter"; }
|
|
std::string GetName() const override { return name; }
|
|
|
|
static Kernel::HandleType GetStaticHandleType() { return HandleType::AddressArbiter; }
|
|
Kernel::HandleType GetHandleType() const override { return HandleType::AddressArbiter; }
|
|
|
|
std::string name; ///< Name of address arbiter object (optional)
|
|
|
|
/**
|
|
* 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
|
|
*/
|
|
ResultVal<bool> WaitSynchronization() override {
|
|
// TODO(bunnei): ImplementMe
|
|
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
|
|
return UnimplementedFunction(ErrorModule::OS);
|
|
}
|
|
};
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
/// Arbitrate an address
|
|
ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value) {
|
|
switch (type) {
|
|
|
|
// Signal thread(s) waiting for arbitrate address...
|
|
case ArbitrationType::Signal:
|
|
// Negative value means resume all threads
|
|
if (value < 0) {
|
|
ArbitrateAllThreads(handle, address);
|
|
} else {
|
|
// Resume first N threads
|
|
for(int i = 0; i < value; i++)
|
|
ArbitrateHighestPriorityThread(handle, address);
|
|
}
|
|
break;
|
|
|
|
// Wait current thread (acquire the arbiter)...
|
|
case ArbitrationType::WaitIfLessThan:
|
|
if ((s32)Memory::Read32(address) <= value) {
|
|
Kernel::WaitCurrentThread(WAITTYPE_ARB, handle);
|
|
HLE::Reschedule(__func__);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
ERROR_LOG(KERNEL, "unknown type=%d", type);
|
|
return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::Kernel, ErrorSummary::WrongArgument, ErrorLevel::Usage);
|
|
}
|
|
return RESULT_SUCCESS;
|
|
}
|
|
|
|
/// Create an address arbiter
|
|
AddressArbiter* CreateAddressArbiter(Handle& handle, const std::string& name) {
|
|
AddressArbiter* address_arbiter = new AddressArbiter;
|
|
handle = Kernel::g_object_pool.Create(address_arbiter);
|
|
address_arbiter->name = name;
|
|
return address_arbiter;
|
|
}
|
|
|
|
/// Create an address arbiter
|
|
Handle CreateAddressArbiter(const std::string& name) {
|
|
Handle handle;
|
|
CreateAddressArbiter(handle, name);
|
|
return handle;
|
|
}
|
|
|
|
} // namespace Kernel
|