archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6304 from container1234/qt-debugger

Browse source 
Qt/Debugger: Minor fixes
This commit is contained in:
Léo Lam 2018-01-13 11:53:20 +01:00 committed by GitHub
commit 973bd154b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp
View file

@ -74,6 +74,12 @@ void RegisterColumn::SetValue()
std::memcpy(&value, &f, sizeof(u32));
break;
}
case RegisterDisplay::Double:
{
double f = text().toDouble(&valid);
std::memcpy(&value, &f, sizeof(u64));
break;
}
}
if (!valid)
@ -117,6 +123,13 @@ void RegisterColumn::Update()
text = QString::number(tmp);
break;
}
case RegisterDisplay::Double:
{
double tmp;
std::memcpy(&tmp, &m_value, sizeof(double));
text = QString::number(tmp);
break;
}
}
setText(text);

5
Source/Core/DolphinQt2/Debugger/RegisterColumn.h
View file

@ -13,7 +13,7 @@
enum class RegisterType
{
gpr, // General purpose registers, int (r0-r31)
fpr, // General purpose registers, float (f0-f31)
fpr, // Floating point registers, double (f0-f31)
ibat, // Instruction BATs (IBAT0-IBAT7)
dbat, // Data BATs (DBAT0-DBAT7)
tb, // Time base register
@ -40,7 +40,8 @@ enum class RegisterDisplay
Hex,
SInt32,
UInt32,
Float
Float,
Double
};
constexpr int DATA_TYPE = Qt::UserRole;

18
Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp
View file

@ -131,8 +131,9 @@ void RegisterWidget::ShowContextMenu()
auto* view_int = menu->addAction(tr("Signed Integer"));
auto* view_uint = menu->addAction(tr("Unsigned Integer"));
auto* view_float = menu->addAction(tr("Float"));
auto* view_double = menu->addAction(tr("Double"));
for (auto* action : {view_hex, view_int, view_uint, view_float})
for (auto* action : {view_hex, view_int, view_uint, view_float, view_double})
{
action->setCheckable(true);
action->setVisible(false);
@ -153,6 +154,9 @@ void RegisterWidget::ShowContextMenu()
case RegisterDisplay::Float:
view_float->setChecked(true);
break;
case RegisterDisplay::Double:
view_double->setChecked(true);
break;
}
switch (type)
@ -165,7 +169,7 @@ void RegisterWidget::ShowContextMenu()
break;
case RegisterType::fpr:
view_hex->setVisible(true);
view_float->setVisible(true);
view_double->setVisible(true);
break;
default:
break;
@ -195,6 +199,12 @@ void RegisterWidget::ShowContextMenu()
m_updating = false;
});
connect(view_double, &QAction::triggered, [this, item] {
m_updating = true;
item->SetDisplay(RegisterDisplay::Double);
m_updating = false;
});
menu->addSeparator();
}
}
@ -212,7 +222,7 @@ void RegisterWidget::PopulateTable()
AddRegister(i, 0, RegisterType::gpr, "r" + std::to_string(i), [i] { return GPR(i); },
[i](u64 value) { GPR(i) = value; });
// General purpose registers (float)
// Floating point registers (double)
AddRegister(i, 2, RegisterType::fpr, "f" + std::to_string(i), [i] { return riPS0(i); },
[i](u64 value) { riPS0(i) = value; });
@ -323,7 +333,7 @@ void RegisterWidget::PopulateTable()
}
void RegisterWidget::AddRegister(int row, int column, RegisterType type, std::string register_name,
std::function<u32()> get_reg, std::function<void(u32)> set_reg)
std::function<u64()> get_reg, std::function<void(u64)> set_reg)
{
auto* value = new RegisterColumn(type, get_reg, set_reg);

2
Source/Core/DolphinQt2/Debugger/RegisterWidget.h
View file

@ -40,7 +40,7 @@ private:
void OnItemChanged(QTableWidgetItem* item);
void AddRegister(int row, int column, RegisterType type, std::string register_name,
std::function<u32()> get_reg, std::function<void(u32)> set_reg);
std::function<u64()> get_reg, std::function<void(u64)> set_reg);
QTableWidget* m_table;
bool m_updating = false;