X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=64133304e31e5fc72414c4399d6719e0b410c4d3;hb=729acbffd2562f10dd1864b010c3623faa485513;hp=b7836278477596c9d673e20e1183e8fcffad674a;hpb=d636a580c23766d2734cb3bca516b2f25177bae5;p=c11tester.git

diff --git a/librace.cc b/librace.cc
index b7836278..64133304 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)
 {
@@ -96,18 +97,22 @@ uint64_t load_64(const void *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. 
+// return anything.
 
 void cds_store8(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	//DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	if (!model)
+		return;
 	thread_id_t tid = thread_current()->get_id();
 	raceCheckWrite(tid, addr);
 }
 
 void cds_store16(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+	//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));
@@ -115,7 +120,9 @@ void cds_store16(void *addr)
 
 void cds_store32(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+	//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));
@@ -125,7 +132,9 @@ void cds_store32(void *addr)
 
 void cds_store64(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+	//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));
@@ -137,7 +146,41 @@ void cds_store64(void *addr)
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 7));
 }
 
-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();
+	raceCheckRead(tid, addr);
+}
+
+void cds_load16(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead(tid, addr);
+	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
+}
+
+void cds_load32(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_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));
+}
+
+void cds_load64(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current()->get_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));
+}