registers: Fix a typo with CPSR's name

author: Lioncash 2015-08-06 21:11:25 -0400
committer: Lioncash 2015-08-06 21:11:25 -0400
commit: 5855cf087d5eea52c08f52cd7e5ef60085afda19 (patch)
tree: e935ffa08bf041565fb2e4e4580b8fc2dd21cc26 /src
parent: Merge pull request #1022 from aroulin/disas-missing-v6k-instructions (diff)
download: yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.gz
yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.xz
yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.zip
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")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("M")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("T")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("T")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("F")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("F")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("I")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("I")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("A")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("A")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("E")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("E")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("IT")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("IT")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("GE")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("GE")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("DNM")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("DNM")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("J")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("J")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("Q")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("Q")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("V")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("V")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("C")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("C")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("Z")));
+    cpsr->addChild(new QTreeWidgetItem(QStringList("Z")));
-    CSPR->addChild(new QTreeWidgetItem(QStringList("N")));
+    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')));
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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)
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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
+    cpsr->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->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;
 };
author	Lioncash	2015-08-06 21:11:25 -0400
committer	Lioncash	2015-08-06 21:11:25 -0400
commit	5855cf087d5eea52c08f52cd7e5ef60085afda19 (patch)
tree	e935ffa08bf041565fb2e4e4580b8fc2dd21cc26 /src
parent	Merge pull request #1022 from aroulin/disas-missing-v6k-instructions (diff)
download	yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.gz yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.tar.xz yuzu-5855cf087d5eea52c08f52cd7e5ef60085afda19.zip

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) {
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(registers = new QTreeWidgetItem(QStringList("Registers")));
15	tree->addTopLevelItem(CSPR = new QTreeWidgetItem(QStringList("CSPR")));	15	tree->addTopLevelItem(cpsr = new QTreeWidgetItem(QStringList("CPSR")));
16		16
17	registers->setExpanded(true);	17	registers->setExpanded(true);
18	CSPR->setExpanded(true);	18	cpsr->setExpanded(true);
19		19
20	for (int i = 0; i < 16; ++i) {	20	for (int i = 0; i < 16; ++i) {
21	QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0'))));	21	QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0'))));
22	registers->addChild(child);	22	registers->addChild(child);
23	}	23	}
24		24
25	CSPR->addChild(new QTreeWidgetItem(QStringList("M")));	25	cpsr->addChild(new QTreeWidgetItem(QStringList("M")));
26	CSPR->addChild(new QTreeWidgetItem(QStringList("T")));	26	cpsr->addChild(new QTreeWidgetItem(QStringList("T")));
27	CSPR->addChild(new QTreeWidgetItem(QStringList("F")));	27	cpsr->addChild(new QTreeWidgetItem(QStringList("F")));
28	CSPR->addChild(new QTreeWidgetItem(QStringList("I")));	28	cpsr->addChild(new QTreeWidgetItem(QStringList("I")));
29	CSPR->addChild(new QTreeWidgetItem(QStringList("A")));	29	cpsr->addChild(new QTreeWidgetItem(QStringList("A")));
30	CSPR->addChild(new QTreeWidgetItem(QStringList("E")));	30	cpsr->addChild(new QTreeWidgetItem(QStringList("E")));
31	CSPR->addChild(new QTreeWidgetItem(QStringList("IT")));	31	cpsr->addChild(new QTreeWidgetItem(QStringList("IT")));
32	CSPR->addChild(new QTreeWidgetItem(QStringList("GE")));	32	cpsr->addChild(new QTreeWidgetItem(QStringList("GE")));
33	CSPR->addChild(new QTreeWidgetItem(QStringList("DNM")));	33	cpsr->addChild(new QTreeWidgetItem(QStringList("DNM")));
34	CSPR->addChild(new QTreeWidgetItem(QStringList("J")));	34	cpsr->addChild(new QTreeWidgetItem(QStringList("J")));
35	CSPR->addChild(new QTreeWidgetItem(QStringList("Q")));	35	cpsr->addChild(new QTreeWidgetItem(QStringList("Q")));
36	CSPR->addChild(new QTreeWidgetItem(QStringList("V")));	36	cpsr->addChild(new QTreeWidgetItem(QStringList("V")));
37	CSPR->addChild(new QTreeWidgetItem(QStringList("C")));	37	cpsr->addChild(new QTreeWidgetItem(QStringList("C")));
38	CSPR->addChild(new QTreeWidgetItem(QStringList("Z")));	38	cpsr->addChild(new QTreeWidgetItem(QStringList("Z")));
39	CSPR->addChild(new QTreeWidgetItem(QStringList("N")));	39	cpsr->addChild(new QTreeWidgetItem(QStringList("N")));
40		40
41	setEnabled(false);	41	setEnabled(false);
42	}	42	}
@@ -50,22 +50,22 @@ void RegistersWidget::OnDebugModeEntered() {
50	for (int i = 0; i < 16; ++i)	50	for (int i = 0; i < 16; ++i)
51	registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));	51	registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
52		52
53	CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));	53	cpsr->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));
54	CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode	54	cpsr->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
55	CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State	55	cpsr->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State
56	CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable	56	cpsr->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable
57	CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable	57	cpsr->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable
58	CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort	58	cpsr->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	59	cpsr->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)	60	cpsr->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	61	cpsr->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	62	cpsr->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	63	cpsr->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	64	cpsr->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	65	cpsr->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	66	cpsr->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	67	cpsr->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	68	cpsr->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than
69	}	69	}
70		70
71	void RegistersWidget::OnDebugModeLeft() {	71	void RegistersWidget::OnDebugModeLeft() {
@@ -81,9 +81,9 @@ void RegistersWidget::OnEmulationStopping() {
81	registers->child(i)->setText(1, QString(""));	81	registers->child(i)->setText(1, QString(""));
82		82
83	for (int i = 0; i < 15; ++i)	83	for (int i = 0; i < 15; ++i)
84	CSPR->child(i)->setText(1, QString(""));	84	cpsr->child(i)->setText(1, QString(""));
85		85
86	CSPR->setText(1, QString(""));	86	cpsr->setText(1, QString(""));
87		87
88	setEnabled(false);	88	setEnabled(false);
89	}	89	}


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:
30	QTreeWidget* tree;	30	QTreeWidget* tree;
31		31
32	QTreeWidgetItem* registers;	32	QTreeWidgetItem* registers;
33	QTreeWidgetItem* CSPR;	33	QTreeWidgetItem* cpsr;
34	};	34	};