mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 13:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not account RSX for TSX pauses

Browse Source
This commit is contained in:
Eladash 2021-01-29 08:45:58 +02:00 committed by Ivan
parent 70346028c5
commit a742501a4f
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/Thread.cpp
View File

@ -1549,7 +1549,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
return true; return true;
} }
if (cpu->id_type() != 1) if (cpu->id_type() == 2)
{ {
if (!g_tls_access_violation_recovered) if (!g_tls_access_violation_recovered)
{ {

8
rpcs3/Emu/CPU/CPUThread.cpp
View File

@ -276,6 +276,14 @@ namespace cpu_counter
{ {
void add(cpu_thread* _this) noexcept void add(cpu_thread* _this) noexcept
{ {
switch (_this->id_type())
{
case 1:
case 2:
break;
default: return;
}
std::lock_guard lock(s_cpu_lock); std::lock_guard lock(s_cpu_lock);
u32 id = -1; u32 id = -1;

2
rpcs3/rpcs3qt/debugger_frame.cpp
View File

@ -272,7 +272,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
return; return;
} }
const u32 address_limits = (cpu->id_type() != 1 ? 0x3fffc : ~3); const u32 address_limits = (cpu->id_type() == 2 ? 0x3fffc : ~3);
const u32 pc = (i >= 0 ? m_debugger_list->m_pc + i * 4 : cpu->get_pc()) & address_limits; const u32 pc = (i >= 0 ? m_debugger_list->m_pc + i * 4 : cpu->get_pc()) & address_limits;
const auto modifiers = QApplication::keyboardModifiers(); const auto modifiers = QApplication::keyboardModifiers();

2
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View File

@ -23,7 +23,7 @@ constexpr auto qstr = QString::fromStdString;
memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr, const std::shared_ptr<cpu_thread>& cpu) memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr, const std::shared_ptr<cpu_thread>& cpu)
: QDialog(parent) : QDialog(parent)
, m_addr(addr) , m_addr(addr)
, m_type(!cpu || cpu->id_type() != 2 ? thread_type::ppu : thread_type::spu) , m_type(!cpu || cpu->id_type() == 1 ? thread_type::ppu : thread_type::spu)
, m_spu_shm(m_type == thread_type::spu ? static_cast<spu_thread*>(cpu.get())->shm : nullptr) , m_spu_shm(m_type == thread_type::spu ? static_cast<spu_thread*>(cpu.get())->shm : nullptr)
, m_addr_mask(m_type == thread_type::spu ? SPU_LS_SIZE - 1 : ~0) , m_addr_mask(m_type == thread_type::spu ? SPU_LS_SIZE - 1 : ~0)
{ {