VERY experimental Nintendo Switch 2 emulator
C++
nvdrv: convert nvmap
Liama059aedaf10b
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cppindex 968eaa1755..94286e295c 100644--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp@@ -13,6 +13,7 @@#include "core/hle/kernel/k_process.h"#include "core/hle/service/nvdrv/core/container.h"#include "core/hle/service/nvdrv/core/nvmap.h"+#include "core/hle/service/nvdrv/devices/ioctl_serialization.h"#include "core/hle/service/nvdrv/devices/nvmap.h"#include "core/memory.h"@@ -31,17 +32,17 @@ NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,case 0x1:switch (command.cmd) {case 0x1:- return IocCreate(input, output);+ return Wrap1(&nvmap::IocCreate, input, output);case 0x3:- return IocFromId(input, output);+ return Wrap1(&nvmap::IocFromId, input, output);case 0x4:- return IocAlloc(input, output);+ return Wrap1(&nvmap::IocAlloc, input, output);case 0x5:- return IocFree(input, output);+ return Wrap1(&nvmap::IocFree, input, output);case 0x9:- return IocParam(input, output);+ return Wrap1(&nvmap::IocParam, input, output);case 0xe:- return IocGetId(input, output);+ return Wrap1(&nvmap::IocGetId, input, output);default:break;}@@ -69,9 +70,7 @@ NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, stvoid nvmap::OnOpen(DeviceFD fd) {}void nvmap::OnClose(DeviceFD fd) {}-NvResult nvmap::IocCreate(std::span<const u8> input, std::span<u8> output) {- IocCreateParams params;- std::memcpy(¶ms, input.data(), sizeof(params));+NvResult nvmap::IocCreate(IocCreateParams& params) {LOG_DEBUG(Service_NVDRV, "called, size=0x{:08X}", params.size);std::shared_ptr<NvCore::NvMap::Handle> handle_description{};@@ -85,13 +84,10 @@ NvResult nvmap::IocCreate(std::span<const u8> input, std::span<u8> output) {params.handle = handle_description->id;LOG_DEBUG(Service_NVDRV, "handle: {}, size: 0x{:X}", handle_description->id, params.size);- std::memcpy(output.data(), ¶ms, sizeof(params));return NvResult::Success;}-NvResult nvmap::IocAlloc(std::span<const u8> input, std::span<u8> output) {- IocAllocParams params;- std::memcpy(¶ms, input.data(), sizeof(params));+NvResult nvmap::IocAlloc(IocAllocParams& params) {LOG_DEBUG(Service_NVDRV, "called, addr={:X}", params.address);if (!params.handle) {@@ -133,14 +129,10 @@ NvResult nvmap::IocAlloc(std::span<const u8> input, std::span<u8> output) {handle_description->size,Kernel::KMemoryPermission::None, true, false).IsSuccess());- std::memcpy(output.data(), ¶ms, sizeof(params));return result;}-NvResult nvmap::IocGetId(std::span<const u8> input, std::span<u8> output) {- IocGetIdParams params;- std::memcpy(¶ms, input.data(), sizeof(params));-+NvResult nvmap::IocGetId(IocGetIdParams& params) {LOG_DEBUG(Service_NVDRV, "called");// See the comment in FromId for extra info on this function@@ -157,14 +149,10 @@ NvResult nvmap::IocGetId(std::span<const u8> input, std::span<u8> output) {}params.id = handle_description->id;- std::memcpy(output.data(), ¶ms, sizeof(params));return NvResult::Success;}-NvResult nvmap::IocFromId(std::span<const u8> input, std::span<u8> output) {- IocFromIdParams params;- std::memcpy(¶ms, input.data(), sizeof(params));-+NvResult nvmap::IocFromId(IocFromIdParams& params) {LOG_DEBUG(Service_NVDRV, "called, id:{}", params.id);// Handles and IDs are always the same value in nvmap however IDs can be used globally given the@@ -188,16 +176,12 @@ NvResult nvmap::IocFromId(std::span<const u8> input, std::span<u8> output) {return result;}params.handle = handle_description->id;- std::memcpy(output.data(), ¶ms, sizeof(params));return NvResult::Success;}-NvResult nvmap::IocParam(std::span<const u8> input, std::span<u8> output) {+NvResult nvmap::IocParam(IocParamParams& params) {enum class ParamTypes { Size = 1, Alignment = 2, Base = 3, Heap = 4, Kind = 5, Compr = 6 };- IocParamParams params;- std::memcpy(¶ms, input.data(), sizeof(params));-LOG_DEBUG(Service_NVDRV, "called type={}", params.param);if (!params.handle) {@@ -237,14 +221,10 @@ NvResult nvmap::IocParam(std::span<const u8> input, std::span<u8> output) {return NvResult::BadValue;}- std::memcpy(output.data(), ¶ms, sizeof(params));return NvResult::Success;}-NvResult nvmap::IocFree(std::span<const u8> input, std::span<u8> output) {- IocFreeParams params;- std::memcpy(¶ms, input.data(), sizeof(params));-+NvResult nvmap::IocFree(IocFreeParams& params) {LOG_DEBUG(Service_NVDRV, "called");if (!params.handle) {@@ -267,7 +247,6 @@ NvResult nvmap::IocFree(std::span<const u8> input, std::span<u8> output) {// This is possible when there's internal dups or other duplicates.}- std::memcpy(output.data(), ¶ms, sizeof(params));return NvResult::Success;}diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.hindex 4c0cc71cd2..049c110284 100644--- a/src/core/hle/service/nvdrv/devices/nvmap.h+++ b/src/core/hle/service/nvdrv/devices/nvmap.h@@ -99,12 +99,12 @@ public:};static_assert(sizeof(IocGetIdParams) == 8, "IocGetIdParams has wrong size");- NvResult IocCreate(std::span<const u8> input, std::span<u8> output);- NvResult IocAlloc(std::span<const u8> input, std::span<u8> output);- NvResult IocGetId(std::span<const u8> input, std::span<u8> output);- NvResult IocFromId(std::span<const u8> input, std::span<u8> output);- NvResult IocParam(std::span<const u8> input, std::span<u8> output);- NvResult IocFree(std::span<const u8> input, std::span<u8> output);+ NvResult IocCreate(IocCreateParams& params);+ NvResult IocAlloc(IocAllocParams& params);+ NvResult IocGetId(IocGetIdParams& params);+ NvResult IocFromId(IocFromIdParams& params);+ NvResult IocParam(IocParamParams& params);+ NvResult IocFree(IocFreeParams& params);private:/// Id to use for the next handle that is created.diff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp b/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cppindex 2e29bc8487..6dc327b8be 100644--- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp+++ b/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp@@ -71,24 +71,17 @@ Result AllocateIoForProcessAddressSpace(Common::ProcessAddress* out_map_address,R_SUCCEED();}-template <typename T>-std::span<u8> SerializeIoc(T& params) {- return std::span(reinterpret_cast<u8*>(std::addressof(params)), sizeof(T));-}-Result CreateNvMapHandle(u32* out_nv_map_handle, Nvidia::Devices::nvmap& nvmap, u32 size) {// Create a handle.- Nvidia::Devices::nvmap::IocCreateParams create_in_params{+ Nvidia::Devices::nvmap::IocCreateParams create_params{.size = size,.handle = 0,};- Nvidia::Devices::nvmap::IocCreateParams create_out_params{};- R_UNLESS(nvmap.IocCreate(SerializeIoc(create_in_params), SerializeIoc(create_out_params)) ==- Nvidia::NvResult::Success,+ R_UNLESS(nvmap.IocCreate(create_params) == Nvidia::NvResult::Success,VI::ResultOperationFailed);// Assign the output handle.- *out_nv_map_handle = create_out_params.handle;+ *out_nv_map_handle = create_params.handle;// We succeeded.R_SUCCEED();@@ -96,13 +89,10 @@ Result CreateNvMapHandle(u32* out_nv_map_handle, Nvidia::Devices::nvmap& nvmap,Result FreeNvMapHandle(Nvidia::Devices::nvmap& nvmap, u32 handle) {// Free the handle.- Nvidia::Devices::nvmap::IocFreeParams free_in_params{+ Nvidia::Devices::nvmap::IocFreeParams free_params{.handle = handle,};- Nvidia::Devices::nvmap::IocFreeParams free_out_params{};- R_UNLESS(nvmap.IocFree(SerializeIoc(free_in_params), SerializeIoc(free_out_params)) ==- Nvidia::NvResult::Success,- VI::ResultOperationFailed);+ R_UNLESS(nvmap.IocFree(free_params) == Nvidia::NvResult::Success, VI::ResultOperationFailed);// We succeeded.R_SUCCEED();@@ -111,7 +101,7 @@ Result FreeNvMapHandle(Nvidia::Devices::nvmap& nvmap, u32 handle) {Result AllocNvMapHandle(Nvidia::Devices::nvmap& nvmap, u32 handle, Common::ProcessAddress buffer,u32 size) {// Assign the allocated memory to the handle.- Nvidia::Devices::nvmap::IocAllocParams alloc_in_params{+ Nvidia::Devices::nvmap::IocAllocParams alloc_params{.handle = handle,.heap_mask = 0,.flags = {},@@ -119,10 +109,7 @@ Result AllocNvMapHandle(Nvidia::Devices::nvmap& nvmap, u32 handle, Common::Proce.kind = 0,.address = GetInteger(buffer),};- Nvidia::Devices::nvmap::IocAllocParams alloc_out_params{};- R_UNLESS(nvmap.IocAlloc(SerializeIoc(alloc_in_params), SerializeIoc(alloc_out_params)) ==- Nvidia::NvResult::Success,- VI::ResultOperationFailed);+ R_UNLESS(nvmap.IocAlloc(alloc_params) == Nvidia::NvResult::Success, VI::ResultOperationFailed);// We succeeded.R_SUCCEED();