Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Invalid func fix pt2 #409

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Invalid func fix pt2 #409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4034b84
return decl instead of nullptr
Ninja3047 Feb 29, 2024
3f8ca7b
return error/null instead of decl
Ninja3047 Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/Lifters/FunctionLifter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,6 @@ llvm::Function *FunctionLifter::LiftFunction(const FunctionDecl &decl) {
return nullptr;
}

// Function has no valid instructions.
auto &cfg = decl.cfg;
if (cfg.find(decl.entry_uid) == cfg.end()) {
LOG(ERROR) << "Function missing entry block " << std::hex << decl.address;
return nullptr;
}

// This is our higher-level function, i.e. it presents itself more like
// a function compiled from C/C++, rather than being a three-argument Remill
// function. In this function, we will stack-allocate a `State` structure,
Expand All @@ -440,6 +433,14 @@ llvm::Function *FunctionLifter::LiftFunction(const FunctionDecl &decl) {
return native_func;
}

// Function has no valid instructions.
auto &cfg = decl.cfg;
if (cfg.find(decl.entry_uid) == cfg.end()) {
LOG(ERROR) << "Function missing entry block " << std::hex << decl.address;
return nullptr;
}


// Every lifted function starts as a clone of __remill_basic_block. That
// prototype has multiple arguments (memory pointer, state pointer, program
// counter). This extracts the state pointer.
Expand Down
Loading