From b8ccd49d77feb52aa333cd30e5d7c28423c5455d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 22 Mar 2019 14:51:36 -0400 Subject: kernel/codeset: Make CodeSet's memory data member a regular std::vector The use of a shared_ptr is an implementation detail of the VMManager itself when mapping memory. Because of that, we shouldn't require all users of the CodeSet to have to allocate the shared_ptr ahead of time. It's intended that CodeSet simply pass in the required direct data, and that the memory manager takes care of it from that point on. This means we just do the shared pointer allocation in a single place, when loading modules, as opposed to in each loader. --- src/core/loader/nro.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/loader/nro.cpp') diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 5de02a94b7..31e4a0c840 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -187,7 +187,7 @@ static bool LoadNroImpl(Kernel::Process& process, const std::vector& data, program_image.resize(static_cast(program_image.size()) + bss_size); // Load codeset for current process - codeset.memory = std::make_shared>(std::move(program_image)); + codeset.memory = std::move(program_image); process.LoadModule(std::move(codeset), load_base); // Register module with GDBStub -- cgit v1.2.3