mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 10:59:07 +01:00
Merge pull request #694 from lioncash/warn
loader/{nro, nso}: Resolve compilation warnings
This commit is contained in:
commit
1034bcc742
2 changed files with 4 additions and 6 deletions
|
@ -82,7 +82,7 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
|
||||||
if (program_image.size() != PageAlignSize(nro_header.file_size))
|
if (program_image.size() != PageAlignSize(nro_header.file_size))
|
||||||
return {};
|
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].addr = nro_header.segments[i].offset;
|
||||||
codeset->segments[i].offset = nro_header.segments[i].offset;
|
codeset->segments[i].offset = nro_header.segments[i].offset;
|
||||||
codeset->segments[i].size = PageAlignSize(nro_header.segments[i].size);
|
codeset->segments[i].size = PageAlignSize(nro_header.segments[i].size);
|
||||||
|
|
|
@ -66,8 +66,7 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& file) {
|
||||||
|
|
||||||
static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
|
static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
|
||||||
const NsoSegmentHeader& header) {
|
const NsoSegmentHeader& header) {
|
||||||
std::vector<u8> uncompressed_data;
|
std::vector<u8> uncompressed_data(header.size);
|
||||||
uncompressed_data.resize(header.size);
|
|
||||||
const int bytes_uncompressed = LZ4_decompress_safe(
|
const int bytes_uncompressed = LZ4_decompress_safe(
|
||||||
reinterpret_cast<const char*>(compressed_data.data()),
|
reinterpret_cast<const char*>(compressed_data.data()),
|
||||||
reinterpret_cast<char*>(uncompressed_data.data()), compressed_data.size(), header.size);
|
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,
|
static std::vector<u8> ReadSegment(FileUtil::IOFile& file, const NsoSegmentHeader& header,
|
||||||
size_t compressed_size) {
|
size_t compressed_size) {
|
||||||
std::vector<u8> compressed_data;
|
std::vector<u8> compressed_data(compressed_size);
|
||||||
compressed_data.resize(compressed_size);
|
|
||||||
|
|
||||||
file.Seek(header.offset, SEEK_SET);
|
file.Seek(header.offset, SEEK_SET);
|
||||||
if (compressed_size != file.ReadBytes(compressed_data.data(), compressed_size)) {
|
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
|
// Build program image
|
||||||
Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("");
|
Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("");
|
||||||
std::vector<u8> program_image;
|
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 =
|
const std::vector<u8> compressed_data =
|
||||||
file->ReadBytes(nso_header.segments_compressed_size[i], nso_header.segments[i].offset);
|
file->ReadBytes(nso_header.segments_compressed_size[i], nso_header.segments[i].offset);
|
||||||
std::vector<u8> data = DecompressSegment(compressed_data, nso_header.segments[i]);
|
std::vector<u8> data = DecompressSegment(compressed_data, nso_header.segments[i]);
|
||||||
|
|
Loading…
Reference in a new issue