RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

_sys_spu_image_import implemented

Browse source 
vm:var<T[]> improved (begin/end)
sys_spu_image_import rewritten
This commit is contained in:
Nekotekina 2017-08-26 22:09:46 +03:00
parent dfc970c926
commit aa5dc5455e
6 changed files with 421 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

53
rpcs3/Loader/ELF.h
View file

@ -2,6 +2,7 @@
#include "../../Utilities/types.h"
#include "../../Utilities/File.h"
#include "../../Utilities/bit_set.h"
enum class elf_os : u8
{
@ -133,6 +134,16 @@ struct elf_shdr
en_t<sz_t> sh_entsize;
};
// ELF loading options
enum class elf_opt : u32
{
no_programs, // Don't load phdrs, implies no_data
no_sections, // Don't load shdrs
no_data, // Load phdrs without data
__bitset_enum_max
};
// ELF loading error
enum class elf_error
{
@ -180,12 +191,12 @@ public:
public:
elf_object() = default;
elf_object(const fs::file& stream, u64 offset = 0)
elf_object(const fs::file& stream, u64 offset = 0, bs_t<elf_opt> opts = {})
{
open(stream, offset);
open(stream, offset, opts);
}
elf_error open(const fs::file& stream, u64 offset = 0)
elf_error open(const fs::file& stream, u64 offset = 0, bs_t<elf_opt> opts = {})
{
// Check stream
if (!stream)
@ -231,15 +242,23 @@ public:
return set_error(elf_error::header_version);
// Load program headers
std::vector<phdr_t> _phdrs(header.e_phnum);
stream.seek(offset + header.e_phoff);
if (!stream.read(_phdrs))
return set_error(elf_error::stream_phdrs);
std::vector<phdr_t> _phdrs;
if (!test(opts, elf_opt::no_programs))
{
_phdrs.resize(header.e_phnum);
stream.seek(offset + header.e_phoff);
if (!stream.read(_phdrs))
return set_error(elf_error::stream_phdrs);
}
shdrs.resize(header.e_shnum);
stream.seek(offset + header.e_shoff);
if (!stream.read(shdrs))
return set_error(elf_error::stream_shdrs);
if (!test(opts, elf_opt::no_sections))
{
shdrs.resize(header.e_shnum);
stream.seek(offset + header.e_shoff);
if (!stream.read(shdrs))
return set_error(elf_error::stream_shdrs);
}
progs.clear();
progs.reserve(_phdrs.size());
@ -248,10 +267,14 @@ public:
progs.emplace_back();
static_cast<phdr_t&>(progs.back()) = hdr;
progs.back().bin.resize(hdr.p_filesz);
stream.seek(offset + hdr.p_offset);
if (!stream.read(progs.back().bin))
return set_error(elf_error::stream_data);
if (!test(opts, elf_opt::no_data))
{
progs.back().bin.resize(hdr.p_filesz);
stream.seek(offset + hdr.p_offset);
if (!stream.read(progs.back().bin))
return set_error(elf_error::stream_data);
}
}
shdrs.shrink_to_fit();