archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPU: make do_dma_transfer() static with _this arg

Browse source 
Instead of this, nullptr will be passed from another thread.
MMIO via MMIO is disabled if it even possible.
This commit is contained in:
Nekotekina 2020-10-30 02:07:20 +03:00
parent 4378a09867
commit 006c783aba
3 changed files with 50 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ bool spu_thread::read_reg(const u32 addr, u32& value)
if (cmd.size) if (cmd.size)
{ {
// Perform transfer immediately // Perform transfer immediately
do_dma_transfer(cmd); do_dma_transfer(nullptr, cmd, ls);
} }
if (cmd.cmd & MFC_START_MASK) if (cmd.cmd & MFC_START_MASK)

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

@ -1564,7 +1564,7 @@ void spu_thread::push_snr(u32 number, u32 value)
}); });
} }
void spu_thread::do_dma_transfer(const spu_mfc_cmd& args) void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8* ls)
{ {
const bool is_get = (args.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK | MFC_START_MASK)) == MFC_GET_CMD; const bool is_get = (args.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK | MFC_START_MASK)) == MFC_GET_CMD;
@ -1572,7 +1572,7 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
u32 lsa = args.lsa & 0x3ffff; u32 lsa = args.lsa & 0x3ffff;
// SPU Thread Group MMIO (LS and SNR) and RawSPU MMIO // SPU Thread Group MMIO (LS and SNR) and RawSPU MMIO
if (eal >= RAW_SPU_BASE_ADDR) if (_this && eal >= RAW_SPU_BASE_ADDR)
{ {
const u32 index = (eal - SYS_SPU_THREAD_BASE_LOW) / SYS_SPU_THREAD_OFFSET; // thread number in group const u32 index = (eal - SYS_SPU_THREAD_BASE_LOW) / SYS_SPU_THREAD_OFFSET; // thread number in group
const u32 offset = (eal - SYS_SPU_THREAD_BASE_LOW) % SYS_SPU_THREAD_OFFSET; // LS offset or MMIO register const u32 offset = (eal - SYS_SPU_THREAD_BASE_LOW) % SYS_SPU_THREAD_OFFSET; // LS offset or MMIO register
@ -1591,10 +1591,10 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
} }
else if (u32 value; args.size == 4 && is_get && thread->read_reg(eal, value)) else if (u32 value; args.size == 4 && is_get && thread->read_reg(eal, value))
{ {
_ref<u32>(lsa) = value; _this->_ref<u32>(lsa) = value;
return; return;
} }
else if (args.size == 4 && !is_get && thread->write_reg(eal, args.cmd != MFC_SDCRZ_CMD ? +_ref<u32>(lsa) : 0)) else if (args.size == 4 && !is_get && thread->write_reg(eal, args.cmd != MFC_SDCRZ_CMD ? + _this->_ref<u32>(lsa) : 0))
{ {
return; return;
} }
@ -1603,13 +1603,13 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
fmt::throw_exception("Invalid RawSPU MMIO offset (cmd=[%s])" HERE, args); fmt::throw_exception("Invalid RawSPU MMIO offset (cmd=[%s])" HERE, args);
} }
} }
else if (get_type() >= spu_type::raw) else if (_this->get_type() >= spu_type::raw)
{ {
// Access Violation // Access Violation
} }
else if (group && group->threads_map[index] != -1) else if (_this->group && _this->group->threads_map[index] != -1)
{ {
auto& spu = static_cast<spu_thread&>(*group->threads[group->threads_map[index]]); auto& spu = static_cast<spu_thread&>(*_this->group->threads[_this->group->threads_map[index]]);
if (offset + args.size - 1 < SPU_LS_SIZE) // LS access if (offset + args.size - 1 < SPU_LS_SIZE) // LS access
{ {
@ -1617,7 +1617,7 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
} }
else if (!is_get && args.size == 4 && (offset == SYS_SPU_THREAD_SNR1 || offset == SYS_SPU_THREAD_SNR2)) else if (!is_get && args.size == 4 && (offset == SYS_SPU_THREAD_SNR1 || offset == SYS_SPU_THREAD_SNR2))
{ {
spu.push_snr(SYS_SPU_THREAD_SNR2 == offset, args.cmd != MFC_SDCRZ_CMD ? +_ref<u32>(lsa) : 0); spu.push_snr(SYS_SPU_THREAD_SNR2 == offset, args.cmd != MFC_SDCRZ_CMD ? +_this->_ref<u32>(lsa) : 0);
return; return;
} }
else else
@ -1636,12 +1636,15 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
const u8* src = nullptr; const u8* src = nullptr;
// Cleanup: if PUT or GET happens after PUTLLC failure, it's too complicated and it's easier to just give up // Cleanup: if PUT or GET happens after PUTLLC failure, it's too complicated and it's easier to just give up
last_faddr = 0; if (_this)
{
_this->last_faddr = 0;
}
std::tie(dst, src) = [&]() -> std::pair<u8*, const u8*> std::tie(dst, src) = [&]() -> std::pair<u8*, const u8*>
{ {
u8* dst = vm::_ptr<u8>(eal); u8* dst = vm::_ptr<u8>(eal);
u8* src = _ptr<u8>(lsa); u8* src = ls + lsa;
if (is_get) if (is_get)
{ {
@ -1670,16 +1673,36 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
perf_get.reset(); perf_get.reset();
} }
for (u32 size = args.size, size0; is_get; cpu_thread* _cpu = _this ? _this : get_current_cpu_thread();
size -= size0, dst += size0, src += size0, eal += size0)
atomic_t<u64, 64>* range_lock = nullptr;
if (!_this) [[unlikely]]
{
if (_cpu->id_type() == 2)
{
// Use range_lock of current SPU thread for range locks
range_lock = static_cast<spu_thread*>(_cpu)->range_lock;
}
else
{
goto plain_access;
}
}
else
{
range_lock = _this->range_lock;
}
for (u32 size = args.size, size0; is_get; size -= size0, dst += size0, src += size0, eal += size0)
{ {
size0 = std::min<u32>(128 - (eal & 127), std::min<u32>(size, 128)); size0 = std::min<u32>(128 - (eal & 127), std::min<u32>(size, 128));
for (u64 i = 0;; [&]() for (u64 i = 0;; [&]()
{ {
if (state) if (_cpu->state)
{ {
check_state(); _cpu->check_state();
} }
else if (++i < 25) [[likely]] else if (++i < 25) [[likely]]
{ {
@ -1687,9 +1710,9 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
} }
else else
{ {
state += cpu_flag::wait + cpu_flag::temp; _cpu->state += cpu_flag::wait + cpu_flag::temp;
std::this_thread::yield(); std::this_thread::yield();
check_state(); _cpu->check_state();
} }
}()) }())
{ {
@ -1820,9 +1843,9 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
for (u64 i = 0; i != umax; [&]() for (u64 i = 0; i != umax; [&]()
{ {
if (state & cpu_flag::pause) if (_cpu->state & cpu_flag::pause)
{ {
cpu_thread::if_suspended(this, [&] cpu_thread::if_suspended(_cpu, [&]
{ {
std::memcpy(dst, src, size0); std::memcpy(dst, src, size0);
res += 128; res += 128;
@ -1840,9 +1863,9 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
else else
{ {
// Wait // Wait
state += cpu_flag::wait + cpu_flag::temp; _cpu->state += cpu_flag::wait + cpu_flag::temp;
bits->wait(old, wmask); bits->wait(old, wmask);
check_state(); _cpu->check_state();
} }
}()) }())
{ {
@ -2103,6 +2126,8 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
return; return;
} }
plain_access:
switch (u32 size = args.size) switch (u32 size = args.size)
{ {
case 1: case 1:
@ -2269,7 +2294,7 @@ bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
transfer.lsa = args.lsa | (addr & 0xf); transfer.lsa = args.lsa | (addr & 0xf);
transfer.size = size; transfer.size = size;
do_dma_transfer(transfer); do_dma_transfer(this, transfer, ls);
const u32 add_size = std::max<u32>(size, 16); const u32 add_size = std::max<u32>(size, 16);
args.lsa += add_size; args.lsa += add_size;
} }
@ -2615,7 +2640,7 @@ void spu_thread::do_mfc(bool wait)
} }
else if (args.size) else if (args.size)
{ {
do_dma_transfer(args); do_dma_transfer(this, args, ls);
} }
removed++; removed++;
@ -2909,7 +2934,7 @@ bool spu_thread::process_mfc_cmd()
{ {
if (ch_mfc_cmd.size) if (ch_mfc_cmd.size)
{ {
do_dma_transfer(ch_mfc_cmd); do_dma_transfer(this, ch_mfc_cmd, ls);
} }
return true; return true;

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

@ -768,7 +768,7 @@ public:
u64 start_time{}; // Starting time of STOP or RDCH bloking function u64 start_time{}; // Starting time of STOP or RDCH bloking function
void push_snr(u32 number, u32 value); void push_snr(u32 number, u32 value);
void do_dma_transfer(const spu_mfc_cmd& args); static void do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8* ls);
bool do_dma_check(const spu_mfc_cmd& args); bool do_dma_check(const spu_mfc_cmd& args);
bool do_list_transfer(spu_mfc_cmd& args); bool do_list_transfer(spu_mfc_cmd& args);
void do_putlluc(const spu_mfc_cmd& args); void do_putlluc(const spu_mfc_cmd& args);