OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 22:20:06 +00:00
Code Issues Projects Releases Wiki Activity

Remove Core::GetState(). Use new ARM_Interface instead.

Browse Source
This commit is contained in:
Mathieu Vaillancourt 2014-04-04 23:24:09 -04:00
parent f1fd84aa0f
commit 9b6041d818
4 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/src/bootmanager.cpp
View File

@ -25,8 +25,6 @@ void EmuThread::SetFilename(const char* filename)
void EmuThread::run() void EmuThread::run()
{ {
Core::Start(); //autoboot for now
while (true) while (true)
{ {
for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) for (int tight_loop = 0; tight_loop < 10000; ++tight_loop)

41
src/citra_qt/src/cpu_regs.cpp
View File

@ -1,7 +1,7 @@
#include "cpu_regs.hxx" #include "cpu_regs.hxx"
#include "core.h" #include "core.h"
#include "arm/armdefs.h" #include "arm/interpreter/armdefs.h"
GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent) GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
{ {
@ -39,24 +39,25 @@ GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
void GARM11RegsView::OnCPUStepped() void GARM11RegsView::OnCPUStepped()
{ {
ARMul_State* state = Core::GetState(); ARM_Interface* app_core = Core::g_app_core;
for (int i = 0; i < 16; ++i)
registers->child(i)->setText(1, QString("0x%1").arg(state->Reg[i], 8, 16, QLatin1Char('0')));
CSPR->setText(1, QString("0x%1").arg(state->Cpsr, 8, 16, QLatin1Char('0'))); for (int i = 0; i < 16; ++i)
CSPR->child(0)->setText(1, QString("b%1").arg(state->Cpsr & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode registers->child(i)->setText(1, QString("0x%1").arg(app_core->Reg(i), 8, 16, QLatin1Char('0')));
CSPR->child(1)->setText(1, QString("%1").arg((state->Cpsr >> 5) & 0x1)); // T - State
CSPR->child(2)->setText(1, QString("%1").arg((state->Cpsr >> 6) & 0x1)); // F - FIQ disable CSPR->setText(1, QString("0x%1").arg(app_core->CPSR(), 8, 16, QLatin1Char('0')));
CSPR->child(3)->setText(1, QString("%1").arg((state->Cpsr >> 7) & 0x1)); // I - IRQ disable CSPR->child(0)->setText(1, QString("b%1").arg(app_core->CPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
CSPR->child(4)->setText(1, QString("%1").arg((state->Cpsr >> 8) & 0x1)); // A - Imprecise abort CSPR->child(1)->setText(1, QString("%1").arg((app_core->CPSR() >> 5) & 0x1)); // T - State
CSPR->child(5)->setText(1, QString("%1").arg((state->Cpsr >> 9) & 0x1)); // E - Data endianess CSPR->child(2)->setText(1, QString("%1").arg((app_core->CPSR() >> 6) & 0x1)); // F - FIQ disable
CSPR->child(6)->setText(1, QString("%1").arg((state->Cpsr >> 10) & 0x3F)); // IT - If-Then state (DNM) CSPR->child(3)->setText(1, QString("%1").arg((app_core->CPSR() >> 7) & 0x1)); // I - IRQ disable
CSPR->child(7)->setText(1, QString("%1").arg((state->Cpsr >> 16) & 0xF)); // GE - Greater-than-or-Equal CSPR->child(4)->setText(1, QString("%1").arg((app_core->CPSR() >> 8) & 0x1)); // A - Imprecise abort
CSPR->child(8)->setText(1, QString("%1").arg((state->Cpsr >> 20) & 0xF)); // DNM - Do not modify CSPR->child(5)->setText(1, QString("%1").arg((app_core->CPSR() >> 9) & 0x1)); // E - Data endianess
CSPR->child(9)->setText(1, QString("%1").arg((state->Cpsr >> 24) & 0x1)); // J - Java state CSPR->child(6)->setText(1, QString("%1").arg((app_core->CPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM)
CSPR->child(10)->setText(1, QString("%1").arg((state->Cpsr >> 27) & 0x1)); // Q - Sticky overflow CSPR->child(7)->setText(1, QString("%1").arg((app_core->CPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal
CSPR->child(11)->setText(1, QString("%1").arg((state->Cpsr >> 28) & 0x1)); // V - Overflow CSPR->child(8)->setText(1, QString("%1").arg((app_core->CPSR() >> 20) & 0xF)); // DNM - Do not modify
CSPR->child(12)->setText(1, QString("%1").arg((state->Cpsr >> 29) & 0x1)); // C - Carry/Borrow/Extend CSPR->child(9)->setText(1, QString("%1").arg((app_core->CPSR() >> 24) & 0x1)); // J - Java state
CSPR->child(13)->setText(1, QString("%1").arg((state->Cpsr >> 30) & 0x1)); // Z - Zero CSPR->child(10)->setText(1, QString("%1").arg((app_core->CPSR() >> 27) & 0x1)); // Q - Sticky overflow
CSPR->child(14)->setText(1, QString("%1").arg((state->Cpsr >> 31) & 0x1)); // N - Negative/Less than CSPR->child(11)->setText(1, QString("%1").arg((app_core->CPSR() >> 28) & 0x1)); // V - Overflow
CSPR->child(12)->setText(1, QString("%1").arg((app_core->CPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend
CSPR->child(13)->setText(1, QString("%1").arg((app_core->CPSR() >> 30) & 0x1)); // Z - Zero
CSPR->child(14)->setText(1, QString("%1").arg((app_core->CPSR() >> 31) & 0x1)); // N - Negative/Less than
} }

9
src/citra_qt/src/disasm.cpp
View File

@ -10,7 +10,7 @@
#include "core.h" #include "core.h"
#include "break_points.h" #include "break_points.h"
#include "arm/armdefs.h" #include "arm/interpreter/armdefs.h"
#include "arm/disassembler/arm_disasm.h" #include "arm/disassembler/arm_disasm.h"
GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread) GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread)
@ -41,10 +41,9 @@ GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(p
void GDisAsmView::Init() void GDisAsmView::Init()
{ {
ARMul_State* state = Core::GetState(); ARM_Disasm* disasm = new ARM_Disasm();
Arm* disasm = new Arm();
base_addr = state->pc; base_addr = Core::g_app_core->PC();
unsigned int curInstAddr = base_addr; unsigned int curInstAddr = base_addr;
char result[255]; char result[255];
@ -113,7 +112,7 @@ void GDisAsmView::OnToggleStartStop()
void GDisAsmView::OnCPUStepped() void GDisAsmView::OnCPUStepped()
{ {
ARMword next_instr = Core::GetState()->pc; ARMword next_instr = Core::g_app_core->PC();
if (breakpoints->IsAddressBreakPoint(next_instr)) if (breakpoints->IsAddressBreakPoint(next_instr))
{ {

2
src/core/src/core.h
View File

@ -55,8 +55,6 @@ void Stop();
/// Initialize the core /// Initialize the core
int Init(); int Init();
ARMul_State* GetState();
} // namespace } // namespace
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////