summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-19 20:43:14 +0200
committerGitHub <noreply@github.com>2018-07-19 20:43:14 +0200
commit1034bcc7421fedfb32369dabcf6edb9aee2690b8 (patch)
tree08acdeefc3e1ae657fc6cba6a32e217825672ac0 /src/core
parentMerge pull request #709 from lioncash/thread-local (diff)
parentloader/nro: Resolve sign mismatch warnings (diff)
downloadyuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar.gz
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar.bz2
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar.lz
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar.xz
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.tar.zst
yuzu-1034bcc7421fedfb32369dabcf6edb9aee2690b8.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/loader/nro.cpp2
-rw-r--r--src/core/loader/nso.cpp8
2 files changed, 4 insertions, 6 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index a007d3e6e..465b827bb 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -82,7 +82,7 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
if (program_image.size() != PageAlignSize(nro_header.file_size))
return {};
- for (int i = 0; i < nro_header.segments.size(); ++i) {
+ for (std::size_t i = 0; i < nro_header.segments.size(); ++i) {
codeset->segments[i].addr = nro_header.segments[i].offset;
codeset->segments[i].offset = nro_header.segments[i].offset;
codeset->segments[i].size = PageAlignSize(nro_header.segments[i].size);
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index 2beb85fbf..f7752e0e3 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -66,8 +66,7 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& file) {
static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
const NsoSegmentHeader& header) {
- std::vector<u8> uncompressed_data;
- uncompressed_data.resize(header.size);
+ std::vector<u8> uncompressed_data(header.size);
const int bytes_uncompressed = LZ4_decompress_safe(
reinterpret_cast<const char*>(compressed_data.data()),
reinterpret_cast<char*>(uncompressed_data.data()), compressed_data.size(), header.size);
@@ -80,8 +79,7 @@ static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
static std::vector<u8> ReadSegment(FileUtil::IOFile& file, const NsoSegmentHeader& header,
size_t compressed_size) {
- std::vector<u8> compressed_data;
- compressed_data.resize(compressed_size);
+ std::vector<u8> compressed_data(compressed_size);
file.Seek(header.offset, SEEK_SET);
if (compressed_size != file.ReadBytes(compressed_data.data(), compressed_size)) {
@@ -113,7 +111,7 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) {
// Build program image
Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("");
std::vector<u8> program_image;
- for (int i = 0; i < nso_header.segments.size(); ++i) {
+ for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
const std::vector<u8> compressed_data =
file->ReadBytes(nso_header.segments_compressed_size[i], nso_header.segments[i].offset);
std::vector<u8> data = DecompressSegment(compressed_data, nso_header.segments[i]);