Merge pull request #1027 from lioncash/debugger

debugger: Add the ability to view VFP register contents
author: bunnei 2015-08-13 18:13:25 -0400
committer: bunnei 2015-08-13 18:13:25 -0400
commit: cebf245504b75469f19d3cc0a6f2f66aefa66947 (patch)
tree: 4026f74849517f02575bb34a8d4d35d50daaccfc
parent: Merge pull request #1030 from archshift/force-inline (diff)
parent: registers: Support viewing VFP registers (diff)
download: yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.tar.gz
yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.tar.xz
yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.zip
6 files changed, 225 insertions, 49 deletions
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index 5527a2afd..4174b3945 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -11,32 +11,23 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) {
    cpu_regs_ui.setupUi(this);
    tree = cpu_regs_ui.treeWidget;
-    tree->addTopLevelItem(registers = new QTreeWidgetItem(QStringList("Registers")));
+    tree->addTopLevelItem(core_registers = new QTreeWidgetItem(QStringList(tr("Registers"))));
-    tree->addTopLevelItem(CSPR = new QTreeWidgetItem(QStringList("CSPR")));
+    tree->addTopLevelItem(vfp_registers = new QTreeWidgetItem(QStringList(tr("VFP Registers"))));
+    tree->addTopLevelItem(vfp_system_registers = new QTreeWidgetItem(QStringList(tr("VFP System Registers"))));
-    registers->setExpanded(true);
+    tree->addTopLevelItem(cpsr = new QTreeWidgetItem(QStringList("CPSR")));
-    CSPR->setExpanded(true);
    for (int i = 0; i < 16; ++i) {
-        QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0'))));
+        QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i)));
-        registers->addChild(child);
+        core_registers->addChild(child);
+    }
+    for (int i = 0; i < 32; ++i) {
+        QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("S[%1]").arg(i)));
+        vfp_registers->addChild(child);
    }
-    CSPR->addChild(new QTreeWidgetItem(QStringList("M")));
+    CreateCPSRChildren();
-    CSPR->addChild(new QTreeWidgetItem(QStringList("T")));
+    CreateVFPSystemRegisterChildren();
-    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")));
    setEnabled(false);
 }
