Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused include and very small refactoring.

Browse Source 
Unused include in unself.h, ELF.h.
New line after an if to enable debugging.
Rewrite strange boolean expression in ELF.cpp.
This commit is contained in:
Arkaran99
2014-09-11 00:59:50 +02:00
parent 9834fc7f70
commit 7dafb164e8
7 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Loader/ELF.cpp
+24 -16
View File
@@ -1,6 +1,8 @@
#include "stdafx.h"
#include "Emu/FS/vfsStream.h"
#include "ELF.h"
#include "ELF64.h"
#include "ELF32.h"
void Elf_Ehdr::Show()
{
@@ -13,43 +15,49 @@ void Elf_Ehdr::Load(vfsStream& f)
}
ELFLoader::ELFLoader(vfsStream& f)
: elf_f(f)
: m_elf_file(f)
, LoaderBase()
, loader(nullptr)
, m_loader(nullptr)
{
}
bool ELFLoader::LoadInfo()
{
if(!elf_f.IsOpened()) return false;
if(!m_elf_file.IsOpened())
return false;
elf_f.Seek(0);
ehdr.Load(elf_f);
if(!ehdr.CheckMagic()) return false;
m_elf_file.Seek(0);
ehdr.Load(m_elf_file);
if(!ehdr.CheckMagic())
return false;
switch(ehdr.GetClass())
{
case CLASS_ELF32: loader = new ELF32Loader(elf_f); break;
case CLASS_ELF64: loader = new ELF64Loader(elf_f); break;
case CLASS_ELF32:
m_loader = new ELF32Loader(m_elf_file);
break;
case CLASS_ELF64:
m_loader = new ELF64Loader(m_elf_file);
break;
}
if(!loader || !loader->LoadInfo()) return false;
if(!(m_loader && m_loader->LoadInfo()))
return false;
entry = loader->GetEntry();
machine = loader->GetMachine();
entry = m_loader->GetEntry();
machine = m_loader->GetMachine();
return true;
}
bool ELFLoader::LoadData(u64 offset)
{
if(!loader || !loader->LoadData(offset)) return false;
return true;
return m_loader && m_loader->LoadData(offset);
}
bool ELFLoader::Close()
{
delete loader;
loader = nullptr;
return elf_f.Close();
delete m_loader;
m_loader = nullptr;
return m_elf_file.Close();
}