admin/revng-revng
1
0
Fork 0
mirror of https://github.com/revng/revng synced 2026-06-21 14:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

CallEdge: only indirect calls have a prototype

Browse Source
This commit is contained in:
Alessandro Di Federico
2021-10-19 09:05:45 +02:00
parent a1a2d0bed8
commit 03998066f0
4 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/StackAnalysis/StackAnalysis.cpp
+17 -22
View File
@@ -289,14 +289,14 @@ void commitToModel(GeneratedCodeBasicInfo &GCBI,
break;
case BranchType::HandledCall:
if (SymbolName.size() > 0)
EdgeType = FET::IndirectCall;
else
EdgeType = FET::FunctionCall;
EdgeType = FET::FunctionCall;
break;
case BranchType::IndirectCall:
EdgeType = FET::IndirectCall;
if (SymbolName.size() == 0)
EdgeType = FET::IndirectCall;
else
EdgeType = FET::FunctionCall;
break;
case BranchType::Return:
@@ -343,24 +343,20 @@ void commitToModel(GeneratedCodeBasicInfo &GCBI,
const auto &Result = SuccessorsInserter.insert(TempEdge);
auto *Edge = llvm::cast<CallEdge>(Result.get());
if (Destination.isValid()) {
if (SymbolName.size() > 0) {
// It's a dynamic function call
revng_assert(EdgeType == model::FunctionEdgeType::FunctionCall);
Edge->Destination = MetaAddress::invalid();
Edge->DynamicFunction = SymbolName.str();
if (SymbolName.size() > 0) {
revng_assert(EdgeType == model::FunctionEdgeType::IndirectCall);
Edge->Destination = MetaAddress::invalid();
Edge->DynamicFunction = SymbolName.str();
Edge->Prototype = TheBinary.ImportedDynamicFunctions
.at(Edge->DynamicFunction)
.Prototype;
} else {
revng_assert(EdgeType == model::FunctionEdgeType::FunctionCall);
// If it's a direct call, inherit the prototype from the callee
model::Function &Callee = TheBinary.Functions.at(Destination);
Edge->Prototype = Callee.Prototype;
}
revng_assert(Edge->Prototype.isValid());
// The prototype is implicitly the one of the callee
revng_assert(not Edge->Prototype.isValid());
} else if (Destination.isValid()) {
// It's a simple direct function call
revng_assert(EdgeType == model::FunctionEdgeType::FunctionCall);
// The prototype is implicitly the one of the callee
revng_assert(not Edge->Prototype.isValid());
} else {
// It's an indirect call: forge a new prototype
auto NewType = makeType<RawFunctionType>();
@@ -408,7 +404,6 @@ void commitToModel(GeneratedCodeBasicInfo &GCBI,
Edge->Prototype = TheBinary.recordNewType(std::move(NewType));
}
} else {
// Handle other successors
llvm::BasicBlock *Successor = BB->getSingleSuccessor();