archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PPU LLVM: don't use module name as PRX indicator

Browse source
This commit is contained in:
Nekotekina 2021-01-28 14:22:49 +03:00
parent 8a029159cd
commit c89362f6a2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2561,7 +2561,7 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
usz fpos = 0; usz fpos = 0;
// Difference between function name and current location // Difference between function name and current location
const u32 reloc = info.name.empty() ? 0 : info.segs.at(0).addr; const u32 reloc = info.relocs.empty() ? 0 : info.segs.at(0).addr;
// Info sent to threads // Info sent to threads
std::vector<std::pair<std::string, ppu_module>> workload; std::vector<std::pair<std::string, ppu_module>> workload;

4
rpcs3/Emu/Cell/PPUTranslator.cpp
View file

@ -27,7 +27,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
cpu_translator::initialize(context, engine); cpu_translator::initialize(context, engine);
// There is no weak linkage on JIT, so let's create variables with different names for each module part // There is no weak linkage on JIT, so let's create variables with different names for each module part
const u32 gsuffix = m_info.name.empty() ? info.funcs[0].addr : info.funcs[0].addr - m_info.segs[0].addr; const u32 gsuffix = m_info.relocs.empty() ? info.funcs[0].addr : info.funcs[0].addr - m_info.segs[0].addr;
// Memory base // Memory base
m_base = new GlobalVariable(*_module, ArrayType::get(GetType<char>(), 0x100000000)->getPointerTo(), true, GlobalValue::ExternalLinkage, 0, fmt::format("__mptr%x", gsuffix)); m_base = new GlobalVariable(*_module, ArrayType::get(GetType<char>(), 0x100000000)->getPointerTo(), true, GlobalValue::ExternalLinkage, 0, fmt::format("__mptr%x", gsuffix));
@ -130,7 +130,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
} }
} }
if (!m_info.name.empty()) if (!m_info.relocs.empty())
{ {
m_reloc = &m_info.segs[0]; m_reloc = &m_info.segs[0];
} }