Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

nvmap: Refactor to expose nvmap objects.

Browse source
This commit is contained in:
bunnei 2018-02-07 21:53:31 -05:00
parent 703880c9ab
commit 196f8dff08
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/core/hle/service/nvdrv/devices/nvmap.cpp
View file

@ -13,10 +13,8 @@ namespace Nvidia {
namespace Devices { namespace Devices {
VAddr nvmap::GetObjectAddress(u32 handle) const { VAddr nvmap::GetObjectAddress(u32 handle) const {
auto itr = handles.find(handle); auto object = GetObject(handle);
ASSERT(itr != handles.end()); ASSERT(object);
auto object = itr->second;
ASSERT(object->status == Object::Status::Allocated); ASSERT(object->status == Object::Status::Allocated);
return object->addr; return object->addr;
} }
@ -52,7 +50,7 @@ u32 nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) {
u32 handle = next_handle++; u32 handle = next_handle++;
handles[handle] = std::move(object); handles[handle] = std::move(object);
LOG_WARNING(Service_NVDRV, "(STUBBED) size 0x%08X", params.size); LOG_DEBUG(Service_NVDRV, "size=0x%08X", params.size);
params.handle = handle; params.handle = handle;
@ -64,17 +62,16 @@ u32 nvmap::IocAlloc(const std::vector<u8>& input, std::vector<u8>& output) {
IocAllocParams params; IocAllocParams params;
std::memcpy(&params, input.data(), sizeof(params)); std::memcpy(&params, input.data(), sizeof(params));
auto itr = handles.find(params.handle); auto object = GetObject(params.handle);
ASSERT(itr != handles.end()); ASSERT(object);
auto object = itr->second;
object->flags = params.flags; object->flags = params.flags;
object->align = params.align; object->align = params.align;
object->kind = params.kind; object->kind = params.kind;
object->addr = params.addr; object->addr = params.addr;
object->status = Object::Status::Allocated; object->status = Object::Status::Allocated;
LOG_WARNING(Service_NVDRV, "(STUBBED) Allocated address 0x%llx", params.addr); LOG_DEBUG(Service_NVDRV, "called, addr=0x%llx", params.addr);
std::memcpy(output.data(), &params, sizeof(params)); std::memcpy(output.data(), &params, sizeof(params));
return 0; return 0;
@ -86,10 +83,10 @@ u32 nvmap::IocGetId(const std::vector<u8>& input, std::vector<u8>& output) {
LOG_WARNING(Service_NVDRV, "called"); LOG_WARNING(Service_NVDRV, "called");
auto itr = handles.find(params.handle); auto object = GetObject(params.handle);
ASSERT(itr != handles.end()); ASSERT(object);
params.id = itr->second->id; params.id = object->id;
std::memcpy(output.data(), &params, sizeof(params)); std::memcpy(output.data(), &params, sizeof(params));
return 0; return 0;
@ -123,10 +120,8 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {
LOG_WARNING(Service_NVDRV, "(STUBBED) called type=%u", params.type); LOG_WARNING(Service_NVDRV, "(STUBBED) called type=%u", params.type);
auto itr = handles.find(params.handle); auto object = GetObject(params.handle);
ASSERT(itr != handles.end()); ASSERT(object);
auto object = itr->second;
ASSERT(object->status == Object::Status::Allocated); ASSERT(object->status == Object::Status::Allocated);
switch (static_cast<ParamTypes>(params.type)) { switch (static_cast<ParamTypes>(params.type)) {

14
src/core/hle/service/nvdrv/devices/nvmap.h
View file

@ -26,8 +26,7 @@ public:
u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override;
private: /// Represents an nvmap object.
// Represents an nvmap object.
struct Object { struct Object {
enum class Status { Created, Allocated }; enum class Status { Created, Allocated };
u32 id; u32 id;
@ -39,10 +38,19 @@ private:
Status status; Status status;
}; };
std::shared_ptr<Object> GetObject(u32 handle) const {
auto itr = handles.find(handle);
if (itr != handles.end()) {
return itr->second;
}
return {};
}
private:
/// Id to use for the next handle that is created. /// Id to use for the next handle that is created.
u32 next_handle = 1; u32 next_handle = 1;
// Id to use for the next object that is created. /// Id to use for the next object that is created.
u32 next_id = 1; u32 next_id = 1;
/// Mapping of currently allocated handles to the objects they represent. /// Mapping of currently allocated handles to the objects they represent.