diff options
author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2023-03-16 15:45:01 +0000 |
---|---|---|
committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2023-05-26 21:03:44 +0100 |
commit | d3db14ce3b0a3b4902d74a517c08fd19e8469e9e (patch) | |
tree | 3bcb6d5aab007fc18decd96e6243377167e5351a | |
parent | 6d8c05c5349e7329e6f261317be6d43148bb20ed (diff) | |
download | klee-d3db14ce3b0a3b4902d74a517c08fd19e8469e9e.tar.gz |
Some basic refactoring and pass through comments. In particular, it brings some related code together (deadline with EntryPoint and ReplayPathFile respectively) which was unnecessarily separated.
-rw-r--r-- | tools/klee/main.cpp | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 8fcfed0c..a12c5603 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -1027,9 +1027,6 @@ static void createLibCWrapper(std::vector<std::unique_ptr<llvm::Module>> &modules, llvm::StringRef intendedFunction, llvm::StringRef libcMainFunction) { - // XXX we need to rearchitect so this can also be used with - // programs externally linked with libc implementation. - // We now need to swap things so that libcMainFunction is the entry // point, in such a way that the arguments are passed to // libcMainFunction correctly. We do this by renaming the user main @@ -1072,13 +1069,13 @@ createLibCWrapper(std::vector<std::unique_ptr<llvm::Module>> &modules, BasicBlock *bb = BasicBlock::Create(ctx, "entry", stub); llvm::IRBuilder<> Builder(bb); - std::vector<llvm::Value*> args; + std::vector<llvm::Value *> args; args.push_back(llvm::ConstantExpr::getBitCast( cast<llvm::Constant>(inModuleReference.getCallee()), ft->getParamType(0))); args.push_back(&*(stub->arg_begin())); // argc auto arg_it = stub->arg_begin(); - args.push_back(&*(++arg_it)); // argv + args.push_back(&*(++arg_it)); // argv args.push_back(Constant::getNullValue(ft->getParamType(3))); // app_init args.push_back(Constant::getNullValue(ft->getParamType(4))); // app_fini args.push_back(Constant::getNullValue(ft->getParamType(5))); // rtld_fini @@ -1134,10 +1131,6 @@ int main(int argc, char **argv, char **envp) { parseArguments(argc, argv); sys::PrintStackTraceOnErrorSignal(argv[0]); - if (EntryPoint.empty()) { - klee_error("entry-point cannot be empty"); - } - if (Watchdog) { if (MaxTime.empty()) { klee_error("--watchdog used without --max-time"); @@ -1155,23 +1148,22 @@ int main(int argc, char **argv, char **envp) { auto nextStep = time::getWallTime() + maxTime + (maxTime / 10); int level = 0; - // Simple stupid code... while (1) { sleep(1); int status, res = waitpid(pid, &status, WNOHANG); if (res < 0) { - if (errno==ECHILD) { // No child, no need to watch but - // return error since we didn't catch - // the exit. + if (errno == ECHILD) { + // No child, no need to watch but return error since + // we didn't catch the exit. klee_warning("KLEE: watchdog exiting (no child)\n"); return 1; - } else if (errno!=EINTR) { + } else if (errno != EINTR) { perror("watchdog waitpid"); exit(1); } - } else if (res==pid && WIFEXITED(status)) { + } else if (res == pid && WIFEXITED(status)) { return WEXITSTATUS(status); } else { auto time = time::getWallTime(); @@ -1191,7 +1183,7 @@ int main(int argc, char **argv, char **envp) { klee_warning( "KLEE: WATCHDOG: kill(9)ing child (I tried to be nice)\n"); kill(pid, SIGKILL); - return 1; // what more can we do + return 1; // what more can we do? } // Ideally this triggers a dump, which may take a while, @@ -1264,14 +1256,19 @@ int main(int argc, char **argv, char **envp) { } // Get the entry point function + if (EntryPoint.empty()) + klee_error("entry-point cannot be empty"); + for (auto &module : loadedModules) { entryFn = module->getFunction(EntryPoint); if (entryFn) break; } + if (!entryFn) klee_error("Entry function '%s' not found in module.", EntryPoint.c_str()); + if (WithPOSIXRuntime) { SmallString<128> Path(Opts.LibraryDir); llvm::sys::path::append(Path, "libkleeRuntimePOSIX" + opt_suffix + ".bca"); @@ -1393,12 +1390,6 @@ int main(int argc, char **argv, char **envp) { pArgv[i] = pArg; } - std::vector<bool> replayPath; - - if (ReplayPathFile != "") { - KleeHandler::loadPathFile(ReplayPathFile, replayPath); - } - Interpreter::InterpreterOptions IOpts; IOpts.MakeConcreteSymbolic = MakeConcreteSymbolic; KleeHandler *handler = new KleeHandler(pArgc, pArgv); @@ -1407,9 +1398,8 @@ int main(int argc, char **argv, char **envp) { assert(interpreter); handler->setInterpreter(interpreter); - for (int i=0; i<argc; i++) { - handler->getInfoStream() << argv[i] << (i+1<argc ? " ":"\n"); - } + for (int i = 0; i < argc; i++) + handler->getInfoStream() << argv[i] << (i + 1 < argc ? " " : "\n"); handler->getInfoStream() << "PID: " << getpid() << "\n"; // Get the desired main function. klee_main initializes uClibc @@ -1417,17 +1407,17 @@ int main(int argc, char **argv, char **envp) { auto finalModule = interpreter->setModule(loadedModules, Opts); entryFn = finalModule->getFunction(EntryPoint); - if (!entryFn) { + if (!entryFn) klee_error("Entry function '%s' not found in module.", EntryPoint.c_str()); - } externalsAndGlobalsCheck(finalModule); - if (ReplayPathFile != "") { + std::vector<bool> replayPath; + if (!ReplayPathFile.empty()) { + KleeHandler::loadPathFile(ReplayPathFile, replayPath); interpreter->setReplayPath(&replayPath); } - auto startTime = std::time(nullptr); { // output clock info and start time std::stringstream startInfo; |