changes

[c11tester.git] / librace.cc

diff --git a/librace.cc b/librace.cc
index 15ee94eb492bf2caedc9050e4ccfac75aa76a483..8ecf2afc1daa90db43fb692e76ed8c6c58a90210 100644 (file)
--- a/librace.cc
+++ b/librace.cc
@@ -107,7 +107,7 @@ void cds_store8(void *addr)
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-       raceCheckWrite(tid, addr);
+       raceCheckWrite8(tid, addr);
 }
 
 void cds_store16(void *addr)
@@ -116,8 +116,7 @@ void cds_store16(void *addr)
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-       raceCheckWrite(tid, addr);
-       raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
+       raceCheckWrite16(tid, addr);
 }
 
 void cds_store32(void *addr)
@@ -126,10 +125,7 @@ void cds_store32(void *addr)
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_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));
+       raceCheckWrite32(tid, addr);
 }
 
 void cds_store64(void *addr)
@@ -138,63 +134,33 @@ void cds_store64(void *addr)
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_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));
+       raceCheckWrite64(tid, addr);
 }
 
 void cds_load8(const void *addr) {
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-
-       raceCheckReadOpt(tid, addr, 1);
-//     raceCheckRead(tid, addr);
+       raceCheckRead8(tid, addr);
 }
 
 void cds_load16(const void *addr) {
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-
-       raceCheckReadOpt(tid, addr, 2);
-//     raceCheckRead(tid, addr);
-//     raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
+       raceCheckRead16(tid, addr);
 }
 
 void cds_load32(const void *addr) {
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-
-       raceCheckReadOpt(tid, addr, 4);
-/*
-       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));
-*/
+       raceCheckRead32(tid, addr);
 }
 
 void cds_load64(const void *addr) {
        if (!model)
                return;
        thread_id_t tid = thread_current()->get_id();
-
-       raceCheckReadOpt(tid, addr, 8);
-/*
-       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));
-*/
+       raceCheckRead64(tid, addr);
 }