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.
178 lines
5.0 KiB
C++
178 lines
5.0 KiB
C++
// Copyright 2014 Citra Emulator Project
|
|
// Licensed under GPLv2
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <algorithm>
|
|
#include <vector>
|
|
#include <map>
|
|
#include <string>
|
|
|
|
#include "common/common.h"
|
|
#include "core/mem_map.h"
|
|
|
|
#include "core/hle/kernel/kernel.h"
|
|
#include "core/hle/svc.h"
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Namespace Service
|
|
|
|
namespace Service {
|
|
|
|
static const int kMaxPortSize = 0x08; ///< Maximum size of a port name (8 characters)
|
|
static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header
|
|
|
|
/**
|
|
* Returns a pointer to the command buffer in kernel memory
|
|
* @param offset Optional offset into command buffer
|
|
* @return Pointer to command buffer
|
|
*/
|
|
inline static u32* GetCommandBuffer(const int offset=0) {
|
|
return (u32*)Memory::GetPointer(Memory::KERNEL_MEMORY_VADDR + kCommandHeaderOffset + offset);
|
|
}
|
|
|
|
class Manager;
|
|
|
|
/// Interface to a CTROS service
|
|
class Interface : public Kernel::Object {
|
|
friend class Manager;
|
|
public:
|
|
|
|
std::string GetName() const override { return GetPortName(); }
|
|
std::string GetTypeName() const override { return GetPortName(); }
|
|
|
|
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; }
|
|
Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Service; }
|
|
|
|
typedef void (*Function)(Interface*);
|
|
|
|
struct FunctionInfo {
|
|
u32 id;
|
|
Function func;
|
|
std::string name;
|
|
};
|
|
|
|
/**
|
|
* Gets the string name used by CTROS for a service
|
|
* @return Port name of service
|
|
*/
|
|
virtual std::string GetPortName() const {
|
|
return "[UNKNOWN SERVICE PORT]";
|
|
}
|
|
|
|
/// Allocates a new handle for the service
|
|
Handle CreateHandle(Kernel::Object *obj) {
|
|
Handle handle = Kernel::g_object_pool.Create(obj);
|
|
m_handles.push_back(handle);
|
|
return handle;
|
|
}
|
|
|
|
/// Frees a handle from the service
|
|
template <class T>
|
|
void DeleteHandle(const Handle handle) {
|
|
Kernel::g_object_pool.Destroy<T>(handle);
|
|
m_handles.erase(std::remove(m_handles.begin(), m_handles.end(), handle), m_handles.end());
|
|
}
|
|
|
|
/**
|
|
* 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
|
|
*/
|
|
ResultVal<bool> SyncRequest() override {
|
|
u32* cmd_buff = GetCommandBuffer();
|
|
auto itr = m_functions.find(cmd_buff[0]);
|
|
|
|
if (itr == m_functions.end()) {
|
|
ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X",
|
|
GetPortName().c_str(), cmd_buff[0]);
|
|
|
|
// TODO(bunnei): Hack - ignore error
|
|
u32* cmd_buff = Service::GetCommandBuffer();
|
|
cmd_buff[1] = 0;
|
|
return MakeResult<bool>(false);
|
|
}
|
|
if (itr->second.func == nullptr) {
|
|
ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s",
|
|
GetPortName().c_str(), itr->second.name.c_str());
|
|
|
|
// TODO(bunnei): Hack - ignore error
|
|
u32* cmd_buff = Service::GetCommandBuffer();
|
|
cmd_buff[1] = 0;
|
|
return MakeResult<bool>(false);
|
|
}
|
|
|
|
itr->second.func(this);
|
|
|
|
return MakeResult<bool>(false); // TODO: Implement return from actual function
|
|
}
|
|
|
|
/**
|
|
* 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 function");
|
|
return UnimplementedFunction(ErrorModule::OS);
|
|
}
|
|
|
|
protected:
|
|
|
|
/**
|
|
* Registers the functions in the service
|
|
*/
|
|
void Register(const FunctionInfo* functions, int len) {
|
|
for (int i = 0; i < len; i++) {
|
|
m_functions[functions[i].id] = functions[i];
|
|
}
|
|
}
|
|
|
|
private:
|
|
|
|
std::vector<Handle> m_handles;
|
|
std::map<u32, FunctionInfo> m_functions;
|
|
|
|
};
|
|
|
|
/// Simple class to manage accessing services from ports and UID handles
|
|
class Manager {
|
|
|
|
public:
|
|
Manager();
|
|
|
|
~Manager();
|
|
|
|
/// Add a service to the manager (does not create it though)
|
|
void AddService(Interface* service);
|
|
|
|
/// Removes a service from the manager (does not delete it though)
|
|
void DeleteService(const std::string& port_name);
|
|
|
|
/// Get a Service Interface from its UID
|
|
Interface* FetchFromHandle(u32 uid);
|
|
|
|
/// Get a Service Interface from its port
|
|
Interface* FetchFromPortName(const std::string& port_name);
|
|
|
|
private:
|
|
|
|
std::vector<Interface*> m_services;
|
|
std::map<std::string, u32> m_port_map;
|
|
|
|
};
|
|
|
|
/// Initialize ServiceManager
|
|
void Init();
|
|
|
|
/// Shutdown ServiceManager
|
|
void Shutdown();
|
|
|
|
|
|
extern Manager* g_manager; ///< Service manager
|
|
|
|
|
|
} // namespace
|