eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 4 Projects Releases 2 Packages Wiki Activity Actions 2

Merge branch 'master' into threading

Browse source
This commit is contained in:
bunnei 2014-05-17 13:35:20 -04:00
commit 3fac6dc39e
8 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/arm/interpreter/arm_interpreter.cpp
View file

@ -93,16 +93,11 @@ u64 ARM_Interpreter::GetTicks() const {
return ARMul_Time(m_state);
}
/// Execture next instruction
void ARM_Interpreter::ExecuteInstruction() {
m_state->step++;
m_state->cycle++;
m_state->EndCondition = 0;
m_state->stop_simulator = 0;
m_state->NextInstr = RESUME;
m_state->last_pc = m_state->Reg[15];
m_state->Reg[15] = ARMul_DoInstr(m_state);
m_state->Cpsr = ((m_state->Cpsr & 0x0fffffdf) | (m_state->NFlag << 31) | (m_state->ZFlag << 30) |
(m_state->CFlag << 29) | (m_state->VFlag << 28) | (m_state->TFlag << 5));
m_state->NextInstr |= PRIMEPIPE; // Flush pipe
/**
* Executes the given number of instructions
* @param num_instructions Number of instructions to executes
*/
void ARM_Interpreter::ExecuteInstructions(int num_instructions) {
m_state->NumInstrsToExecute = num_instructions;
ARMul_Emulate32(m_state);
}