X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mymemory.h;h=88d92dca1dfef0b97111943f8d6f9c7549272c84;hb=HEAD;hp=567ff936e97d32d0d7c62074b01541234a898531;hpb=651e9182baf50ef1e235ad7a587730b989bb44c7;p=c11tester.git diff --git a/mymemory.h b/mymemory.h index 567ff936..88d92dca 100644 --- a/mymemory.h +++ b/mymemory.h @@ -57,9 +57,14 @@ 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++ @@ -255,12 +260,13 @@ 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 - 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" */ #endif