mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SPU ELF loading

Browse source 
I'm not sure that it's correct way to get entry point
This commit is contained in:
Nekotekina 2013-11-29 19:27:10 +04:00
parent 65c920bc8d
commit c48168ffc7
7 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -51,7 +51,7 @@ void SPUThread::InitRegs()
SPU.Status.SetValue(SPU_STATUS_RUNNING);
Prxy.QueryType.SetValue(0);
MFC.CMDStatus.SetValue(0);
PC = SPU.NPC.GetValue();
//PC = SPU.NPC.GetValue();
}
u64 SPUThread::GetFreeStackSize() const

3
rpcs3/Emu/System.cpp
View file

@ -185,7 +185,8 @@ void Emulator::Load()
ConLog.Write("max addr = 0x%x", l.GetMaxAddr());
thread.SetOffset(Memory.MainMem.GetStartAddr());
Memory.MainMem.Alloc(Memory.MainMem.GetStartAddr() + l.GetMaxAddr(), 0xFFFFED - l.GetMaxAddr());
thread.SetEntry(l.GetEntry() - Memory.MainMem.GetStartAddr());
//thread.SetEntry(l.GetEntry() - Memory.MainMem.GetStartAddr());
thread.SetEntry(l.GetTextEntry());
break;
case MACHINE_PPC64:

1
rpcs3/Loader/ELF.cpp
View file

@ -27,6 +27,7 @@ bool ELFLoader::LoadInfo()
entry = loader->GetEntry();
machine = loader->GetMachine();
_text_section_offset = loader->GetTextEntry();
return true;
}

2
rpcs3/Loader/ELF32.cpp
View file

@ -135,6 +135,8 @@ bool ELF32Loader::LoadShdrInfo()
name += c;
}
shdr_name_arr.Add(name);
if(name == ".text") //temporary solution for SPU ELF loading
_text_section_offset = shdr_arr[i].sh_offset;
}
return true;

3
rpcs3/Loader/ELF64.cpp
View file

@ -186,6 +186,8 @@ bool ELF64Loader::LoadShdrInfo(s64 offset)
}
shdr_name_arr.Add(name);
if(name == ".text")
_text_section_offset = shdr_arr[i].sh_offset;
}
return true;
@ -371,6 +373,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
if(!module->Load(nid))
{
ConLog.Warning("Unknown function 0x%08x in '%s' module", nid, module_name.mb_str());
SysCalls::DoFunc(nid);
}
}
#ifdef LOADER_DEBUG

1
rpcs3/Loader/Loader.cpp
View file

@ -147,6 +147,7 @@ bool Loader::Analyze()
machine = m_loader->GetMachine();
entry = m_loader->GetMachine() == MACHINE_SPU ? m_loader->GetEntry() + g_spu_offset : m_loader->GetEntry();
_text_section_offset = m_loader->GetTextEntry();
return true;
}

3
rpcs3/Loader/Loader.h
View file

@ -181,12 +181,14 @@ protected:
u32 min_addr;
u32 max_addr;
Elf_Machine machine;
u32 _text_section_offset;
LoaderBase()
: machine(MACHINE_Unknown)
, entry(0)
, min_addr(0)
, max_addr(0)
, _text_section_offset(0)
{
}
@ -196,6 +198,7 @@ public:
Elf_Machine GetMachine() { return machine; }
u32 GetEntry() { return entry; }
u32 GetTextEntry() { return _text_section_offset; }
u32 GetMinAddr() { return min_addr; }
u32 GetMaxAddr() { return min_addr; }
};