citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

More fixes as per PR feedback.

This commit is contained in:
Jarek Syrylak 2018-08-16 19:44:31 +01:00
parent a6ecb3c913
commit 039fb95f80
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/arm/dyncom/arm_dyncom.cpp
View File

@ -147,7 +147,7 @@ void ARM_DynCom::ExecuteInstructions(u64 num_instructions) {
state->NumInstrsToExecute = num_instructions; state->NumInstrsToExecute = num_instructions;
unsigned ticks_executed = InterpreterMainLoop(state.get()); unsigned ticks_executed = InterpreterMainLoop(state.get());
CoreTiming::AddTicks(ticks_executed); CoreTiming::AddTicks(ticks_executed);
state.get()->ServeBreak(); state->ServeBreak();
} }
std::unique_ptr<ARM_Interface::ThreadContext> ARM_DynCom::NewContext() const { std::unique_ptr<ARM_Interface::ThreadContext> ARM_DynCom::NewContext() const {

24
src/core/arm/skyeye_common/armstate.cpp
View File

@ -597,16 +597,18 @@ void ARMul_State::WriteCP15Register(u32 value, u32 crn, u32 opcode_1, u32 crm, u
} }
void ARMul_State::ServeBreak() { void ARMul_State::ServeBreak() {
if (GDBStub::IsServerEnabled()) { if (!GDBStub::IsServerEnabled()) {
if (last_bkpt_hit) { return;
Reg[15] = last_bkpt.address; }
}
Kernel::Thread* thread = Kernel::GetCurrentThread(); if (last_bkpt_hit) {
Core::CPU().SaveContext(thread->context); Reg[15] = last_bkpt.address;
if (last_bkpt_hit || GDBStub::GetCpuStepFlag()) { }
last_bkpt_hit = false; Kernel::Thread* thread = Kernel::GetCurrentThread();
GDBStub::Break(); Core::CPU().SaveContext(thread->context);
GDBStub::SendTrap(thread, 5); if (last_bkpt_hit || GDBStub::GetCpuStepFlag()) {
} last_bkpt_hit = false;
GDBStub::Break();
GDBStub::SendTrap(thread, 5);
} }
} }

4
src/core/gdbstub/gdbstub.cpp
View File

@ -215,8 +215,8 @@ static void FpuWrite(std::size_t id, u64 val, Kernel::Thread* thread = nullptr)
} }
if (id >= D0_REGISTER && id < FPSCR_REGISTER) { if (id >= D0_REGISTER && id < FPSCR_REGISTER) {
thread->context->SetFpuRegister(2 * (id - D0_REGISTER), (u32)val); thread->context->SetFpuRegister(2 * (id - D0_REGISTER), static_cast<u32>(val));
thread->context->SetFpuRegister(2 * (id - D0_REGISTER) + 1, val >> 32); thread->context->SetFpuRegister(2 * (id - D0_REGISTER) + 1, static_cast<u32>(val >> 32));
} else if (id == FPSCR_REGISTER) { } else if (id == FPSCR_REGISTER) {
return thread->context->SetFpscr(static_cast<u32>(val)); return thread->context->SetFpscr(static_cast<u32>(val));
} }