Debugger MemoryViewWidget: Allow direct editing of memory cells.
This commit is contained in:
parent
ab52c9dab6
commit
bd59b0a490
|
@ -10,14 +10,17 @@
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
|
#include <QSignalBlocker>
|
||||||
#include <QTableWidget>
|
#include <QTableWidget>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
#include <fmt/printf.h>
|
||||||
|
|
||||||
#include "Common/Align.h"
|
#include "Common/Align.h"
|
||||||
#include "Common/FloatUtils.h"
|
#include "Common/FloatUtils.h"
|
||||||
#include "Common/StringUtil.h"
|
#include "Common/StringUtil.h"
|
||||||
|
#include "Common/Swap.h"
|
||||||
#include "Core/Core.h"
|
#include "Core/Core.h"
|
||||||
#include "Core/HW/AddressSpace.h"
|
#include "Core/HW/AddressSpace.h"
|
||||||
#include "Core/PowerPC/BreakPoints.h"
|
#include "Core/PowerPC/BreakPoints.h"
|
||||||
|
@ -32,7 +35,7 @@ constexpr double SCROLL_FRACTION_DEGREES = 15.;
|
||||||
|
|
||||||
constexpr auto USER_ROLE_IS_ROW_BREAKPOINT_CELL = Qt::UserRole;
|
constexpr auto USER_ROLE_IS_ROW_BREAKPOINT_CELL = Qt::UserRole;
|
||||||
constexpr auto USER_ROLE_CELL_ADDRESS = Qt::UserRole + 1;
|
constexpr auto USER_ROLE_CELL_ADDRESS = Qt::UserRole + 1;
|
||||||
constexpr auto USER_ROLE_HAS_VALUE = Qt::UserRole + 2;
|
constexpr auto USER_ROLE_VALUE_TYPE = Qt::UserRole + 2;
|
||||||
|
|
||||||
// Numbers for the scrollbar. These affect how much big the draggable part of the scrollbar is, how
|
// Numbers for the scrollbar. These affect how much big the draggable part of the scrollbar is, how
|
||||||
// smooth it scrolls, and how much memory it traverses while dragging.
|
// smooth it scrolls, and how much memory it traverses while dragging.
|
||||||
|
@ -55,6 +58,7 @@ public:
|
||||||
|
|
||||||
connect(this, &MemoryViewTable::customContextMenuRequested, m_view,
|
connect(this, &MemoryViewTable::customContextMenuRequested, m_view,
|
||||||
&MemoryViewWidget::OnContextMenu);
|
&MemoryViewWidget::OnContextMenu);
|
||||||
|
connect(this, &MemoryViewTable::itemChanged, this, &MemoryViewTable::OnItemChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
void resizeEvent(QResizeEvent* event) override
|
void resizeEvent(QResizeEvent* event) override
|
||||||
|
@ -122,6 +126,27 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OnItemChanged(QTableWidgetItem* item)
|
||||||
|
{
|
||||||
|
QString text = item->text();
|
||||||
|
MemoryViewWidget::Type type =
|
||||||
|
static_cast<MemoryViewWidget::Type>(item->data(USER_ROLE_VALUE_TYPE).toInt());
|
||||||
|
std::vector<u8> bytes = m_view->ConvertTextToBytes(type, text);
|
||||||
|
|
||||||
|
u32 address = item->data(USER_ROLE_CELL_ADDRESS).toUInt();
|
||||||
|
u32 end_address = address + static_cast<u32>(bytes.size()) - 1;
|
||||||
|
AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_view->GetAddressSpace());
|
||||||
|
|
||||||
|
if (!bytes.empty() && accessors->IsValidAddress(address) &&
|
||||||
|
accessors->IsValidAddress(end_address))
|
||||||
|
{
|
||||||
|
for (const u8 c : bytes)
|
||||||
|
accessors->WriteU8(address++, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_view->Update();
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MemoryViewWidget* m_view;
|
MemoryViewWidget* m_view;
|
||||||
};
|
};
|
||||||
|
@ -235,6 +260,8 @@ constexpr int GetCharacterCount(MemoryViewWidget::Type type)
|
||||||
|
|
||||||
void MemoryViewWidget::Update()
|
void MemoryViewWidget::Update()
|
||||||
{
|
{
|
||||||
|
const QSignalBlocker blocker(m_table);
|
||||||
|
|
||||||
m_table->clearSelection();
|
m_table->clearSelection();
|
||||||
|
|
||||||
u32 address = m_address;
|
u32 address = m_address;
|
||||||
|
@ -272,7 +299,7 @@ void MemoryViewWidget::Update()
|
||||||
bp_item->setFlags(Qt::ItemIsEnabled);
|
bp_item->setFlags(Qt::ItemIsEnabled);
|
||||||
bp_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, true);
|
bp_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, true);
|
||||||
bp_item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
bp_item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
||||||
bp_item->setData(USER_ROLE_HAS_VALUE, false);
|
bp_item->setData(USER_ROLE_VALUE_TYPE, static_cast<int>(Type::Null));
|
||||||
|
|
||||||
m_table->setItem(i, 0, bp_item);
|
m_table->setItem(i, 0, bp_item);
|
||||||
|
|
||||||
|
@ -282,7 +309,7 @@ void MemoryViewWidget::Update()
|
||||||
row_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
row_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
||||||
row_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
row_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
||||||
row_item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
row_item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
||||||
row_item->setData(USER_ROLE_HAS_VALUE, false);
|
row_item->setData(USER_ROLE_VALUE_TYPE, static_cast<int>(Type::Null));
|
||||||
|
|
||||||
m_table->setItem(i, 1, row_item);
|
m_table->setItem(i, 1, row_item);
|
||||||
|
|
||||||
|
@ -297,7 +324,7 @@ void MemoryViewWidget::Update()
|
||||||
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
||||||
item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
||||||
item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
item->setData(USER_ROLE_CELL_ADDRESS, row_address);
|
||||||
item->setData(USER_ROLE_HAS_VALUE, false);
|
item->setData(USER_ROLE_VALUE_TYPE, static_cast<int>(Type::Null));
|
||||||
|
|
||||||
m_table->setItem(i, c, item);
|
m_table->setItem(i, c, item);
|
||||||
}
|
}
|
||||||
|
@ -372,7 +399,7 @@ void MemoryViewWidget::UpdateColumns(Type type, int first_column)
|
||||||
for (int c = 0; c < data_columns; c++)
|
for (int c = 0; c < data_columns; c++)
|
||||||
{
|
{
|
||||||
auto* cell_item = new QTableWidgetItem;
|
auto* cell_item = new QTableWidgetItem;
|
||||||
cell_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
cell_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
|
||||||
cell_item->setTextAlignment(text_alignment);
|
cell_item->setTextAlignment(text_alignment);
|
||||||
|
|
||||||
const u32 cell_address = row_address + c * GetTypeSize(type);
|
const u32 cell_address = row_address + c * GetTypeSize(type);
|
||||||
|
@ -384,14 +411,14 @@ void MemoryViewWidget::UpdateColumns(Type type, int first_column)
|
||||||
cell_item->setText(value_to_string(cell_address));
|
cell_item->setText(value_to_string(cell_address));
|
||||||
cell_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
cell_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
||||||
cell_item->setData(USER_ROLE_CELL_ADDRESS, cell_address);
|
cell_item->setData(USER_ROLE_CELL_ADDRESS, cell_address);
|
||||||
cell_item->setData(USER_ROLE_HAS_VALUE, true);
|
cell_item->setData(USER_ROLE_VALUE_TYPE, static_cast<int>(type));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cell_item->setText(QStringLiteral("-"));
|
cell_item->setText(QStringLiteral("-"));
|
||||||
cell_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
cell_item->setData(USER_ROLE_IS_ROW_BREAKPOINT_CELL, false);
|
||||||
cell_item->setData(USER_ROLE_CELL_ADDRESS, cell_address);
|
cell_item->setData(USER_ROLE_CELL_ADDRESS, cell_address);
|
||||||
cell_item->setData(USER_ROLE_HAS_VALUE, false);
|
cell_item->setData(USER_ROLE_VALUE_TYPE, static_cast<int>(Type::Null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -537,6 +564,156 @@ AddressSpace::Type MemoryViewWidget::GetAddressSpace() const
|
||||||
return m_address_space;
|
return m_address_space;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<u8> MemoryViewWidget::ConvertTextToBytes(Type type, QString input_text)
|
||||||
|
{
|
||||||
|
if (type == Type::Null)
|
||||||
|
return {};
|
||||||
|
|
||||||
|
bool good = false;
|
||||||
|
int radix = 0;
|
||||||
|
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case Type::ASCII:
|
||||||
|
{
|
||||||
|
const QByteArray qbytes = input_text.toUtf8();
|
||||||
|
std::vector<u8> bytes;
|
||||||
|
|
||||||
|
for (const char c : qbytes)
|
||||||
|
bytes.push_back(static_cast<u8>(c));
|
||||||
|
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
case Type::Float32:
|
||||||
|
{
|
||||||
|
const float float_value = input_text.toFloat(&good);
|
||||||
|
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
const u32 value = Common::BitCast<u32>(float_value);
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap32(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Double:
|
||||||
|
{
|
||||||
|
const double double_value = input_text.toDouble(&good);
|
||||||
|
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
const u64 value = Common::BitCast<u64>(double_value);
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap64(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Signed8:
|
||||||
|
{
|
||||||
|
const short value = input_text.toShort(&good, radix);
|
||||||
|
good &= std::numeric_limits<signed char>::min() <= value &&
|
||||||
|
value <= std::numeric_limits<signed char>::max();
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap8(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Signed16:
|
||||||
|
{
|
||||||
|
const short value = input_text.toShort(&good, radix);
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap16(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Signed32:
|
||||||
|
{
|
||||||
|
const int value = input_text.toInt(&good, radix);
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap32(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Hex8:
|
||||||
|
radix = 16;
|
||||||
|
[[fallthrough]];
|
||||||
|
case Type::Unsigned8:
|
||||||
|
{
|
||||||
|
const unsigned short value = input_text.toUShort(&good, radix);
|
||||||
|
good &= (value & 0xFF00) == 0;
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap8(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Hex16:
|
||||||
|
radix = 16;
|
||||||
|
[[fallthrough]];
|
||||||
|
case Type::Unsigned16:
|
||||||
|
{
|
||||||
|
const unsigned short value = input_text.toUShort(&good, radix);
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap16(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Hex32:
|
||||||
|
radix = 16;
|
||||||
|
[[fallthrough]];
|
||||||
|
case Type::Unsigned32:
|
||||||
|
{
|
||||||
|
const u32 value = input_text.toUInt(&good, radix);
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap32(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::Hex64:
|
||||||
|
{
|
||||||
|
const u64 value = input_text.toULongLong(&good, 16);
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
auto std_array = Common::BitCastToArray<u8>(Common::swap64(value));
|
||||||
|
return std::vector<u8>(std_array.begin(), std_array.end());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Type::HexString:
|
||||||
|
{
|
||||||
|
// Confirm it is only hex bytes
|
||||||
|
const QRegularExpression is_hex(QStringLiteral("^([0-9A-F]{2})*$"),
|
||||||
|
QRegularExpression::CaseInsensitiveOption);
|
||||||
|
const QRegularExpressionMatch match = is_hex.match(input_text);
|
||||||
|
good = match.hasMatch();
|
||||||
|
if (good)
|
||||||
|
{
|
||||||
|
const QByteArray qbytes = QByteArray::fromHex(input_text.toUtf8());
|
||||||
|
std::vector<u8> bytes;
|
||||||
|
|
||||||
|
for (const char c : qbytes)
|
||||||
|
bytes.push_back(static_cast<u8>(c));
|
||||||
|
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
void MemoryViewWidget::SetDisplay(Type type, int bytes_per_row, int alignment, bool dual_view)
|
void MemoryViewWidget::SetDisplay(Type type, int bytes_per_row, int alignment, bool dual_view)
|
||||||
{
|
{
|
||||||
m_type = type;
|
m_type = type;
|
||||||
|
@ -638,7 +815,8 @@ void MemoryViewWidget::OnContextMenu(const QPoint& pos)
|
||||||
if (!item_selected || item_selected->data(USER_ROLE_IS_ROW_BREAKPOINT_CELL).toBool())
|
if (!item_selected || item_selected->data(USER_ROLE_IS_ROW_BREAKPOINT_CELL).toBool())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const bool item_has_value = item_selected->data(USER_ROLE_HAS_VALUE).toBool();
|
const bool item_has_value =
|
||||||
|
item_selected->data(USER_ROLE_VALUE_TYPE).toInt() != static_cast<int>(Type::Null);
|
||||||
const u32 addr = item_selected->data(USER_ROLE_CELL_ADDRESS).toUInt();
|
const u32 addr = item_selected->data(USER_ROLE_CELL_ADDRESS).toUInt();
|
||||||
|
|
||||||
auto* menu = new QMenu(this);
|
auto* menu = new QMenu(this);
|
||||||
|
@ -654,7 +832,7 @@ void MemoryViewWidget::OnContextMenu(const QPoint& pos)
|
||||||
auto* copy_value = menu->addAction(tr("Copy Value"), this, [this, &pos] {
|
auto* copy_value = menu->addAction(tr("Copy Value"), this, [this, &pos] {
|
||||||
// Re-fetch the item in case the underlying table has refreshed since the menu was opened.
|
// Re-fetch the item in case the underlying table has refreshed since the menu was opened.
|
||||||
auto* item = m_table->itemAt(pos);
|
auto* item = m_table->itemAt(pos);
|
||||||
if (item && item->data(USER_ROLE_HAS_VALUE).toBool())
|
if (item && item->data(USER_ROLE_VALUE_TYPE).toInt() != static_cast<int>(Type::Null))
|
||||||
QApplication::clipboard()->setText(item->text());
|
QApplication::clipboard()->setText(item->text());
|
||||||
});
|
});
|
||||||
copy_value->setEnabled(item_has_value);
|
copy_value->setEnabled(item_has_value);
|
||||||
|
|
|
@ -23,10 +23,12 @@ class MemoryViewWidget final : public QWidget
|
||||||
public:
|
public:
|
||||||
enum class Type : int
|
enum class Type : int
|
||||||
{
|
{
|
||||||
|
Null = 0,
|
||||||
Hex8 = 1,
|
Hex8 = 1,
|
||||||
Hex16,
|
Hex16,
|
||||||
Hex32,
|
Hex32,
|
||||||
Hex64,
|
Hex64,
|
||||||
|
HexString,
|
||||||
Unsigned8,
|
Unsigned8,
|
||||||
Unsigned16,
|
Unsigned16,
|
||||||
Unsigned32,
|
Unsigned32,
|
||||||
|
@ -51,6 +53,7 @@ public:
|
||||||
void UpdateFont();
|
void UpdateFont();
|
||||||
void ToggleBreakpoint(u32 addr, bool row);
|
void ToggleBreakpoint(u32 addr, bool row);
|
||||||
|
|
||||||
|
std::vector<u8> ConvertTextToBytes(Type type, QString input_text);
|
||||||
void SetAddressSpace(AddressSpace::Type address_space);
|
void SetAddressSpace(AddressSpace::Type address_space);
|
||||||
AddressSpace::Type GetAddressSpace() const;
|
AddressSpace::Type GetAddressSpace() const;
|
||||||
void SetDisplay(Type type, int bytes_per_row, int alignment, bool dual_view);
|
void SetDisplay(Type type, int bytes_per_row, int alignment, bool dual_view);
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
|
using Type = MemoryViewWidget::Type;
|
||||||
|
|
||||||
MemoryWidget::MemoryWidget(QWidget* parent) : QDockWidget(parent)
|
MemoryWidget::MemoryWidget(QWidget* parent) : QDockWidget(parent)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Memory"));
|
setWindowTitle(tr("Memory"));
|
||||||
|
@ -127,16 +129,16 @@ void MemoryWidget::CreateWidgets()
|
||||||
m_input_combo = new QComboBox;
|
m_input_combo = new QComboBox;
|
||||||
m_input_combo->setMaxVisibleItems(20);
|
m_input_combo->setMaxVisibleItems(20);
|
||||||
// Order here determines combo list order.
|
// Order here determines combo list order.
|
||||||
m_input_combo->addItem(tr("Hex Byte String"), int(InputID::HEXSTR));
|
m_input_combo->addItem(tr("Hex Byte String"), int(Type::HexString));
|
||||||
m_input_combo->addItem(tr("ASCII"), int(InputID::ASCII));
|
m_input_combo->addItem(tr("ASCII"), int(Type::ASCII));
|
||||||
m_input_combo->addItem(tr("Float"), int(InputID::FLOAT));
|
m_input_combo->addItem(tr("Float"), int(Type::Float32));
|
||||||
m_input_combo->addItem(tr("Double"), int(InputID::DOUBLE));
|
m_input_combo->addItem(tr("Double"), int(Type::Double));
|
||||||
m_input_combo->addItem(tr("Unsigned 8"), int(InputID::U8));
|
m_input_combo->addItem(tr("Unsigned 8"), int(Type::Unsigned8));
|
||||||
m_input_combo->addItem(tr("Unsigned 16"), int(InputID::U16));
|
m_input_combo->addItem(tr("Unsigned 16"), int(Type::Unsigned16));
|
||||||
m_input_combo->addItem(tr("Unsigned 32"), int(InputID::U32));
|
m_input_combo->addItem(tr("Unsigned 32"), int(Type::Unsigned32));
|
||||||
m_input_combo->addItem(tr("Signed 8"), int(InputID::S8));
|
m_input_combo->addItem(tr("Signed 8"), int(Type::Signed8));
|
||||||
m_input_combo->addItem(tr("Signed 16"), int(InputID::S16));
|
m_input_combo->addItem(tr("Signed 16"), int(Type::Signed16));
|
||||||
m_input_combo->addItem(tr("Signed 32"), int(InputID::S32));
|
m_input_combo->addItem(tr("Signed 32"), int(Type::Signed32));
|
||||||
|
|
||||||
// Dump
|
// Dump
|
||||||
auto* dump_group = new QGroupBox(tr("Dump"));
|
auto* dump_group = new QGroupBox(tr("Dump"));
|
||||||
|
@ -192,18 +194,18 @@ void MemoryWidget::CreateWidgets()
|
||||||
|
|
||||||
m_display_combo = new QComboBox;
|
m_display_combo = new QComboBox;
|
||||||
m_display_combo->setMaxVisibleItems(20);
|
m_display_combo->setMaxVisibleItems(20);
|
||||||
m_display_combo->addItem(tr("Hex 8"), int(MemoryViewWidget::Type::Hex8));
|
m_display_combo->addItem(tr("Hex 8"), int(Type::Hex8));
|
||||||
m_display_combo->addItem(tr("Hex 16"), int(MemoryViewWidget::Type::Hex16));
|
m_display_combo->addItem(tr("Hex 16"), int(Type::Hex16));
|
||||||
m_display_combo->addItem(tr("Hex 32"), int(MemoryViewWidget::Type::Hex32));
|
m_display_combo->addItem(tr("Hex 32"), int(Type::Hex32));
|
||||||
m_display_combo->addItem(tr("Unsigned 8"), int(MemoryViewWidget::Type::Unsigned8));
|
m_display_combo->addItem(tr("Unsigned 8"), int(Type::Unsigned8));
|
||||||
m_display_combo->addItem(tr("Unsigned 16"), int(MemoryViewWidget::Type::Unsigned16));
|
m_display_combo->addItem(tr("Unsigned 16"), int(Type::Unsigned16));
|
||||||
m_display_combo->addItem(tr("Unsigned 32"), int(MemoryViewWidget::Type::Unsigned32));
|
m_display_combo->addItem(tr("Unsigned 32"), int(Type::Unsigned32));
|
||||||
m_display_combo->addItem(tr("Signed 8"), int(MemoryViewWidget::Type::Signed8));
|
m_display_combo->addItem(tr("Signed 8"), int(Type::Signed8));
|
||||||
m_display_combo->addItem(tr("Signed 16"), int(MemoryViewWidget::Type::Signed16));
|
m_display_combo->addItem(tr("Signed 16"), int(Type::Signed16));
|
||||||
m_display_combo->addItem(tr("Signed 32"), int(MemoryViewWidget::Type::Signed32));
|
m_display_combo->addItem(tr("Signed 32"), int(Type::Signed32));
|
||||||
m_display_combo->addItem(tr("ASCII"), int(MemoryViewWidget::Type::ASCII));
|
m_display_combo->addItem(tr("ASCII"), int(Type::ASCII));
|
||||||
m_display_combo->addItem(tr("Float"), int(MemoryViewWidget::Type::Float32));
|
m_display_combo->addItem(tr("Float"), int(Type::Float32));
|
||||||
m_display_combo->addItem(tr("Double"), int(MemoryViewWidget::Type::Double));
|
m_display_combo->addItem(tr("Double"), int(Type::Double));
|
||||||
|
|
||||||
m_align_combo = new QComboBox;
|
m_align_combo = new QComboBox;
|
||||||
m_align_combo->addItem(tr("Fixed Alignment"));
|
m_align_combo->addItem(tr("Fixed Alignment"));
|
||||||
|
@ -435,12 +437,12 @@ void MemoryWidget::OnAddressSpaceChanged()
|
||||||
|
|
||||||
void MemoryWidget::OnDisplayChanged()
|
void MemoryWidget::OnDisplayChanged()
|
||||||
{
|
{
|
||||||
const auto type = static_cast<MemoryViewWidget::Type>(m_display_combo->currentData().toInt());
|
const auto type = static_cast<Type>(m_display_combo->currentData().toInt());
|
||||||
int bytes_per_row = m_row_length_combo->currentData().toInt();
|
int bytes_per_row = m_row_length_combo->currentData().toInt();
|
||||||
int alignment;
|
int alignment;
|
||||||
bool dual_view = m_dual_check->isChecked();
|
bool dual_view = m_dual_check->isChecked();
|
||||||
|
|
||||||
if (type == MemoryViewWidget::Type::Double && bytes_per_row == 4)
|
if (type == Type::Double && bytes_per_row == 4)
|
||||||
bytes_per_row = 8;
|
bytes_per_row = 8;
|
||||||
|
|
||||||
// Alignment: First (fixed) option equals bytes per row. 'currentData' is correct for other
|
// Alignment: First (fixed) option equals bytes per row. 'currentData' is correct for other
|
||||||
|
@ -522,119 +524,40 @@ void MemoryWidget::ValidateAndPreviewInputValue()
|
||||||
{
|
{
|
||||||
m_data_preview->clear();
|
m_data_preview->clear();
|
||||||
QString input_text = m_data_edit->text();
|
QString input_text = m_data_edit->text();
|
||||||
const auto combo_id = static_cast<InputID>(m_input_combo->currentData().toInt());
|
const auto input_type = static_cast<Type>(m_input_combo->currentData().toInt());
|
||||||
|
|
||||||
m_base_check->setEnabled(combo_id == InputID::U32 || combo_id == InputID::S32 ||
|
m_base_check->setEnabled(input_type == Type::Unsigned32 || input_type == Type::Signed32 ||
|
||||||
combo_id == InputID::U16 || combo_id == InputID::S16 ||
|
input_type == Type::Unsigned16 || input_type == Type::Signed16 ||
|
||||||
combo_id == InputID::U8 || combo_id == InputID::S8);
|
input_type == Type::Unsigned8 || input_type == Type::Signed8);
|
||||||
|
|
||||||
if (input_text.isEmpty())
|
if (input_text.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Remove any spaces
|
// Remove any spaces
|
||||||
if (combo_id != InputID::ASCII)
|
if (input_type != Type::ASCII)
|
||||||
input_text.remove(QLatin1Char(' '));
|
input_text.remove(QLatin1Char(' '));
|
||||||
|
|
||||||
|
if (m_base_check->isChecked())
|
||||||
|
{
|
||||||
|
if (input_text.startsWith(QLatin1Char('-')))
|
||||||
|
input_text.insert(1, QStringLiteral("0x"));
|
||||||
|
else
|
||||||
|
input_text.prepend(QStringLiteral("0x"));
|
||||||
|
}
|
||||||
|
|
||||||
QFont font;
|
QFont font;
|
||||||
QPalette palette;
|
QPalette palette;
|
||||||
QString hex_string;
|
std::vector<u8> bytes = m_memory_view->ConvertTextToBytes(input_type, input_text);
|
||||||
bool good = false;
|
|
||||||
const int radix = (m_base_check->isChecked() && m_base_check->isEnabled()) ? 16 : 0;
|
|
||||||
|
|
||||||
switch (combo_id)
|
if (!bytes.empty())
|
||||||
{
|
{
|
||||||
case InputID::ASCII:
|
QString hex_string;
|
||||||
{
|
std::string s;
|
||||||
good = true;
|
|
||||||
const QByteArray bytes = input_text.toLatin1();
|
|
||||||
hex_string = QString::fromLatin1(bytes.toHex());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::FLOAT:
|
|
||||||
{
|
|
||||||
const float value_float = input_text.toFloat(&good);
|
|
||||||
|
|
||||||
if (good)
|
for (const u8 c : bytes)
|
||||||
{
|
s.append(fmt::format("{:02x}", c));
|
||||||
const u32 hex_out = Common::BitCast<u32>(value_float);
|
|
||||||
hex_string = QString::fromStdString(fmt::format("{:08X}", hex_out));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::DOUBLE:
|
|
||||||
{
|
|
||||||
const double value_double = input_text.toDouble(&good);
|
|
||||||
|
|
||||||
if (good)
|
hex_string = QString::fromStdString(s);
|
||||||
{
|
|
||||||
const u64 hex_out = Common::BitCast<u64>(value_double);
|
|
||||||
hex_string = QString::fromStdString(fmt::format("{:016X}", hex_out));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::S8:
|
|
||||||
{
|
|
||||||
const short value = input_text.toShort(&good, radix);
|
|
||||||
good &= std::numeric_limits<signed char>::min() <= value &&
|
|
||||||
value <= std::numeric_limits<signed char>::max();
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::sprintf("%02hhX", value));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::S16:
|
|
||||||
{
|
|
||||||
const short value = input_text.toShort(&good, radix);
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::sprintf("%04hX", value));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::S32:
|
|
||||||
{
|
|
||||||
const int value_int = input_text.toInt(&good, radix);
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::sprintf("%08X", value_int));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::U8:
|
|
||||||
{
|
|
||||||
const unsigned short value = input_text.toUShort(&good, radix);
|
|
||||||
good &= (value & 0xFF00) == 0;
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::format("{:02X}", value));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::U16:
|
|
||||||
{
|
|
||||||
const unsigned short value = input_text.toUShort(&good, radix);
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::format("{:04X}", value));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::U32:
|
|
||||||
{
|
|
||||||
const u32 value = input_text.toUInt(&good, radix);
|
|
||||||
if (good)
|
|
||||||
hex_string = QString::fromStdString(fmt::format("{:08X}", value));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case InputID::HEXSTR:
|
|
||||||
{
|
|
||||||
// Confirm it is only hex bytes
|
|
||||||
const QRegularExpression is_hex(QStringLiteral("^([0-9A-F]{2})*$"),
|
|
||||||
QRegularExpression::CaseInsensitiveOption);
|
|
||||||
const QRegularExpressionMatch match = is_hex.match(input_text);
|
|
||||||
good = match.hasMatch();
|
|
||||||
if (good)
|
|
||||||
{
|
|
||||||
const QByteArray hbytes = QByteArray::fromHex(input_text.toUtf8());
|
|
||||||
hex_string = QString::fromLatin1(hbytes.toHex());
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (good)
|
|
||||||
{
|
|
||||||
int output_length = hex_string.length();
|
int output_length = hex_string.length();
|
||||||
|
|
||||||
if (output_length > 16)
|
if (output_length > 16)
|
||||||
|
@ -665,14 +588,14 @@ QByteArray MemoryWidget::GetInputData() const
|
||||||
if (m_data_preview->text().isEmpty())
|
if (m_data_preview->text().isEmpty())
|
||||||
return QByteArray();
|
return QByteArray();
|
||||||
|
|
||||||
const auto combo_id = static_cast<InputID>(m_input_combo->currentData().toInt());
|
const auto input_type = static_cast<Type>(m_input_combo->currentData().toInt());
|
||||||
|
|
||||||
// Ascii might be truncated, pull from data edit box.
|
// Ascii might be truncated, pull from data edit box.
|
||||||
if (combo_id == InputID::ASCII)
|
if (input_type == Type::ASCII)
|
||||||
return QByteArray(m_data_edit->text().toUtf8());
|
return QByteArray(m_data_edit->text().toUtf8());
|
||||||
|
|
||||||
// If we are doing a large aray of hex bytes
|
// If we are doing a large array of hex bytes
|
||||||
if (combo_id == InputID::HEXSTR)
|
if (input_type == Type::HexString)
|
||||||
return QByteArray::fromHex(m_data_edit->text().toUtf8());
|
return QByteArray::fromHex(m_data_edit->text().toUtf8());
|
||||||
|
|
||||||
// Data preview has exactly what we want to input, so pull it from there.
|
// Data preview has exactly what we want to input, so pull it from there.
|
||||||
|
@ -708,6 +631,13 @@ void MemoryWidget::OnSetValue()
|
||||||
}
|
}
|
||||||
|
|
||||||
AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
|
AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
|
||||||
|
u32 end_address = target_addr.address + static_cast<u32>(bytes.size()) - 1;
|
||||||
|
|
||||||
|
if (!accessors->IsValidAddress(target_addr.address) || !accessors->IsValidAddress(end_address))
|
||||||
|
{
|
||||||
|
ModalMessageBox::critical(this, tr("Error"), tr("Target address range is invalid."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (const char c : bytes)
|
for (const char c : bytes)
|
||||||
accessors->WriteU8(target_addr.address++, static_cast<u8>(c));
|
accessors->WriteU8(target_addr.address++, static_cast<u8>(c));
|
||||||
|
|
|
@ -20,21 +20,6 @@ class QRadioButton;
|
||||||
class QShowEvent;
|
class QShowEvent;
|
||||||
class QSplitter;
|
class QSplitter;
|
||||||
|
|
||||||
enum class InputID : int
|
|
||||||
{
|
|
||||||
// Order does not matter here.
|
|
||||||
S8 = 1,
|
|
||||||
S16,
|
|
||||||
S32,
|
|
||||||
U8,
|
|
||||||
U16,
|
|
||||||
U32,
|
|
||||||
HEXSTR,
|
|
||||||
FLOAT,
|
|
||||||
DOUBLE,
|
|
||||||
ASCII
|
|
||||||
};
|
|
||||||
|
|
||||||
class MemoryWidget : public QDockWidget
|
class MemoryWidget : public QDockWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
Loading…
Reference in New Issue