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 #8479 from nokturnusmf/master 

Fixed #11874 (leading 0s ignored by debugger)
This commit is contained in:
Anthony 2019-11-27 15:57:54 -08:00 committed by GitHub
parent 41563aed21 5b6e7aabcf
commit 66ca83e6af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,7 +379,7 @@ void MemoryViewWidget::OnCopyHex()
u64 value = accessors->ReadU64(addr);
QApplication::clipboard()->setText(
QStringLiteral("%1").arg(value, length * 2, 16, QLatin1Char('0')).left(length * 2));
QStringLiteral("%1").arg(value, sizeof(u64) * 2, 16, QLatin1Char('0')).left(length * 2));
}
void MemoryViewWidget::OnContextMenu()

13
Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
View File

@ -488,12 +488,15 @@ void MemoryWidget::OnSetValue()
const QByteArray bytes = m_data_edit->text().toUtf8();
for (char c : bytes)
accessors->WriteU8(static_cast<u8>(c), addr++);
accessors->WriteU8(addr++, static_cast<u8>(c));
}
else
{
bool good_value;
u64 value = m_data_edit->text().toULongLong(&good_value, 16);
const QString text = m_data_edit->text();
const int length =
text.startsWith(QStringLiteral("0x"), Qt::CaseInsensitive) ? text.size() - 2 : text.size();
const u64 value = text.toULongLong(&good_value, 16);
if (!good_value)
{
@ -501,15 +504,15 @@ void MemoryWidget::OnSetValue()
return;
}
if (value == static_cast<u8>(value))
if (length <= 2)
{
accessors->WriteU8(addr, static_cast<u8>(value));
}
else if (value == static_cast<u16>(value))
else if (length <= 4)
{
accessors->WriteU16(addr, static_cast<u16>(value));
}
else if (value == static_cast<u32>(value))
else if (length <= 8)
{
accessors->WriteU32(addr, static_cast<u32>(value));
}