[klee] r146352 - in /klee/trunk: lib/Core/Executor.cpp lib/Solver/Solver.cpp runtime/klee-libc/htonl.c tools/klee/main.cpp

[Cristian Cadar]

Author: cristic
Date: Sun Dec 11 16:08:55 2011
New Revision: 146352

URL: http://llvm.org/viewvc/llvm-project?rev=146352&view=rev
Log:
Patch by Ben Gras fixing a few minor issues: adds missing includes,
fixes the ntohs prototype in klee-libc, and removes some unused code.

Modified:
    klee/trunk/lib/Core/Executor.cpp
    klee/trunk/lib/Solver/Solver.cpp
    klee/trunk/runtime/klee-libc/htonl.c
    klee/trunk/tools/klee/main.cpp

Modified: klee/trunk/lib/Core/Executor.cpp
URL: http://llvm.org/viewvc/llvm-project/klee/trunk/lib/Core/Executor.cpp?rev=146352&r1=146351&r2=146352&view=diff
==============================================================================
--- klee/trunk/lib/Core/Executor.cpp (original)
+++ klee/trunk/lib/Core/Executor.cpp Sun Dec 11 16:08:55 2011
@@ -258,9 +258,6 @@
 }
 
 
-static void *theMMap = 0;
-static unsigned theMMapSize = 0;
-
 namespace klee {
   RNG theRNG;
 }
@@ -3269,11 +3266,6 @@
 
   if (statsTracker)
     statsTracker->done();
-
-  if (theMMap) {
-    munmap(theMMap, theMMapSize);
-    theMMap = 0;
-  }
 }
 
 unsigned Executor::getPathStreamID(const ExecutionState &state) {

Modified: klee/trunk/lib/Solver/Solver.cpp
URL: http://llvm.org/viewvc/llvm-project/klee/trunk/lib/Solver/Solver.cpp?rev=146352&r1=146351&r2=146352&view=diff
==============================================================================
--- klee/trunk/lib/Solver/Solver.cpp (original)
+++ klee/trunk/lib/Solver/Solver.cpp Sun Dec 11 16:08:55 2011
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <errno.h>
+#include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>

Modified: klee/trunk/runtime/klee-libc/htonl.c
URL: http://llvm.org/viewvc/llvm-project/klee/trunk/runtime/klee-libc/htonl.c?rev=146352&r1=146351&r2=146352&view=diff
==============================================================================
--- klee/trunk/runtime/klee-libc/htonl.c (original)
+++ klee/trunk/runtime/klee-libc/htonl.c Sun Dec 11 16:08:55 2011
@@ -41,7 +41,7 @@
 
 #endif
 
-uint16_t ntohs(uint32_t v) {
+uint16_t ntohs(uint16_t v) {
   return htons(v);
 }
 uint32_t ntohl(uint32_t v) {

Modified: klee/trunk/tools/klee/main.cpp
URL: http://llvm.org/viewvc/llvm-project/klee/trunk/tools/klee/main.cpp?rev=146352&r1=146351&r2=146352&view=diff
==============================================================================
--- klee/trunk/tools/klee/main.cpp (original)
+++ klee/trunk/tools/klee/main.cpp Sun Dec 11 16:08:55 2011
@@ -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>