Merge pull request #11201 from JoshuaMKW/fix-instruction-patches
MemoryPatches: Fix instruction patches
This commit is contained in:
commit
6dcf8a6fc9
|
@ -32,6 +32,7 @@ void MemoryPatches::SetPatch(u32 address, u32 value)
|
|||
|
||||
void MemoryPatches::SetPatch(u32 address, std::vector<u8> value)
|
||||
{
|
||||
UnsetPatch(address);
|
||||
const std::size_t index = m_patches.size();
|
||||
m_patches.emplace_back(address, std::move(value));
|
||||
Patch(index);
|
||||
|
@ -44,20 +45,14 @@ const std::vector<MemoryPatch>& MemoryPatches::GetPatches() const
|
|||
|
||||
void MemoryPatches::UnsetPatch(u32 address)
|
||||
{
|
||||
const auto it = std::remove_if(m_patches.begin(), m_patches.end(),
|
||||
[address](const auto& patch) { return patch.address == address; });
|
||||
const auto it = std::find_if(m_patches.begin(), m_patches.end(),
|
||||
[address](const auto& patch) { return patch.address == address; });
|
||||
|
||||
if (it == m_patches.end())
|
||||
return;
|
||||
|
||||
const std::size_t size = m_patches.size();
|
||||
std::size_t index = size - std::distance(it, m_patches.end());
|
||||
while (index < size)
|
||||
{
|
||||
DisablePatch(index);
|
||||
++index;
|
||||
}
|
||||
m_patches.erase(it, m_patches.end());
|
||||
const std::size_t index = std::distance(m_patches.begin(), it);
|
||||
RemovePatch(index);
|
||||
}
|
||||
|
||||
void MemoryPatches::EnablePatch(std::size_t index)
|
||||
|
|
|
@ -513,7 +513,6 @@ void CodeViewWidget::SetAddress(u32 address, SetAddressUpdate update)
|
|||
|
||||
void CodeViewWidget::ReplaceAddress(u32 address, ReplaceWith replace)
|
||||
{
|
||||
PowerPC::debug_interface.UnsetPatch(address);
|
||||
PowerPC::debug_interface.SetPatch(address, replace == ReplaceWith::BLR ? 0x4e800020 : 0x60000000);
|
||||
Update();
|
||||
}
|
||||
|
@ -823,7 +822,6 @@ void CodeViewWidget::OnReplaceInstruction()
|
|||
|
||||
if (dialog.exec() == QDialog::Accepted)
|
||||
{
|
||||
PowerPC::debug_interface.UnsetPatch(addr);
|
||||
PowerPC::debug_interface.SetPatch(addr, dialog.GetCode());
|
||||
Update();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue