diff options
author | Lioncash <mathew1800@gmail.com> | 2015-08-07 03:11:25 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-08-07 03:11:25 +0200 |
commit | 5855cf087d5eea52c08f52cd7e5ef60085afda19 (patch) | |
tree | e935ffa08bf041565fb2e4e4580b8fc2dd21cc26 | |
parent | Merge pull request #1022 from aroulin/disas-missing-v6k-instructions (diff) | |
download | yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.gz yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.bz2 yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.lz yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.xz yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.zst yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.zip |
-rw-r--r-- | src/citra_qt/debugger/registers.cpp | 70 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.h | 2 |
2 files changed, 36 insertions, 36 deletions
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 5527a2afd..8c322a7d7 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -12,31 +12,31 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) { tree = cpu_regs_ui.treeWidget; tree->addTopLevelItem(registers = new QTreeWidgetItem(QStringList("Registers"))); - tree->addTopLevelItem(CSPR = new QTreeWidgetItem(QStringList("CSPR"))); + tree->addTopLevelItem(cpsr = new QTreeWidgetItem(QStringList("CPSR"))); registers->setExpanded(true); - CSPR->setExpanded(true); + cpsr->setExpanded(true); for (int i = 0; i < 16; ++i) { QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0')))); registers->addChild(child); } - CSPR->addChild(new QTreeWidgetItem(QStringList("M"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("T"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("F"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("I"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("A"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("E"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("IT"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("GE"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("DNM"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("J"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("Q"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("V"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("C"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("Z"))); - CSPR->addChild(new QTreeWidgetItem(QStringList("N"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("M"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("T"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("F"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("I"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("A"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("E"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("IT"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("GE"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("DNM"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("J"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("Q"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("V"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("C"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("Z"))); + cpsr->addChild(new QTreeWidgetItem(QStringList("N"))); setEnabled(false); } @@ -50,22 +50,22 @@ void RegistersWidget::OnDebugModeEntered() { for (int i = 0; i < 16; ++i) registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0'))); - CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0'))); - CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode - CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State - CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable - CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable - CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort - CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1)); // E - Data endianess - CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM) - CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal - CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF)); // DNM - Do not modify - CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1)); // J - Java state - CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1)); // Q - Sticky overflow - CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1)); // V - Overflow - CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend - CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero - CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than + cpsr->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0'))); + cpsr->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode + cpsr->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State + cpsr->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable + cpsr->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable + cpsr->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort + cpsr->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1)); // E - Data endianess + cpsr->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM) + cpsr->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal + cpsr->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF)); // DNM - Do not modify + cpsr->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1)); // J - Java state + cpsr->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1)); // Q - Sticky overflow + cpsr->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1)); // V - Overflow + cpsr->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend + cpsr->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero + cpsr->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than } void RegistersWidget::OnDebugModeLeft() { @@ -81,9 +81,9 @@ void RegistersWidget::OnEmulationStopping() { registers->child(i)->setText(1, QString("")); for (int i = 0; i < 15; ++i) - CSPR->child(i)->setText(1, QString("")); + cpsr->child(i)->setText(1, QString("")); - CSPR->setText(1, QString("")); + cpsr->setText(1, QString("")); setEnabled(false); } diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index 68e3fb908..eb62d3646 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h @@ -30,5 +30,5 @@ private: QTreeWidget* tree; QTreeWidgetItem* registers; - QTreeWidgetItem* CSPR; + QTreeWidgetItem* cpsr; }; |