@@ -47,25 +38,14 @@ void RegistersWidget::OnDebugModeEntered() {
    if (app_core == nullptr)
        return;
-    for (int i = 0; i < 16; ++i)
+    for (int i = 0; i < core_registers->childCount(); ++i)
-        registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
+        core_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')));
+    for (int i = 0; i < vfp_registers->childCount(); ++i)
-    CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
+        vfp_registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetVFPReg(i), 8, 16, QLatin1Char('0')));
-    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
+    UpdateCPSRValues();
-    CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1));    // I - IRQ disable
+    UpdateVFPSystemRegisterValues();
-    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
 }
 void RegistersWidget::OnDebugModeLeft() {
@@ -77,13 +57,153 @@ void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) {
 void RegistersWidget::OnEmulationStopping() {
    // Reset widget text
-    for (int i = 0; i < 16; ++i)
+    for (int i = 0; i < core_registers->childCount(); ++i)
-        registers->child(i)->setText(1, QString(""));
+        core_registers->child(i)->setText(1, QString(""));
+    for (int i = 0; i < vfp_registers->childCount(); ++i)
+        vfp_registers->child(i)->setText(1, QString(""));
+    for (int i = 0; i < cpsr->childCount(); ++i)
+        cpsr->child(i)->setText(1, QString(""));
+    cpsr->setText(1, QString(""));
+    // FPSCR
+    for (int i = 0; i < vfp_system_registers->child(0)->childCount(); ++i)
+        vfp_system_registers->child(0)->child(i)->setText(1, QString(""));
-    for (int i = 0; i < 15; ++i)
+    // FPEXC
-        CSPR->child(i)->setText(1, QString(""));
+    for (int i = 0; i < vfp_system_registers->child(1)->childCount(); ++i)
+        vfp_system_registers->child(1)->child(i)->setText(1, QString(""));
-    CSPR->setText(1, QString(""));
+    vfp_system_registers->child(0)->setText(1, QString(""));
+    vfp_system_registers->child(1)->setText(1, QString(""));
+    vfp_system_registers->child(2)->setText(1, QString(""));
+    vfp_system_registers->child(3)->setText(1, QString(""));
    setEnabled(false);
 }
+void RegistersWidget::CreateCPSRChildren() {
+    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")));
+}
+void RegistersWidget::UpdateCPSRValues() {
+    const u32 cpsr_val = Core::g_app_core->GetCPSR();
+    cpsr->setText(1, QString("0x%1").arg(cpsr_val, 8, 16, QLatin1Char('0')));
+    cpsr->child(0)->setText(1, QString("b%1").arg(cpsr_val & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
+    cpsr->child(1)->setText(1, QString::number((cpsr_val >> 5) & 1));     // T - State
+    cpsr->child(2)->setText(1, QString::number((cpsr_val >> 6) & 1));     // F - FIQ disable
+    cpsr->child(3)->setText(1, QString::number((cpsr_val >> 7) & 1));     // I - IRQ disable
+    cpsr->child(4)->setText(1, QString::number((cpsr_val >> 8) & 1));     // A - Imprecise abort
+    cpsr->child(5)->setText(1, QString::number((cpsr_val >> 9) & 1));     // E - Data endianess
+    cpsr->child(6)->setText(1, QString::number((cpsr_val >> 10) & 0x3F)); // IT - If-Then state (DNM)
+    cpsr->child(7)->setText(1, QString::number((cpsr_val >> 16) & 0xF));  // GE - Greater-than-or-Equal
+    cpsr->child(8)->setText(1, QString::number((cpsr_val >> 20) & 0xF));  // DNM - Do not modify
+    cpsr->child(9)->setText(1, QString::number((cpsr_val >> 24) & 1));    // J - Jazelle
+    cpsr->child(10)->setText(1, QString::number((cpsr_val >> 27) & 1));   // Q - Saturation
+    cpsr->child(11)->setText(1, QString::number((cpsr_val >> 28) & 1));   // V - Overflow
+    cpsr->child(12)->setText(1, QString::number((cpsr_val >> 29) & 1));   // C - Carry/Borrow/Extend
+    cpsr->child(13)->setText(1, QString::number((cpsr_val >> 30) & 1));   // Z - Zero
+    cpsr->child(14)->setText(1, QString::number((cpsr_val >> 31) & 1));   // N - Negative/Less than
+}
+void RegistersWidget::CreateVFPSystemRegisterChildren() {
+    QTreeWidgetItem* const fpscr = new QTreeWidgetItem(QStringList("FPSCR"));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IOC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("DZC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("OFC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("UFC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IXC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IDC")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IOE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("DZE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("OFE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("UFE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IXE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("IDE")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Length"))));
+    fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Stride"))));
+    fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Rounding Mode"))));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("FZ")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("DN")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("V")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("C")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("Z")));
+    fpscr->addChild(new QTreeWidgetItem(QStringList("N")));
+    QTreeWidgetItem* const fpexc = new QTreeWidgetItem(QStringList("FPEXC"));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("IOC")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("OFC")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("UFC")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("INV")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList(tr("Vector Iteration Count"))));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("FP2V")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("EN")));
+    fpexc->addChild(new QTreeWidgetItem(QStringList("EX")));
+    vfp_system_registers->addChild(fpscr);
+    vfp_system_registers->addChild(fpexc);
+    vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST")));
+    vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST2")));
+}
+void RegistersWidget::UpdateVFPSystemRegisterValues() {
+    const u32 fpscr_val   = Core::g_app_core->GetVFPSystemReg(VFP_FPSCR);
+    const u32 fpexc_val   = Core::g_app_core->GetVFPSystemReg(VFP_FPEXC);
+    const u32 fpinst_val  = Core::g_app_core->GetVFPSystemReg(VFP_FPINST);
+    const u32 fpinst2_val = Core::g_app_core->GetVFPSystemReg(VFP_FPINST2);
+    QTreeWidgetItem* const fpscr = vfp_system_registers->child(0);
+    fpscr->setText(1, QString("0x%1").arg(fpscr_val, 8, 16, QLatin1Char('0')));
+    fpscr->child(0)->setText(1, QString::number(fpscr_val & 1));
+    fpscr->child(1)->setText(1, QString::number((fpscr_val >> 1) & 1));
+    fpscr->child(2)->setText(1, QString::number((fpscr_val >> 2) & 1));
+    fpscr->child(3)->setText(1, QString::number((fpscr_val >> 3) & 1));
+    fpscr->child(4)->setText(1, QString::number((fpscr_val >> 4) & 1));
+    fpscr->child(5)->setText(1, QString::number((fpscr_val >> 7) & 1));
+    fpscr->child(6)->setText(1, QString::number((fpscr_val >> 8) & 1));
+    fpscr->child(7)->setText(1, QString::number((fpscr_val >> 9) & 1));
+    fpscr->child(8)->setText(1, QString::number((fpscr_val >> 10) & 1));
+    fpscr->child(9)->setText(1, QString::number((fpscr_val >> 11) & 1));
+    fpscr->child(10)->setText(1, QString::number((fpscr_val >> 12) & 1));
+    fpscr->child(11)->setText(1, QString::number((fpscr_val >> 15) & 1));
+    fpscr->child(12)->setText(1, QString("b%1").arg((fpscr_val >> 16) & 7, 3, 2, QLatin1Char('0')));
+    fpscr->child(13)->setText(1, QString("b%1").arg((fpscr_val >> 20) & 3, 2, 2, QLatin1Char('0')));
+    fpscr->child(14)->setText(1, QString("b%1").arg((fpscr_val >> 22) & 3, 2, 2, QLatin1Char('0')));
+    fpscr->child(15)->setText(1, QString::number((fpscr_val >> 24) & 1));
+    fpscr->child(16)->setText(1, QString::number((fpscr_val >> 25) & 1));
+    fpscr->child(17)->setText(1, QString::number((fpscr_val >> 28) & 1));
+    fpscr->child(18)->setText(1, QString::number((fpscr_val >> 29) & 1));
+    fpscr->child(19)->setText(1, QString::number((fpscr_val >> 30) & 1));
+    fpscr->child(20)->setText(1, QString::number((fpscr_val >> 31) & 1));
+    QTreeWidgetItem* const fpexc = vfp_system_registers->child(1);
+    fpexc->setText(1, QString("0x%1").arg(fpexc_val, 8, 16, QLatin1Char('0')));
+    fpexc->child(0)->setText(1, QString::number(fpexc_val & 1));
+    fpexc->child(1)->setText(1, QString::number((fpexc_val >> 2) & 1));
+    fpexc->child(2)->setText(1, QString::number((fpexc_val >> 3) & 1));
+    fpexc->child(3)->setText(1, QString::number((fpexc_val >> 7) & 1));
+    fpexc->child(4)->setText(1, QString("b%1").arg((fpexc_val >> 8) & 7, 3, 2, QLatin1Char('0')));
+    fpexc->child(5)->setText(1, QString::number((fpexc_val >> 28) & 1));
+    fpexc->child(6)->setText(1, QString::number((fpexc_val >> 30) & 1));
+    fpexc->child(7)->setText(1, QString::number((fpexc_val >> 31) & 1));
+    vfp_system_registers->child(2)->setText(1, QString("0x%1").arg(fpinst_val, 8, 16, QLatin1Char('0')));
+    vfp_system_registers->child(3)->setText(1, QString("0x%1").arg(fpinst2_val, 8, 16, QLatin1Char('0')));
+}
diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h
index 68e3fb908..09b830e80 100644
--- a/src/citra_qt/debugger/registers.h
+++ b/src/citra_qt/debugger/registers.h
@@ -25,10 +25,18 @@ public slots:
    void OnEmulationStopping();
 private:
