ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XThread - Fix unconditional conditional branch check

This commit is contained in:
Dr. Chat 2015-12-07 13:22:18 -06:00 committed by Ben Vanik
parent 4eff2d8420
commit d2d97fe58f
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/xenia/kernel/xthread.cc
View File

@ -822,12 +822,21 @@ uint32_t XThread::StepIntoBranch(uint32_t pc) {
bool conditional = true; bool conditional = true;
if (i.type->opcode = 0x40000000) { if (i.type->opcode = 0x40000000) {
// bx // bx
if (cpu::frontend::select_bits(i.B.BO, 4, 4)) { if (cpu::frontend::select_bits(i.B.BO, 4, 4) &&
cpu::frontend::select_bits(i.B.BO, 2, 2)) {
conditional = false; conditional = false;
} }
} else { } else if (i.type->opcode == 0x4C000420) {
// bctrx/blrx // bctrx
if (cpu::frontend::select_bits(i.XL.BO, 4, 4)) { if (cpu::frontend::select_bits(i.XL.BO, 2, 2)) {
// ignore cond
conditional = false;
}
} else if (i.type->opcode == 0x4C000020) {
// blrx
if (cpu::frontend::select_bits(i.B.BO, 4, 4) &&
cpu::frontend::select_bits(i.B.BO, 2, 2)) {
// ignore ctr
conditional = false; conditional = false;
} }
} }
@ -902,7 +911,13 @@ uint32_t XThread::StepToSafePoint() {
// Check if we're in guest code or host code. // Check if we're in guest code or host code.
uint32_t pc = 0; uint32_t pc = 0;
if (cpu_frames[0].type == cpu::StackFrame::Type::kGuest) { if (cpu_frames[0].type == cpu::StackFrame::Type::kGuest) {
pc = cpu_frames[0].guest_pc; auto& frame = cpu_frames[0];
if (!frame.guest_pc) {
// Lame.
frame = cpu_frames[1];
}
pc = frame.guest_pc;
// We're in guest code. // We're in guest code.
// First: Find a synchronizing instruction and go to it. // First: Find a synchronizing instruction and go to it.