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

Forcing bl to function calls.

This commit is contained in:
Ben Vanik 2013-10-14 21:33:54 -07:00
parent 8294f22d76
commit 963667f65c
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/xenia/cpu/sdb/symbol_database.cc
View File

@ -349,6 +349,7 @@ int SymbolDatabase::AnalyzeFunction(FunctionSymbol* fn) {
if (i.I.LK) { if (i.I.LK) {
XELOGSDB("bl %.8X -> %.8X", addr, target); XELOGSDB("bl %.8X -> %.8X", addr, target);
block->outgoing_type = FunctionBlock::kTargetFunction;
// Queue call target if needed. // Queue call target if needed.
GetOrInsertFunction(target); GetOrInsertFunction(target);
@ -511,14 +512,24 @@ int SymbolDatabase::AnalyzeFunction(FunctionSymbol* fn) {
it != fn->blocks.end(); ++it) { it != fn->blocks.end(); ++it) {
FunctionBlock* block = it->second; FunctionBlock* block = it->second;
// If we have some address try to see what it is.
if (block->outgoing_address) { if (block->outgoing_address) {
if (block->outgoing_address > fn->start_address && // If we have some address try to see what it is.
block->outgoing_address <= fn->end_address) { if (block->outgoing_type == FunctionBlock::kTargetUnknown) {
// Branch into a block in this function. if (block->outgoing_address > fn->start_address &&
// Note that we make branches to the start address act as function block->outgoing_address <= fn->end_address) {
// calls, as they are almost always recursion cases. // Branch into a block in this function.
block->outgoing_type = FunctionBlock::kTargetBlock; // Note that we make branches to the start address act as function
// calls, as they are almost always recursion cases.
block->outgoing_type = FunctionBlock::kTargetBlock;
} else {
// Function call.
block->outgoing_type = FunctionBlock::kTargetFunction;
}
}
// If we were already specified, use that.
switch (block->outgoing_type) {
case FunctionBlock::kTargetBlock:
block->outgoing_block = fn->GetBlock(block->outgoing_address); block->outgoing_block = fn->GetBlock(block->outgoing_address);
if (!block->outgoing_block) { if (!block->outgoing_block) {
// Block target not found - we may need to split. // Block target not found - we may need to split.
@ -528,12 +539,12 @@ int SymbolDatabase::AnalyzeFunction(FunctionSymbol* fn) {
XELOGE("block target not found: %.8X", block->outgoing_address); XELOGE("block target not found: %.8X", block->outgoing_address);
XEASSERTALWAYS(); XEASSERTALWAYS();
} }
} else { break;
// Function call. case FunctionBlock::kTargetFunction:
block->outgoing_type = FunctionBlock::kTargetFunction;
block->outgoing_function = GetFunction(block->outgoing_address); block->outgoing_function = GetFunction(block->outgoing_address);
XEASSERTNOTNULL(block->outgoing_function); XEASSERTNOTNULL(block->outgoing_function);
FunctionSymbol::AddCall(fn, block->outgoing_function); FunctionSymbol::AddCall(fn, block->outgoing_function);
break;
} }
} }
} }