Remove unused functions and optimize data race checking for mem* operations

[c11tester.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index e82f8d2ef997f31f0d2d38871c74dd6cf17a8cbd..3d5168f95571abb4f36afc848a4be1073c7abda8 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -137,42 +137,64 @@ void init_memory_ops()
 }
 
 void * memcpy(void * dst, const void * src, size_t n) {
-       if (false && model && !inside_model) {
+       if (model && !inside_model) {
+               //model_print("memcpy size: %d\n", n);
                thread_id_t tid = thread_current_id();
-               if (((uintptr_t)src&7) == 0 && ((uintptr_t)dst&7) == 0 && (n&7) == 0) {
-                       for (uint i = 0; i < (n>>3); i++) {
-                               raceCheckRead64(tid, (void *)(((char *)src) + i));
-                               ((volatile uint64_t *)dst)[i] = ((uint64_t *)src)[i];
-                               raceCheckWrite64(tid, (void *)(((char *)src) + i));
-                       }
-               } else if (((uintptr_t)src&3) == 0 && ((uintptr_t)dst&3) == 0 && (n&3) == 0) {
-                       for (uint i = 0; i < (n>>2); i++) {
-                               raceCheckRead32(tid, (void *)(((char *)src) + i));
-                               ((volatile uint32_t *)dst)[i] = ((uint32_t *)src)[i];
-                               raceCheckWrite32(tid, (void *)(((char *)src) + i));
-                       }
-               } else if (((uintptr_t)src&1) == 0 && ((uintptr_t)dst&1) == 0 && (n&1) == 0) {
-                       for (uint i = 0; i < (n>>1); i++) {
-                               raceCheckRead16(tid, (void *)(((char *)src) + i));
-                               ((volatile uint16_t *)dst)[i] = ((uint16_t *)src)[i];
-                               raceCheckWrite16(tid, (void *)(((char *)src) + i));
-                       }
-               } else {
+               raceCheckReadMemop(tid, (void *)src, n);
+               raceCheckWriteMemop(tid, (void *)dst, n);
+       } else if (((uintptr_t)real_memcpy) < 2) {
+               for(uint i=0;i<n;i++) {
+                       ((volatile char *)dst)[i] = ((char *)src)[i];
+               }
+               return dst;
+       }
+       return real_memcpy(dst, src, n);
+}
+
+void * memmove(void * dst, const void * src, size_t n) {
+       if (model && !inside_model) {
+               thread_id_t tid = thread_current_id();
+               raceCheckReadMemop(tid, (void *)src, n);
+               raceCheckWriteMemop(tid, (void *)dst, n);
+       } else if (((uintptr_t)real_memmove) < 2) {
+               if (((uintptr_t)dst) < ((uintptr_t)src))
                        for(uint i=0;i<n;i++) {
-                               raceCheckRead8(tid, (void *)(((char *)src) + i));
                                ((volatile char *)dst)[i] = ((char *)src)[i];
-                               raceCheckWrite8(tid, (void *)(((char *)src) + i));
                        }
-               }
-       } else {
-               if (((uintptr_t)real_memcpy) < 2) {
-                       for(uint i=0;i<n;i++) {
+               else
+                       for(uint i=n;i!=0; ) {
+                               i--;
                                ((volatile char *)dst)[i] = ((char *)src)[i];
                        }
-                       return dst;
+               return dst;
+       }
+       return real_memmove(dst, src, n);
+}
+
+void * memset(void *dst, int c, size_t n) {
+       if (model && !inside_model) {
+               //model_print("memset size: %d\n", n);
+               thread_id_t tid = thread_current_id();
+               raceCheckWriteMemop(tid, (void *)dst, n);
+       } else if (((uintptr_t)real_memset) < 2) {
+               //stuck in dynamic linker alloc cycle...
+               for(size_t s=0;s<n;s++) {
+                       ((volatile char *)dst)[s] = (char) c;
                }
+               return dst;
+       }
+       return real_memset(dst, c, n);
+}
 
-               return real_memcpy(dst, src, n);
+void bzero(void *dst, size_t n) {
+       if (model && !inside_model) {
+               thread_id_t tid = thread_current_id();
+               raceCheckWriteMemop(tid, (void *)dst, n);
+       } else if (((uintptr_t)real_bzero) < 2) {
+               for(size_t s=0;s<n;s++) {
+                       ((volatile char *)dst)[s] = 0;
+               }
+               return;
        }
-       return dst;
+       real_bzero(dst, n);
 }