diff options
| author | Cristian Cadar <cristic@cs.stanford.edu> | 2011-12-11 22:08:55 +0000 |
|---|---|---|
| committer | Cristian Cadar <cristic@cs.stanford.edu> | 2011-12-11 22:08:55 +0000 |
| commit | e856cc0ecdbfa7f0f07c459af2a2f3ed5a8f7515 (patch) | |
| tree | da34a7545b605f811c8ec202a65ecea2b6bcf4d6 | |
| parent | 719ddd5298b423b1c3037d2351cb35e42f89522d (diff) | |
| download | klee-e856cc0ecdbfa7f0f07c459af2a2f3ed5a8f7515.tar.gz | |
Patch by Ben Gras fixing a few minor issues: adds missing includes,
fixes the ntohs prototype in klee-libc, and removes some unused code.
git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@146352 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Core/Executor.cpp | 8 | ||||
| -rw-r--r-- | lib/Solver/Solver.cpp | 1 | ||||
| -rw-r--r-- | runtime/klee-libc/htonl.c | 2 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 6abd0234..64f67b4c 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -258,9 +258,6 @@ namespace { } -static void *theMMap = 0; -static unsigned theMMapSize = 0; - namespace klee { RNG theRNG; } @@ -3269,11 +3266,6 @@ void Executor::runFunctionAsMain(Function *f, if (statsTracker) statsTracker->done(); - - if (theMMap) { - munmap(theMMap, theMMapSize); - theMMap = 0; - } } unsigned Executor::getPathStreamID(const ExecutionState &state) { diff --git a/lib/Solver/Solver.cpp b/lib/Solver/Solver.cpp index 4059a82b..9f0d89af 100644 --- a/lib/Solver/Solver.cpp +++ b/lib/Solver/Solver.cpp @@ -29,6 +29,7 @@ #include <vector> #include <errno.h> +#include <unistd.h> #include <signal.h> #include <sys/wait.h> #include <sys/ipc.h> diff --git a/runtime/klee-libc/htonl.c b/runtime/klee-libc/htonl.c index cec2d0f5..521ef5d6 100644 --- a/runtime/klee-libc/htonl.c +++ b/runtime/klee-libc/htonl.c @@ -41,7 +41,7 @@ uint32_t htonl(uint32_t v) { #endif -uint16_t ntohs(uint32_t v) { +uint16_t ntohs(uint16_t v) { return htons(v); } uint32_t ntohl(uint32_t v) { diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index a5b8d046..82ced957 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -51,6 +51,7 @@ #include <fstream> #include <cerrno> #include <dirent.h> +#include <unistd.h> #include <errno.h> #include <sys/stat.h> #include <sys/wait.h> |