lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-27 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2281 from lioncash/memory

Browse source 
kernel/codeset: Make CodeSet's memory data member a regular std::vector
This commit is contained in:
bunnei 2019-04-01 22:20:05 -04:00 committed by GitHub
parent 62860dc0b0 c0a01f3adc
commit 29df6bbbd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/code_set.h
View file

@ -5,7 +5,6 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <memory>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
@ -78,7 +77,7 @@ struct CodeSet final {
} }
/// The overall data that backs this code set. /// The overall data that backs this code set.
std::shared_ptr<std::vector<u8>> memory; std::vector<u8> memory;
/// The segments that comprise this code set. /// The segments that comprise this code set.
std::array<Segment, 3> segments; std::array<Segment, 3> segments;

6
src/core/hle/kernel/process.cpp
View file

@ -218,11 +218,13 @@ void Process::FreeTLSSlot(VAddr tls_address) {
} }
void Process::LoadModule(CodeSet module_, VAddr base_addr) { void Process::LoadModule(CodeSet module_, VAddr base_addr) {
const auto memory = std::make_shared<std::vector<u8>>(std::move(module_.memory));
const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions,
MemoryState memory_state) { MemoryState memory_state) {
const auto vma = vm_manager const auto vma = vm_manager
.MapMemoryBlock(segment.addr + base_addr, module_.memory, .MapMemoryBlock(segment.addr + base_addr, memory, segment.offset,
segment.offset, segment.size, memory_state) segment.size, memory_state)
.Unwrap(); .Unwrap();
vm_manager.Reprotect(vma, permissions); vm_manager.Reprotect(vma, permissions);
}; };

2
src/core/loader/elf.cpp
View file

@ -341,7 +341,7 @@ Kernel::CodeSet ElfReader::LoadInto(VAddr vaddr) {
} }
codeset.entrypoint = base_addr + header->e_entry; codeset.entrypoint = base_addr + header->e_entry;
codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image)); codeset.memory = std::move(program_image);
LOG_DEBUG(Loader, "Done loading."); LOG_DEBUG(Loader, "Done loading.");

2
src/core/loader/nro.cpp
View file

@ -187,7 +187,7 @@ static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
program_image.resize(static_cast<u32>(program_image.size()) + bss_size); program_image.resize(static_cast<u32>(program_image.size()) + bss_size);
// Load codeset for current process // Load codeset for current process
codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image)); codeset.memory = std::move(program_image);
process.LoadModule(std::move(codeset), load_base); process.LoadModule(std::move(codeset), load_base);
// Register module with GDBStub // Register module with GDBStub

2
src/core/loader/nso.cpp
View file

@ -161,7 +161,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process,
} }
// Load codeset for current process // Load codeset for current process
codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image)); codeset.memory = std::move(program_image);
process.LoadModule(std::move(codeset), load_base); process.LoadModule(std::move(codeset), load_base);
// Register module with GDBStub // Register module with GDBStub