X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=44985fa3aebc0d3fc32f97c0606b3c7ef11154a8;hp=f296048406abd251c0e19447aed4090ecb5a63a1;hb=ddb5900f2e0dbde556fd320960f048965cf4f2c2;hpb=99928ab8d61239d499f5bf45ae9a2b41595350f8

diff --git a/mymemory.cc b/mymemory.cc
index f2960484..44985fa3 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -1,13 +1,17 @@
-#include "mymemory.h"
-#include "snapshot.h"
-#include "snapshotimp.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <dlfcn.h>
 #include <unistd.h>
-#include <cstring>
+#include <string.h>
+#include <new>
+
+#include "mymemory.h"
+#include "snapshot.h"
 #include "common.h"
+
 #define REQUESTS_BEFORE_ALLOC 1024
-size_t allocatedReqs[ REQUESTS_BEFORE_ALLOC ] = { 0 };
+
+size_t allocatedReqs[REQUESTS_BEFORE_ALLOC] = { 0 };
 int nextRequest = 0;
 int howManyFreed = 0;
 #if !USE_MPROTECT_SNAPSHOT
@@ -33,11 +37,8 @@ void *model_calloc(size_t count, size_t size)
 	ptr = callocp(count, size);
 	return ptr;
 #else
-	if (!snapshotrecord) {
-		createSharedMemory();
-	}
-	if (NULL == sStaticSpace)
-		sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+	if (!sStaticSpace)
+		sStaticSpace = create_shared_mspace();
 	return mspace_calloc(sStaticSpace, count, size);
 #endif
 }
@@ -61,11 +62,8 @@ void *model_malloc(size_t size)
 	ptr = mallocp(size);
 	return ptr;
 #else
-	if (!snapshotrecord) {
-		createSharedMemory();
-	}
-	if (NULL == sStaticSpace)
-		sStaticSpace = create_mspace_with_base(( void *)( snapshotrecord->mSharedMemoryBase), SHARED_MEMORY_DEFAULT -sizeof(struct SnapShot), 1);
+	if (!sStaticSpace)
+		sStaticSpace = create_shared_mspace();
 	return mspace_malloc(sStaticSpace, size);
 #endif
 }
@@ -73,19 +71,31 @@ void *model_malloc(size_t size)
 /** @brief Snapshotting malloc, for use by model-checker (not user progs) */
 void * snapshot_malloc(size_t size)
 {
-	return malloc(size);
+	void *tmp = mspace_malloc(model_snapshot_space, size);
+	ASSERT(tmp);
+	return tmp;
 }
 
 /** @brief Snapshotting calloc, for use by model-checker (not user progs) */
 void * snapshot_calloc(size_t count, size_t size)
 {
-	return calloc(count, size);
+	void *tmp = mspace_calloc(model_snapshot_space, count, size);
+	ASSERT(tmp);
+	return tmp;
+}
+
+/** @brief Snapshotting realloc, for use by model-checker (not user progs) */
+void *snapshot_realloc(void *ptr, size_t size)
+{
+	void *tmp = mspace_realloc(model_snapshot_space, ptr, size);
+	ASSERT(tmp);
+	return tmp;
 }
 
 /** @brief Snapshotting free, for use by model-checker (not user progs) */
 void snapshot_free(void *ptr)
 {
-	free(ptr);
+	mspace_free(model_snapshot_space, ptr);
 }
 
 /** Non-snapshotting free for our use. */
@@ -97,7 +107,7 @@ void model_free(void *ptr)
 
 	/* get address of libc free */
 	if (!freep) {
-		freep = ( void  ( * )( void *))dlsym(RTLD_NEXT, "free");
+		freep = (void (*)(void *))dlsym(RTLD_NEXT, "free");
 		if ((error = dlerror()) != NULL) {
 			fputs(error, stderr);
 			exit(EXIT_FAILURE);
@@ -109,9 +119,8 @@ void model_free(void *ptr)
 #endif
 }
 
-/** Bootstrap allocation.  Problem is that the dynamic linker calls
- *  require calloc to work and calloc requires the dynamic linker to
- *	work.  */
+/** Bootstrap allocation. Problem is that the dynamic linker calls require
+ *  calloc to work and calloc requires the dynamic linker to work. */
 
 #define BOOTSTRAPBYTES 4096
 char bootstrapmemory[BOOTSTRAPBYTES];
@@ -123,20 +132,21 @@ void * HandleEarlyAllocationRequest(size_t sz)
 	sz = (sz + 7) & ~7;
 
 	if (sz > (BOOTSTRAPBYTES-offset)) {
-		printf("OUT OF BOOTSTRAP MEMORY\n");
+		model_print("OUT OF BOOTSTRAP MEMORY\n");
 		exit(EXIT_FAILURE);
 	}
 
-	void *pointer= (void *)&bootstrapmemory[offset];
+	void *pointer = (void *)&bootstrapmemory[offset];
 	offset += sz;
 	return pointer;
 }
 
+/** @brief Global mspace reference for the model-checker's snapshotting heap */
+mspace model_snapshot_space = NULL;
+
 #if USE_MPROTECT_SNAPSHOT
 
-/** @brief Global mspace reference for the user's snapshotting heap
- *  @todo use this ONLY for user's allocations, not for internal snapshotting
- *  state */
+/** @brief Global mspace reference for the user's snapshotting heap */
 mspace user_snapshot_space = NULL;
 
 /** Check whether this is bootstrapped memory that we should not free */
@@ -180,7 +190,7 @@ void * calloc(size_t num, size_t size)
 		return tmp;
 	} else {
 		void *tmp = HandleEarlyAllocationRequest(size * num);
-		std::memset(tmp, 0, size * num);
+		memset(tmp, 0, size * num);
 		return tmp;
 	}
 }