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

[c11tester.git] / librace.cc

diff --git a/librace.cc b/librace.cc
index 214026d651b66328d0465e9d10a68588dfa4a897..118e75c9fa100e75abc12a59e0b6f6d493b4ee84 100644 (file)
--- a/librace.cc
+++ b/librace.cc
@@ -8,92 +8,6 @@
 #include "threads-model.h"
 #include "snapshot-interface.h"
 
-void store_8(void *addr, uint8_t val)
-{
-       DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
-       thread_id_t tid = thread_current_id();
-       raceCheckWrite(tid, addr);
-       (*(uint8_t *)addr) = val;
-}
-
-void store_16(void *addr, uint16_t val)
-{
-       DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
-       thread_id_t tid = thread_current_id();
-       raceCheckWrite(tid, addr);
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
-       (*(uint16_t *)addr) = val;
-}
-
-void store_32(void *addr, uint32_t val)
-{
-       DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
-       thread_id_t tid = thread_current_id();
-       raceCheckWrite(tid, addr);
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3));
-       (*(uint32_t *)addr) = val;
-}
-
-void store_64(void *addr, uint64_t val)
-{
-       DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
-       thread_id_t tid = thread_current_id();
-       raceCheckWrite(tid, addr);
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 4));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 5));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 6));
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 7));
-       (*(uint64_t *)addr) = val;
-}
-
-uint8_t load_8(const void *addr)
-{
-       DEBUG("addr = %p\n", addr);
-       thread_id_t tid = thread_current_id();
-       raceCheckRead(tid, addr);
-       return *((uint8_t *)addr);
-}
-
-uint16_t load_16(const void *addr)
-{
-       DEBUG("addr = %p\n", addr);
-       thread_id_t tid = thread_current_id();
-       raceCheckRead(tid, addr);
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
-       return *((uint16_t *)addr);
-}
-
-uint32_t load_32(const void *addr)
-{
-       DEBUG("addr = %p\n", addr);
-       thread_id_t tid = thread_current_id();
-       raceCheckRead(tid, addr);
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3));
-       return *((uint32_t *)addr);
-}
-
-uint64_t load_64(const void *addr)
-{
-       DEBUG("addr = %p\n", addr);
-       thread_id_t tid = thread_current_id();
-       raceCheckRead(tid, addr);
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 4));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 5));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 6));
-       raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 7));
-       return *((uint64_t *)addr);
-}
-
 /**
  * Helper functions used by CDSPass
  * The CDSPass implementation does not replace normal load/stores with cds load/stores,
@@ -138,6 +52,7 @@ void cds_store64(void *addr)
 }
 
 void cds_load8(const void *addr) {
+       DEBUG("addr = %p\n", addr);
        if (!model)
                return;
        thread_id_t tid = thread_current_id();
@@ -145,6 +60,7 @@ void cds_load8(const void *addr) {
 }
 
 void cds_load16(const void *addr) {
+       DEBUG("addr = %p\n", addr);
        if (!model)
                return;
        thread_id_t tid = thread_current_id();
@@ -152,6 +68,7 @@ void cds_load16(const void *addr) {
 }
 
 void cds_load32(const void *addr) {
+       DEBUG("addr = %p\n", addr);
        if (!model)
                return;
        thread_id_t tid = thread_current_id();
@@ -159,6 +76,7 @@ void cds_load32(const void *addr) {
 }
 
 void cds_load64(const void *addr) {
+       DEBUG("addr = %p\n", addr);
        if (!model)
                return;
        thread_id_t tid = thread_current_id();