+    void CreateCPSRChildren();
+    void UpdateCPSRValues();
+    void CreateVFPSystemRegisterChildren();
+    void UpdateVFPSystemRegisterValues();
    Ui::ARMRegisters cpu_regs_ui;
    QTreeWidget* tree;
-    QTreeWidgetItem* registers;
+    QTreeWidgetItem* core_registers;
-    QTreeWidgetItem* CSPR;
+    QTreeWidgetItem* vfp_registers;
+    QTreeWidgetItem* vfp_system_registers;
+    QTreeWidgetItem* cpsr;
 };
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index 85ed2c698..5cffe513c 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -62,6 +62,34 @@ public:
    virtual void SetReg(int index, u32 value) = 0;
    /**
+     * Gets the value of a VFP register
+     * @param index Register index (0-31)
+     * @return Returns the value in the register
+     */
+    virtual u32 GetVFPReg(int index) const = 0;
+    /**
+     * Sets a VFP register to the given value
+     * @param index Register index (0-31)
+     * @param value Value to set register to
+     */
+    virtual void SetVFPReg(int index, u32 value) = 0;
+    /**
+     * Gets the current value within a given VFP system register
+     * @param reg The VFP system register
+     * @return The value within the VFP system register
+     */
+    virtual u32 GetVFPSystemReg(VFPSystemRegister reg) const = 0;
+    /**
+     * Sets the VFP system register to the given value
+     * @param reg   The VFP system register
+     * @param value Value to set the VFP system register to
+     */
+    virtual void SetVFPSystemReg(VFPSystemRegister reg, u32 value) = 0;
+    /**
     * Get the current CPSR register
     * @return Returns the value of the CPSR register
     */
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index c665f706f..f3be2c857 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -40,6 +40,22 @@ void ARM_DynCom::SetReg(int index, u32 value) {
    state->Reg[index] = value;
 }
