Forcing bl to function calls.
This commit is contained in:
parent
8294f22d76
commit
963667f65c
|
@ -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 we have some address try to see what it is.
|
||||||
|
if (block->outgoing_type == FunctionBlock::kTargetUnknown) {
|
||||||
if (block->outgoing_address > fn->start_address &&
|
if (block->outgoing_address > fn->start_address &&
|
||||||
block->outgoing_address <= fn->end_address) {
|
block->outgoing_address <= fn->end_address) {
|
||||||
// Branch into a block in this function.
|
// Branch into a block in this function.
|
||||||
// Note that we make branches to the start address act as function
|
// Note that we make branches to the start address act as function
|
||||||
// calls, as they are almost always recursion cases.
|
// calls, as they are almost always recursion cases.
|
||||||
block->outgoing_type = FunctionBlock::kTargetBlock;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue