Skip to content
Permalink
Browse files

Merge pull request #8479 from nokturnusmf/master

Fixed #11874 (leading 0s ignored by debugger)
  • Loading branch information
Helios747 committed Nov 27, 2019
2 parents 41563ae + 5b6e7aa commit 66ca83e6af394b9c9a53f4e292b3cd3c06e97f03
@@ -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()
@@ -488,28 +488,31 @@ 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)
{
ModalMessageBox::critical(this, tr("Error"), tr("Bad value provided."));
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));
}

0 comments on commit 66ca83e

Please sign in to comment.
You can’t perform that action at this time.