+u32 ARM_DynCom::GetVFPReg(int index) const {
+    return state->ExtReg[index];
+}
+void ARM_DynCom::SetVFPReg(int index, u32 value) {
+    state->ExtReg[index] = value;
+}
+u32 ARM_DynCom::GetVFPSystemReg(VFPSystemRegister reg) const {
+    return state->VFP[reg];
+}
+void ARM_DynCom::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
+    state->VFP[reg] = value;
+}
 u32 ARM_DynCom::GetCPSR() const {
    return state->Cpsr;
 }
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 87ab6908a..3664fd728 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -25,6 +25,10 @@ public:
    u32 GetPC() const override;
    u32 GetReg(int index) const override;
    void SetReg(int index, u32 value) override;
+    u32 GetVFPReg(int index) const override;
+    void SetVFPReg(int index, u32 value) override;
+    u32 GetVFPSystemReg(VFPSystemRegister reg) const override;
+    void SetVFPSystemReg(VFPSystemRegister reg, u32 value) override;
    u32 GetCPSR() const override;
    void SetCPSR(u32 cpsr) override;
    u32 GetCP15Register(CP15Register reg) override;
diff --git a/src/core/arm/skyeye_common/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h
index d1c721809..38fa97ab9 100644
--- a/src/core/arm/skyeye_common/arm_regformat.h
+++ b/src/core/arm/skyeye_common/arm_regformat.h
@@ -55,7 +55,7 @@ enum {
 };
 // VFP system registers
