common: remove excess semicolon

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index 29fd2ea94a1ebaa57767a3542dd1d78fe454d25d..b273608e12586705d8fe10b54b3709a2bfc6bd93 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -5,6 +5,7 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <cstring>
+#include "common.h"
 #define REQUESTS_BEFORE_ALLOC 1024
 size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
 int nextRequest = 0;
@@ -67,6 +68,24 @@ void *model_malloc(size_t size) {
 #endif
 }
 
+/** @brief Snapshotting malloc, for use by model-checker (not user progs) */
+void * snapshot_malloc(size_t size)
+{
+       return malloc(size);
+}
+
+/** @brief Snapshotting calloc, for use by model-checker (not user progs) */
+void * snapshot_calloc(size_t count, size_t size)
+{
+       return calloc(count, size);
+}
+
+/** @brief Snapshotting free, for use by model-checker (not user progs) */
+void snapshot_free(void *ptr)
+{
+       free(ptr);
+}
+
 void *system_malloc( size_t size ){
        static void *(*mallocp)(size_t size);
        char *error;
@@ -158,7 +177,9 @@ bool DontFree( void * ptr ){
 /** Snapshotting malloc implementation for user programs. */
 void *malloc( size_t size ) {
        if (mySpace) {
-               return mspace_malloc( mySpace, size );
+               void *tmp=mspace_malloc( mySpace, size );
+               ASSERT(tmp);
+               return tmp;
        }       else
                return HandleEarlyAllocationRequest( size );
 }
@@ -171,14 +192,18 @@ void free( void * ptr ){
 
 /** Snapshotting realloc implementation for user programs. */
 void *realloc( void *ptr, size_t size ){
-       return mspace_realloc( mySpace, ptr, size );
+       void *tmp=mspace_realloc( mySpace, ptr, size );
+       ASSERT(tmp);
+       return tmp;
 }
 
 /** Snapshotting calloc implementation for user programs. */
 void * calloc( size_t num, size_t size ){
-       if (mySpace)
-               return mspace_calloc( mySpace, num, size );
-       else {
+       if (mySpace) {
+               void *tmp=mspace_calloc( mySpace, num, size );
+               ASSERT(tmp);
+               return tmp;
+       } else {
                void *tmp=HandleEarlyAllocationRequest( size * num );
                std::memset( tmp, 0, size * num );
                return tmp;