X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=8ecf2afc1daa90db43fb692e76ed8c6c58a90210;hb=f64becc2079fe890a69e707dd7f93d58693bc89f;hp=a9bb7052ebca835ae5fc0fd69cf212cdb410f983;hpb=89ecd60fab0d93d6df6aa35e663ab67db860fa1d;p=c11tester.git

diff --git a/librace.cc b/librace.cc
index a9bb7052..8ecf2afc 100644
--- a/librace.cc
+++ b/librace.cc
@@ -6,6 +6,7 @@
 #include "datarace.h"
 #include "model.h"
 #include "threads-model.h"
+#include "snapshot-interface.h"
 
 void store_8(void *addr, uint8_t val)
 {
@@ -93,51 +94,73 @@ uint64_t load_64(const void *addr)
 	return *((uint64_t *)addr);
 }
 
-// helper functions used by CdsPass
-// The CdsPass implementation does not replace normal load/stores with cds load/stores,
-// but inserts cds load/stores to check dataraces. Thus, the cds load/stores do not
-// return anything.
+/**
+ * Helper functions used by CDSPass
+ * The CDSPass implementation does not replace normal load/stores with cds load/stores,
+ * but inserts cds load/stores to check dataraces. Thus, the cds load/stores do not
+ * return anything.
+ */
 
 void cds_store8(void *addr)
 {
 	//DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	if (!model)
+		return;
 	thread_id_t tid = thread_current()->get_id();
-	raceCheckWrite(tid, addr);
+	raceCheckWrite8(tid, addr);
 }
 
 void cds_store16(void *addr)
 {
 	//DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+	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)
 {
 	//DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+	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)
 {
 	//DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+	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) { load_8(addr); }
-void cds_load16(const void *addr) { load_16(addr); }
-void cds_load32(const void *addr) { load_32(addr); }
-void cds_load64(const void *addr) { load_64(addr); }
+void cds_load8(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead8(tid, addr);
+}
+
+void cds_load16(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead16(tid, addr);
+}
+
+void cds_load32(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead32(tid, addr);
+}
+
+void cds_load64(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead64(tid, addr);
+}