X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mymemory.h;h=88d92dca1dfef0b97111943f8d6f9c7549272c84;hb=HEAD;hp=794c4e50cd1e1198ff6d9d8b86ba373114495e10;hpb=9885ab0975d0b812219321ca14794d0f2ca3802c;p=c11tester.git

diff --git a/mymemory.h b/mymemory.h
index 794c4e50..88d92dca 100644
--- a/mymemory.h
+++ b/mymemory.h
@@ -4,8 +4,8 @@
 
 #ifndef _MY_MEMORY_H
 #define _MY_MEMORY_H
-#include <stdlib.h>
 #include <limits>
+#include <stddef.h>
 
 #include "config.h"
 
@@ -24,7 +24,7 @@
 	void operator delete[](void *p, size_t size) { \
 		model_free(p); \
 	} \
-	void * operator new(size_t size, void *p) { /* placement new */ \
+	void * operator new(size_t size, void *p) {	/* placement new */ \
 		return p; \
 	}
 
@@ -43,19 +43,28 @@
 	void operator delete[](void *p, size_t size) { \
 		snapshot_free(p); \
 	} \
-	void * operator new(size_t size, void *p) { /* placement new */ \
+	void * operator new(size_t size, void *p) {	/* placement new */ \
 		return p; \
 	}
 
 void *model_malloc(size_t size);
 void *model_calloc(size_t count, size_t size);
 void model_free(void *ptr);
+void * model_realloc(void *ptr, size_t size);
 
 void * snapshot_malloc(size_t size);
 void * snapshot_calloc(size_t count, size_t size);
 void * snapshot_realloc(void *ptr, size_t size);
 void snapshot_free(void *ptr);
 
+typedef void * mspace;
+extern mspace sStaticSpace;
+
+void * Thread_malloc(size_t size);
+void Thread_free(void *ptr);
+
+void init_memory_ops();
+
 /** @brief Provides a non-snapshotting allocator for use in STL classes.
  *
  * The code was adapted from a code example from the book The C++
@@ -68,15 +77,15 @@ void snapshot_free(void *ptr);
  */
 template <class T>
 class ModelAlloc {
- public:
+public:
 	// type definitions
-	typedef T        value_type;
+	typedef T value_type;
 	typedef T*       pointer;
 	typedef const T* const_pointer;
 	typedef T&       reference;
 	typedef const T& const_reference;
-	typedef size_t   size_type;
-	typedef size_t   difference_type;
+	typedef size_t size_type;
+	typedef size_t difference_type;
 
 	// rebind allocator to type U
 	template <class U>
@@ -137,14 +146,14 @@ class ModelAlloc {
 /** Return that all specializations of this allocator are interchangeable. */
 template <class T1, class T2>
 bool operator ==(const ModelAlloc<T1>&,
-		const ModelAlloc<T2>&) throw() {
+								 const ModelAlloc<T2>&) throw() {
 	return true;
 }
 
 /** Return that all specializations of this allocator are interchangeable. */
 template <class T1, class T2>
 bool operator!= (const ModelAlloc<T1>&,
-		const ModelAlloc<T2>&) throw() {
+								 const ModelAlloc<T2>&) throw() {
 	return false;
 }
 
@@ -160,15 +169,15 @@ bool operator!= (const ModelAlloc<T1>&,
  */
 template <class T>
 class SnapshotAlloc {
- public:
+public:
 	// type definitions
-	typedef T        value_type;
+	typedef T value_type;
 	typedef T*       pointer;
 	typedef const T* const_pointer;
 	typedef T&       reference;
 	typedef const T& const_reference;
-	typedef size_t   size_type;
-	typedef size_t   difference_type;
+	typedef size_t size_type;
+	typedef size_t difference_type;
 
 	// rebind allocator to type U
 	template <class U>
@@ -229,36 +238,37 @@ class SnapshotAlloc {
 /** Return that all specializations of this allocator are interchangeable. */
 template <class T1, class T2>
 bool operator ==(const SnapshotAlloc<T1>&,
-		const SnapshotAlloc<T2>&) throw() {
+								 const SnapshotAlloc<T2>&) throw() {
 	return true;
 }
 
 /** Return that all specializations of this allocator are interchangeable. */
 template <class T1, class T2>
 bool operator!= (const SnapshotAlloc<T1>&,
-		const SnapshotAlloc<T2>&) throw() {
+								 const SnapshotAlloc<T2>&) throw() {
 	return false;
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-	typedef void * mspace;
-	extern void * mspace_malloc(mspace msp, size_t bytes);
-	extern void mspace_free(mspace msp, void* mem);
-	extern void * mspace_realloc(mspace msp, void* mem, size_t newsize);
-	extern void * mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
-	extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
-	extern mspace create_mspace(size_t capacity, int locked);
-
-#if USE_MPROTECT_SNAPSHOT
-	extern mspace user_snapshot_space;
-#endif
+typedef void * mspace;
+extern void * mspace_malloc(mspace msp, size_t bytes);
+extern void mspace_free(mspace msp, void* mem);
+extern void * mspace_realloc(mspace msp, void* mem, size_t newsize);
+extern void * mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
+extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
+extern mspace create_mspace(size_t capacity, int locked);
+
+extern mspace model_snapshot_space;
 
-	extern mspace model_snapshot_space;
+extern void * (*volatile real_memcpy)(void * dst, const void *src, size_t n);
+extern void * (*volatile real_memmove)(void * dst, const void *src, size_t len);
+extern void (*volatile real_bzero)(void * dst, size_t len);
+extern void * (*volatile real_memset)(void * dst, int c, size_t len);
 
 #ifdef __cplusplus
-};  /* end of extern "C" */
+};	/* end of extern "C" */
 #endif
 
-#endif /* _MY_MEMORY_H */
+#endif	/* _MY_MEMORY_H */