-enum {
+enum VFPSystemRegister {
    VFP_FPSID,
    VFP_FPSCR,
    VFP_FPEXC,
author	bunnei	2015-08-13 18:13:25 -0400
committer	bunnei	2015-08-13 18:13:25 -0400
commit	cebf245504b75469f19d3cc0a6f2f66aefa66947 (patch)
tree	4026f74849517f02575bb34a8d4d35d50daaccfc
parent	Merge pull request #1030 from archshift/force-inline (diff)
parent	registers: Support viewing VFP registers (diff)
download	yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.tar.gz yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.tar.xz yuzu-cebf245504b75469f19d3cc0a6f2f66aefa66947.zip

diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 5527a2afd..4174b3945 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp
@@ -11,32 +11,23 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) {
11	cpu_regs_ui.setupUi(this);	11	cpu_regs_ui.setupUi(this);
12		12
13	tree = cpu_regs_ui.treeWidget;	13	tree = cpu_regs_ui.treeWidget;
14	tree->addTopLevelItem(registers = new QTreeWidgetItem(QStringList("Registers")));	14	tree->addTopLevelItem(core_registers = new QTreeWidgetItem(QStringList(tr("Registers"))));
15	tree->addTopLevelItem(CSPR = new QTreeWidgetItem(QStringList("CSPR")));	15	tree->addTopLevelItem(vfp_registers = new QTreeWidgetItem(QStringList(tr("VFP Registers"))));
16		16	tree->addTopLevelItem(vfp_system_registers = new QTreeWidgetItem(QStringList(tr("VFP System Registers"))));
17	registers->setExpanded(true);	17	tree->addTopLevelItem(cpsr = new QTreeWidgetItem(QStringList("CPSR")));
18	CSPR->setExpanded(true);
19		18
20	for (int i = 0; i < 16; ++i) {	19	for (int i = 0; i < 16; ++i) {
21	QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0'))));	20	QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i)));
22	registers->addChild(child);	21	core_registers->addChild(child);
		22	}
		23
		24	for (int i = 0; i < 32; ++i) {
		25	QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("S[%1]").arg(i)));
		26	vfp_registers->addChild(child);
23	}	27	}
24		28
25	CSPR->addChild(new QTreeWidgetItem(QStringList("M")));	29	CreateCPSRChildren();
26	CSPR->addChild(new QTreeWidgetItem(QStringList("T")));	30	CreateVFPSystemRegisterChildren();
27	CSPR->addChild(new QTreeWidgetItem(QStringList("F")));
28	CSPR->addChild(new QTreeWidgetItem(QStringList("I")));
29	CSPR->addChild(new QTreeWidgetItem(QStringList("A")));
30	CSPR->addChild(new QTreeWidgetItem(QStringList("E")));
31	CSPR->addChild(new QTreeWidgetItem(QStringList("IT")));
32	CSPR->addChild(new QTreeWidgetItem(QStringList("GE")));
33	CSPR->addChild(new QTreeWidgetItem(QStringList("DNM")));
34	CSPR->addChild(new QTreeWidgetItem(QStringList("J")));
35	CSPR->addChild(new QTreeWidgetItem(QStringList("Q")));
36	CSPR->addChild(new QTreeWidgetItem(QStringList("V")));
37	CSPR->addChild(new QTreeWidgetItem(QStringList("C")));
38	CSPR->addChild(new QTreeWidgetItem(QStringList("Z")));
39	CSPR->addChild(new QTreeWidgetItem(QStringList("N")));
40		31
41	setEnabled(false);	32	setEnabled(false);
42	}	33	}
@@ -47,25 +38,14 @@ void RegistersWidget::OnDebugModeEntered() {
47	if (app_core == nullptr)	38	if (app_core == nullptr)
48	return;	39	return;
49		40
50	for (int i = 0; i < 16; ++i)	41	for (int i = 0; i < core_registers->childCount(); ++i)
51	registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));	42	core_registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
52		43
53	CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));	44	for (int i = 0; i < vfp_registers->childCount(); ++i)
54	CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode	45	vfp_registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetVFPReg(i), 8, 16, QLatin1Char('0')));
55	CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State	46
56	CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable	47	UpdateCPSRValues();
57	CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable	48	UpdateVFPSystemRegisterValues();
58	CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort
59	CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1)); // E - Data endianess
60	CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM)
61	CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal
62	CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF)); // DNM - Do not modify
63	CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1)); // J - Java state
64	CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1)); // Q - Sticky overflow
65	CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1)); // V - Overflow
66	CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend
67	CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero
68	CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than
69	}	49	}
70		50
71	void RegistersWidget::OnDebugModeLeft() {	51	void RegistersWidget::OnDebugModeLeft() {
@@ -77,13 +57,153 @@ void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) {
77		57
78	void RegistersWidget::OnEmulationStopping() {	58	void RegistersWidget::OnEmulationStopping() {
79	// Reset widget text	59	// Reset widget text
80	for (int i = 0; i < 16; ++i)	60	for (int i = 0; i < core_registers->childCount(); ++i)
81	registers->child(i)->setText(1, QString(""));	61	core_registers->child(i)->setText(1, QString(""));
		62
		63	for (int i = 0; i < vfp_registers->childCount(); ++i)
		64	vfp_registers->child(i)->setText(1, QString(""));
		65
		66	for (int i = 0; i < cpsr->childCount(); ++i)
		67	cpsr->child(i)->setText(1, QString(""));
		68
		69	cpsr->setText(1, QString(""));
		70
		71	// FPSCR
		72	for (int i = 0; i < vfp_system_registers->child(0)->childCount(); ++i)
		73	vfp_system_registers->child(0)->child(i)->setText(1, QString(""));
82		74
83	for (int i = 0; i < 15; ++i)	75	// FPEXC
84	CSPR->child(i)->setText(1, QString(""));	76	for (int i = 0; i < vfp_system_registers->child(1)->childCount(); ++i)
		77	vfp_system_registers->child(1)->child(i)->setText(1, QString(""));
85		78
86	CSPR->setText(1, QString(""));	79	vfp_system_registers->child(0)->setText(1, QString(""));
		80	vfp_system_registers->child(1)->setText(1, QString(""));
		81	vfp_system_registers->child(2)->setText(1, QString(""));
		82	vfp_system_registers->child(3)->setText(1, QString(""));
87		83
88	setEnabled(false);	84	setEnabled(false);
89	}	85	}
		86
		87	void RegistersWidget::CreateCPSRChildren() {
		88	cpsr->addChild(new QTreeWidgetItem(QStringList("M")));
		89	cpsr->addChild(new QTreeWidgetItem(QStringList("T")));
		90	cpsr->addChild(new QTreeWidgetItem(QStringList("F")));
		91	cpsr->addChild(new QTreeWidgetItem(QStringList("I")));
		92	cpsr->addChild(new QTreeWidgetItem(QStringList("A")));
		93	cpsr->addChild(new QTreeWidgetItem(QStringList("E")));
		94	cpsr->addChild(new QTreeWidgetItem(QStringList("IT")));
		95	cpsr->addChild(new QTreeWidgetItem(QStringList("GE")));
		96	cpsr->addChild(new QTreeWidgetItem(QStringList("DNM")));
		97	cpsr->addChild(new QTreeWidgetItem(QStringList("J")));
		98	cpsr->addChild(new QTreeWidgetItem(QStringList("Q")));
		99	cpsr->addChild(new QTreeWidgetItem(QStringList("V")));
		100	cpsr->addChild(new QTreeWidgetItem(QStringList("C")));
		101	cpsr->addChild(new QTreeWidgetItem(QStringList("Z")));
		102	cpsr->addChild(new QTreeWidgetItem(QStringList("N")));
		103	}
		104
		105	void RegistersWidget::UpdateCPSRValues() {
		106	const u32 cpsr_val = Core::g_app_core->GetCPSR();
		107
		108	cpsr->setText(1, QString("0x%1").arg(cpsr_val, 8, 16, QLatin1Char('0')));
		109	cpsr->child(0)->setText(1, QString("b%1").arg(cpsr_val & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
		110	cpsr->child(1)->setText(1, QString::number((cpsr_val >> 5) & 1)); // T - State
		111	cpsr->child(2)->setText(1, QString::number((cpsr_val >> 6) & 1)); // F - FIQ disable
		112	cpsr->child(3)->setText(1, QString::number((cpsr_val >> 7) & 1)); // I - IRQ disable
		113	cpsr->child(4)->setText(1, QString::number((cpsr_val >> 8) & 1)); // A - Imprecise abort
		114	cpsr->child(5)->setText(1, QString::number((cpsr_val >> 9) & 1)); // E - Data endianess
		115	cpsr->child(6)->setText(1, QString::number((cpsr_val >> 10) & 0x3F)); // IT - If-Then state (DNM)
		116	cpsr->child(7)->setText(1, QString::number((cpsr_val >> 16) & 0xF)); // GE - Greater-than-or-Equal
		117	cpsr->child(8)->setText(1, QString::number((cpsr_val >> 20) & 0xF)); // DNM - Do not modify
		118	cpsr->child(9)->setText(1, QString::number((cpsr_val >> 24) & 1)); // J - Jazelle
		119	cpsr->child(10)->setText(1, QString::number((cpsr_val >> 27) & 1)); // Q - Saturation
		120	cpsr->child(11)->setText(1, QString::number((cpsr_val >> 28) & 1)); // V - Overflow
		121	cpsr->child(12)->setText(1, QString::number((cpsr_val >> 29) & 1)); // C - Carry/Borrow/Extend
		122	cpsr->child(13)->setText(1, QString::number((cpsr_val >> 30) & 1)); // Z - Zero
		123	cpsr->child(14)->setText(1, QString::number((cpsr_val >> 31) & 1)); // N - Negative/Less than
		124	}
		125
		126	void RegistersWidget::CreateVFPSystemRegisterChildren() {
		127	QTreeWidgetItem* const fpscr = new QTreeWidgetItem(QStringList("FPSCR"));
		128	fpscr->addChild(new QTreeWidgetItem(QStringList("IOC")));
		129	fpscr->addChild(new QTreeWidgetItem(QStringList("DZC")));
		130	fpscr->addChild(new QTreeWidgetItem(QStringList("OFC")));
		131	fpscr->addChild(new QTreeWidgetItem(QStringList("UFC")));
		132	fpscr->addChild(new QTreeWidgetItem(QStringList("IXC")));
		133	fpscr->addChild(new QTreeWidgetItem(QStringList("IDC")));
		134	fpscr->addChild(new QTreeWidgetItem(QStringList("IOE")));
		135	fpscr->addChild(new QTreeWidgetItem(QStringList("DZE")));
		136	fpscr->addChild(new QTreeWidgetItem(QStringList("OFE")));
		137	fpscr->addChild(new QTreeWidgetItem(QStringList("UFE")));
		138	fpscr->addChild(new QTreeWidgetItem(QStringList("IXE")));
		139	fpscr->addChild(new QTreeWidgetItem(QStringList("IDE")));
		140	fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Length"))));
		141	fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Stride"))));
		142	fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Rounding Mode"))));
		143	fpscr->addChild(new QTreeWidgetItem(QStringList("FZ")));
		144	fpscr->addChild(new QTreeWidgetItem(QStringList("DN")));
		145	fpscr->addChild(new QTreeWidgetItem(QStringList("V")));
		146	fpscr->addChild(new QTreeWidgetItem(QStringList("C")));
		147	fpscr->addChild(new QTreeWidgetItem(QStringList("Z")));
		148	fpscr->addChild(new QTreeWidgetItem(QStringList("N")));
		149
		150	QTreeWidgetItem* const fpexc = new QTreeWidgetItem(QStringList("FPEXC"));
		151	fpexc->addChild(new QTreeWidgetItem(QStringList("IOC")));
		152	fpexc->addChild(new QTreeWidgetItem(QStringList("OFC")));
		153	fpexc->addChild(new QTreeWidgetItem(QStringList("UFC")));
		154	fpexc->addChild(new QTreeWidgetItem(QStringList("INV")));
		155	fpexc->addChild(new QTreeWidgetItem(QStringList(tr("Vector Iteration Count"))));
		156	fpexc->addChild(new QTreeWidgetItem(QStringList("FP2V")));
		157	fpexc->addChild(new QTreeWidgetItem(QStringList("EN")));
		158	fpexc->addChild(new QTreeWidgetItem(QStringList("EX")));
		159
		160	vfp_system_registers->addChild(fpscr);
		161	vfp_system_registers->addChild(fpexc);
		162	vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST")));
		163	vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST2")));
		164	}
		165
		166	void RegistersWidget::UpdateVFPSystemRegisterValues() {
		167	const u32 fpscr_val = Core::g_app_core->GetVFPSystemReg(VFP_FPSCR);
		168	const u32 fpexc_val = Core::g_app_core->GetVFPSystemReg(VFP_FPEXC);
		169	const u32 fpinst_val = Core::g_app_core->GetVFPSystemReg(VFP_FPINST);
		170	const u32 fpinst2_val = Core::g_app_core->GetVFPSystemReg(VFP_FPINST2);
		171
		172	QTreeWidgetItem* const fpscr = vfp_system_registers->child(0);
		173	fpscr->setText(1, QString("0x%1").arg(fpscr_val, 8, 16, QLatin1Char('0')));
		174	fpscr->child(0)->setText(1, QString::number(fpscr_val & 1));
		175	fpscr->child(1)->setText(1, QString::number((fpscr_val >> 1) & 1));
		176	fpscr->child(2)->setText(1, QString::number((fpscr_val >> 2) & 1));
		177	fpscr->child(3)->setText(1, QString::number((fpscr_val >> 3) & 1));
		178	fpscr->child(4)->setText(1, QString::number((fpscr_val >> 4) & 1));
		179	fpscr->child(5)->setText(1, QString::number((fpscr_val >> 7) & 1));
		180	fpscr->child(6)->setText(1, QString::number((fpscr_val >> 8) & 1));
		181	fpscr->child(7)->setText(1, QString::number((fpscr_val >> 9) & 1));
		182	fpscr->child(8)->setText(1, QString::number((fpscr_val >> 10) & 1));
		183	fpscr->child(9)->setText(1, QString::number((fpscr_val >> 11) & 1));
		184	fpscr->child(10)->setText(1, QString::number((fpscr_val >> 12) & 1));
		185	fpscr->child(11)->setText(1, QString::number((fpscr_val >> 15) & 1));
		186	fpscr->child(12)->setText(1, QString("b%1").arg((fpscr_val >> 16) & 7, 3, 2, QLatin1Char('0')));
		187	fpscr->child(13)->setText(1, QString("b%1").arg((fpscr_val >> 20) & 3, 2, 2, QLatin1Char('0')));
		188	fpscr->child(14)->setText(1, QString("b%1").arg((fpscr_val >> 22) & 3, 2, 2, QLatin1Char('0')));
		189	fpscr->child(15)->setText(1, QString::number((fpscr_val >> 24) & 1));
		190	fpscr->child(16)->setText(1, QString::number((fpscr_val >> 25) & 1));
		191	fpscr->child(17)->setText(1, QString::number((fpscr_val >> 28) & 1));
		192	fpscr->child(18)->setText(1, QString::number((fpscr_val >> 29) & 1));
		193	fpscr->child(19)->setText(1, QString::number((fpscr_val >> 30) & 1));
		194	fpscr->child(20)->setText(1, QString::number((fpscr_val >> 31) & 1));
		195
		196	QTreeWidgetItem* const fpexc = vfp_system_registers->child(1);
		197	fpexc->setText(1, QString("0x%1").arg(fpexc_val, 8, 16, QLatin1Char('0')));
		198	fpexc->child(0)->setText(1, QString::number(fpexc_val & 1));
		199	fpexc->child(1)->setText(1, QString::number((fpexc_val >> 2) & 1));
		200	fpexc->child(2)->setText(1, QString::number((fpexc_val >> 3) & 1));
		201	fpexc->child(3)->setText(1, QString::number((fpexc_val >> 7) & 1));
		202	fpexc->child(4)->setText(1, QString("b%1").arg((fpexc_val >> 8) & 7, 3, 2, QLatin1Char('0')));
		203	fpexc->child(5)->setText(1, QString::number((fpexc_val >> 28) & 1));
		204	fpexc->child(6)->setText(1, QString::number((fpexc_val >> 30) & 1));
		205	fpexc->child(7)->setText(1, QString::number((fpexc_val >> 31) & 1));
		206
		207	vfp_system_registers->child(2)->setText(1, QString("0x%1").arg(fpinst_val, 8, 16, QLatin1Char('0')));
		208	vfp_system_registers->child(3)->setText(1, QString("0x%1").arg(fpinst2_val, 8, 16, QLatin1Char('0')));
		209	}


diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index 68e3fb908..09b830e80 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h
@@ -25,10 +25,18 @@ public slots:
25	void OnEmulationStopping();	25	void OnEmulationStopping();
26		26
27	private:	27	private:
		28	void CreateCPSRChildren();
		29	void UpdateCPSRValues();
		30
		31	void CreateVFPSystemRegisterChildren();
		32	void UpdateVFPSystemRegisterValues();
		33
28	Ui::ARMRegisters cpu_regs_ui;	34	Ui::ARMRegisters cpu_regs_ui;
29		35
30	QTreeWidget* tree;	36	QTreeWidget* tree;
31		37
32	QTreeWidgetItem* registers;	38	QTreeWidgetItem* core_registers;
33	QTreeWidgetItem* CSPR;	39	QTreeWidgetItem* vfp_registers;
		40	QTreeWidgetItem* vfp_system_registers;
		41	QTreeWidgetItem* cpsr;
34	};	42	};


diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 85ed2c698..5cffe513c 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h
@@ -62,6 +62,34 @@ public:
62	virtual void SetReg(int index, u32 value) = 0;	62	virtual void SetReg(int index, u32 value) = 0;
63		63
64	/**	64	/**
		65	* Gets the value of a VFP register
		66	* @param index Register index (0-31)
		67	* @return Returns the value in the register
		68	*/
		69	virtual u32 GetVFPReg(int index) const = 0;
		70
		71	/**
		72	* Sets a VFP register to the given value
		73	* @param index Register index (0-31)
		74	* @param value Value to set register to
		75	*/
		76	virtual void SetVFPReg(int index, u32 value) = 0;
		77
		78	/**
		79	* Gets the current value within a given VFP system register
		80	* @param reg The VFP system register
		81	* @return The value within the VFP system register
		82	*/
		83	virtual u32 GetVFPSystemReg(VFPSystemRegister reg) const = 0;
		84
		85	/**
		86	* Sets the VFP system register to the given value
		87	* @param reg The VFP system register
		88	* @param value Value to set the VFP system register to
		89	*/
		90	virtual void SetVFPSystemReg(VFPSystemRegister reg, u32 value) = 0;
		91
		92	/**
65	* Get the current CPSR register	93	* Get the current CPSR register
66	* @return Returns the value of the CPSR register	94	* @return Returns the value of the CPSR register
67	*/	95	*/


diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index c665f706f..f3be2c857 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -40,6 +40,22 @@ void ARM_DynCom::SetReg(int index, u32 value) {
40	state->Reg[index] = value;	40	state->Reg[index] = value;
41	}	41	}
42		42
		43	u32 ARM_DynCom::GetVFPReg(int index) const {
		44	return state->ExtReg[index];
		45	}
		46
		47	void ARM_DynCom::SetVFPReg(int index, u32 value) {
		48	state->ExtReg[index] = value;
		49	}
		50
		51	u32 ARM_DynCom::GetVFPSystemReg(VFPSystemRegister reg) const {
		52	return state->VFP[reg];
		53	}
		54
		55	void ARM_DynCom::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
		56	state->VFP[reg] = value;
		57	}
		58
