X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.cc;h=95459be561af6b7bab74d50610d470f1005c4464;hp=9fbca0391199ba6e2608bacb065d28a7a826c3c8;hb=31081494669effd19d6b4e502129db6397722f28;hpb=7f9bbee401eb5c04bd0a050c0daf19813e81a783

diff --git a/mymemory.cc b/mymemory.cc
index 9fbca039..95459be5 100644
--- 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;
@@ -100,7 +119,7 @@ void system_free( void * ptr ){
 }
 
 /** Non-snapshotting free for our use. */
-void MYFREE(void *ptr) {
+void model_free(void *ptr) {
 #if USE_MPROTECT_SNAPSHOT
 	static void (*freep)(void *);
 	char *error;
@@ -120,11 +139,12 @@ void MYFREE(void *ptr) {
 }
 
 
-/** This global references the mspace for the snapshotting heap */
+/** @brief Global mspace reference for the snapshotting heap */
 mspace mySpace = NULL;
 
-/** This global references the unaligned memory address that was malloced for the snapshotting heap */
-void * basemySpace = NULL;
+/** @brief Global reference to the unaligned memory address that was malloc'd
+ * for the snapshotting heap */
+void *basemySpace = NULL;
 
 /** Bootstrap allocation.  Problem is that the dynamic linker calls
  *  require calloc to work and calloc requires the dynamic linker to
@@ -155,52 +175,65 @@ bool DontFree( void * ptr ){
 	return (ptr>=(&bootstrapmemory[0])&&ptr<(&bootstrapmemory[BOOTSTRAPBYTES]));
 }
 
-/** Snapshotting malloc implementation for user programs. */
-void *malloc( size_t size ) {
-	if (mySpace)
-		return mspace_malloc( mySpace, size );
-	else
+/** @brief Snapshotting malloc implementation for user programs */
+void *malloc( size_t size )
+{
+	if (mySpace) {
+		void *tmp=mspace_malloc( mySpace, size );
+		ASSERT(tmp);
+		return tmp;
+	} else
 		return HandleEarlyAllocationRequest( size );
 }
 
-/** Snapshotting free implementation for user programs. */
+/** @brief Snapshotting free implementation for user programs */
 void free( void * ptr ){
-	if( DontFree( ptr ) ) return;
-	mspace_free( mySpace, ptr );
+	if (!DontFree(ptr))
+		mspace_free(mySpace, ptr);
 }
 
-/** Snapshotting realloc implementation for user programs. */
-void *realloc( void *ptr, size_t size ){
-	return mspace_realloc( mySpace, ptr, size );
+/** @brief Snapshotting realloc implementation for user programs */
+void *realloc( void *ptr, size_t 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 {
+/** @brief Snapshotting calloc implementation for user programs */
+void * calloc( size_t num, size_t size )
+{
+	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;
 	}
 }
 
-/** Snapshotting new operator for user programs. */
-void * operator new(size_t size) throw(std::bad_alloc) {
+/** @brief Snapshotting new operator for user programs */
+void * operator new(size_t size) throw(std::bad_alloc)
+{
 	return malloc(size);
 }
 
-/** Snapshotting delete operator for user programs. */
-void operator delete(void *p) throw() {
+/** @brief Snapshotting delete operator for user programs */
+void operator delete(void *p) throw()
+{
 	free(p);
 }
 
-/** Snapshotting new[] operator for user programs. */
-void * operator new[](size_t size) throw(std::bad_alloc) {
+/** @brief Snapshotting new[] operator for user programs */
+void * operator new[](size_t size) throw(std::bad_alloc)
+{
 	return malloc(size);
 }
 
-/** Snapshotting delete[] operator for user programs. */
-void operator delete[](void *p, size_t size) {
+/** @brief Snapshotting delete[] operator for user programs */
+void operator delete[](void *p, size_t size)
+{
 	free(p);
 }