The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-14 00:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 11874 (leading 0s ignored by debugger)

Browse Source
This commit is contained in:
Matthew Foulds 2019-11-19 18:47:00 +00:00
parent d66050375c
commit 5b6e7aabcf
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); u64 value = accessors->ReadU64(addr);
QApplication::clipboard()->setText( 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() 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(); const QByteArray bytes = m_data_edit->text().toUtf8();
for (char c : bytes) for (char c : bytes)
accessors->WriteU8(static_cast<u8>(c), addr++); accessors->WriteU8(addr++, static_cast<u8>(c));
} }
else else
{ {
bool good_value; 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) if (!good_value)
{ {
@ -501,15 +504,15 @@ void MemoryWidget::OnSetValue()
return; return;
} }
if (value == static_cast<u8>(value)) if (length <= 2)
{ {
accessors->WriteU8(addr, static_cast<u8>(value)); 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)); 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)); accessors->WriteU32(addr, static_cast<u32>(value));
} }