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

Fix for accidentally including rest fns as branches.

This commit is contained in:
Ben Vanik 2013-12-25 23:15:57 -08:00
parent 60cc910d19
commit 1b533d8c2b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/alloy/frontend/ppc/ppc_scanner.cc
View File

@ -113,6 +113,8 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
} else if (i.code == 0x4E800420) { } else if (i.code == 0x4E800420) {
// bctr -- unconditional branch to CTR. // bctr -- unconditional branch to CTR.
// This is generally a jump to a function pointer (non-return). // This is generally a jump to a function pointer (non-return).
// This is almost always a jump table.
// TODO(benvanik): decode jump tables.
if (furthest_target > address) { if (furthest_target > address) {
// Remaining targets within function, not end. // Remaining targets within function, not end.
XELOGSDB("ignoring bctr %.8X (branch to %.8X)", address, XELOGSDB("ignoring bctr %.8X (branch to %.8X)", address,
@ -196,7 +198,7 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
} }
*/ */
if (!ends_fn) { if (!ends_fn && !IsRestGprLr(target)) {
furthest_target = MAX(furthest_target, target); furthest_target = MAX(furthest_target, target);
// TODO(benvanik): perhaps queue up for a speculative check? I think // TODO(benvanik): perhaps queue up for a speculative check? I think
@ -222,7 +224,9 @@ int PPCScanner::FindExtents(FunctionInfo* symbol_info) {
// TODO(benvanik): GetOrInsertFunction? it's likely a BB // TODO(benvanik): GetOrInsertFunction? it's likely a BB
furthest_target = MAX(furthest_target, target); if (!IsRestGprLr(target)) {
furthest_target = MAX(furthest_target, target);
}
} }
ends_block = true; ends_block = true;
} else if (i.type->opcode == 0x4C000020) { } else if (i.type->opcode == 0x4C000020) {
@ -317,6 +321,8 @@ std::vector<BlockInfo> PPCScanner::FindBlocks(FunctionInfo* symbol_info) {
ends_block = true; ends_block = true;
} else if (i.code == 0x4E800420) { } else if (i.code == 0x4E800420) {
// bctr -- unconditional branch to CTR. // bctr -- unconditional branch to CTR.
// This is almost always a jump table.
// TODO(benvanik): decode jump tables.
ends_block = true; ends_block = true;
} else if (i.type->opcode == 0x48000000) { } else if (i.type->opcode == 0x48000000) {
// b/ba/bl/bla // b/ba/bl/bla