43	u32 ARM_DynCom::GetCPSR() const {	59	u32 ARM_DynCom::GetCPSR() const {
44	return state->Cpsr;	60	return state->Cpsr;
45	}	61	}


diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index 87ab6908a..3664fd728 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -25,6 +25,10 @@ public:
25	u32 GetPC() const override;	25	u32 GetPC() const override;
26	u32 GetReg(int index) const override;	26	u32 GetReg(int index) const override;
27	void SetReg(int index, u32 value) override;	27	void SetReg(int index, u32 value) override;
		28	u32 GetVFPReg(int index) const override;
		29	void SetVFPReg(int index, u32 value) override;
		30	u32 GetVFPSystemReg(VFPSystemRegister reg) const override;
		31	void SetVFPSystemReg(VFPSystemRegister reg, u32 value) override;
28	u32 GetCPSR() const override;	32	u32 GetCPSR() const override;
29	void SetCPSR(u32 cpsr) override;	33	void SetCPSR(u32 cpsr) override;
30	u32 GetCP15Register(CP15Register reg) override;	34	u32 GetCP15Register(CP15Register reg) override;


diff --git a/src/core/arm/skyeye_common/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h index d1c721809..38fa97ab9 100644 --- a/src/core/arm/skyeye_common/arm_regformat.h +++ b/src/core/arm/skyeye_common/arm_regformat.h
@@ -55,7 +55,7 @@ enum {
55	};	55	};
56		56
57	// VFP system registers	57	// VFP system registers
58	enum {	58	enum VFPSystemRegister {
59	VFP_FPSID,	59	VFP_FPSID,
60	VFP_FPSCR,	60	VFP_FPSCR,
61	VFP_FPEXC,	61	VFP_FPEXC,