diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.hxx | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.hxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 758f71fda..20623c939 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #define APP_TITLE APP_NAME " " APP_VERSION | 23 | #define APP_TITLE APP_NAME " " APP_VERSION |
| 24 | #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" | 24 | #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" |
| 25 | 25 | ||
| 26 | EmuThread::EmuThread(GRenderWindow* render_window) : | 26 | EmuThread::EmuThread(GRenderWindow* render_window) : |
| 27 | filename(""), exec_cpu_step(false), cpu_running(false), | 27 | filename(""), exec_cpu_step(false), cpu_running(false), |
| 28 | stop_run(false), render_window(render_window) | 28 | stop_run(false), render_window(render_window) |
| 29 | { | 29 | { |
| @@ -42,7 +42,7 @@ void EmuThread::run() | |||
| 42 | if (cpu_running) | 42 | if (cpu_running) |
| 43 | { | 43 | { |
| 44 | Core::RunLoop(); | 44 | Core::RunLoop(); |
| 45 | } | 45 | } |
| 46 | else if (exec_cpu_step) | 46 | else if (exec_cpu_step) |
| 47 | { | 47 | { |
| 48 | exec_cpu_step = false; | 48 | exec_cpu_step = false; |
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx index 3eec1668e..5f69f15ea 100644 --- a/src/citra_qt/bootmanager.hxx +++ b/src/citra_qt/bootmanager.hxx | |||
| @@ -18,7 +18,7 @@ class EmuThread : public QThread | |||
| 18 | public: | 18 | public: |
| 19 | /** | 19 | /** |
| 20 | * Set image filename | 20 | * Set image filename |
| 21 | * | 21 | * |
| 22 | * @param filename | 22 | * @param filename |
| 23 | * @warning Only call when not running! | 23 | * @warning Only call when not running! |
| 24 | */ | 24 | */ |
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 77fb0c9ed..895851be3 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp | |||
| @@ -28,7 +28,7 @@ void CallstackWidget::OnCPUStepped() | |||
| 28 | 28 | ||
| 29 | u32 sp = app_core->GetReg(13); //stack pointer | 29 | u32 sp = app_core->GetReg(13); //stack pointer |
| 30 | u32 addr, ret_addr, call_addr, func_addr; | 30 | u32 addr, ret_addr, call_addr, func_addr; |
| 31 | 31 | ||
| 32 | int counter = 0; | 32 | int counter = 0; |
| 33 | for (int addr = 0x10000000; addr >= sp; addr -= 4) | 33 | for (int addr = 0x10000000; addr >= sp; addr -= 4) |
| 34 | { | 34 | { |
| @@ -55,7 +55,7 @@ void CallstackWidget::OnCPUStepped() | |||
| 55 | callstack_model->setItem(counter, 0, new QStandardItem(QString("0x%1").arg(addr, 8, 16, QLatin1Char('0')))); | 55 | callstack_model->setItem(counter, 0, new QStandardItem(QString("0x%1").arg(addr, 8, 16, QLatin1Char('0')))); |
| 56 | callstack_model->setItem(counter, 1, new QStandardItem(QString("0x%1").arg(ret_addr, 8, 16, QLatin1Char('0')))); | 56 | callstack_model->setItem(counter, 1, new QStandardItem(QString("0x%1").arg(ret_addr, 8, 16, QLatin1Char('0')))); |
| 57 | callstack_model->setItem(counter, 2, new QStandardItem(QString("0x%1").arg(call_addr, 8, 16, QLatin1Char('0')))); | 57 | callstack_model->setItem(counter, 2, new QStandardItem(QString("0x%1").arg(call_addr, 8, 16, QLatin1Char('0')))); |
| 58 | 58 | ||
| 59 | name = Symbols::HasSymbol(func_addr) ? Symbols::GetSymbol(func_addr).name : "unknown"; | 59 | name = Symbols::HasSymbol(func_addr) ? Symbols::GetSymbol(func_addr).name : "unknown"; |
| 60 | callstack_model->setItem(counter, 3, new QStandardItem(QString("%1_%2").arg(QString::fromStdString(name)) | 60 | callstack_model->setItem(counter, 3, new QStandardItem(QString("%1_%2").arg(QString::fromStdString(name)) |
| 61 | .arg(QString("0x%1").arg(func_addr, 8, 16, QLatin1Char('0'))))); | 61 | .arg(QString("0x%1").arg(func_addr, 8, 16, QLatin1Char('0'))))); |
| @@ -63,4 +63,4 @@ void CallstackWidget::OnCPUStepped() | |||
| 63 | counter++; | 63 | counter++; |
| 64 | } | 64 | } |
| 65 | } | 65 | } |
| 66 | } \ No newline at end of file | 66 | } |
diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.hxx index 9645feb2a..b525aa49e 100644 --- a/src/citra_qt/debugger/registers.hxx +++ b/src/citra_qt/debugger/registers.hxx | |||
| @@ -19,7 +19,7 @@ private: | |||
| 19 | Ui::ARMRegisters cpu_regs_ui; | 19 | Ui::ARMRegisters cpu_regs_ui; |
| 20 | 20 | ||
| 21 | QTreeWidget* tree; | 21 | QTreeWidget* tree; |
| 22 | 22 | ||
| 23 | QTreeWidgetItem* registers; | 23 | QTreeWidgetItem* registers; |
| 24 | QTreeWidgetItem* CSPR; | 24 | QTreeWidgetItem* CSPR; |
| 25 | }; | 25 | }; |