ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11563 from JosJuice/host-lock-cpu-fixups 

Follow-up fixes for "Properly lock CPU before accessing emulated memory"
This commit is contained in:
Admiral H. Curtiss 2023-02-14 19:04:21 +01:00 committed by GitHub
parent ba3c38a63f 5b6784432c
commit 22ed084209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
View File

@ -754,7 +754,7 @@ void CodeViewWidget::OnCopyTargetAddress()
const std::optional<u32> target_addr = const std::optional<u32> target_addr =
PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line); PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line);
if (addr) if (target_addr)
{ {
QApplication::clipboard()->setText( QApplication::clipboard()->setText(
QStringLiteral("%1").arg(*target_addr, 8, 16, QLatin1Char('0'))); QStringLiteral("%1").arg(*target_addr, 8, 16, QLatin1Char('0')));
@ -784,7 +784,7 @@ void CodeViewWidget::OnShowTargetInMemory()
const std::optional<u32> target_addr = const std::optional<u32> target_addr =
PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line); PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line);
if (addr) if (target_addr)
emit ShowMemory(*target_addr); emit ShowMemory(*target_addr);
} }

1
Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
View File

@ -18,7 +18,6 @@
#include <fmt/printf.h> #include <fmt/printf.h>
#include "Common/Align.h" #include "Common/Align.h"
#include "Common/Assert.h"
#include "Common/FloatUtils.h" #include "Common/FloatUtils.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Swap.h" #include "Common/Swap.h"