X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=librace.cc;h=214026d651b66328d0465e9d10a68588dfa4a897;hp=b7836278477596c9d673e20e1183e8fcffad674a;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=d636a580c23766d2734cb3bca516b2f25177bae5

diff --git a/librace.cc b/librace.cc
index b7836278..214026d6 100644
--- a/librace.cc
+++ b/librace.cc
@@ -6,11 +6,12 @@
 #include "datarace.h"
 #include "model.h"
 #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()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	(*(uint8_t *)addr) = val;
 }
@@ -18,7 +19,7 @@ void store_8(void *addr, uint8_t val)
 void store_16(void *addr, uint16_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	(*(uint16_t *)addr) = val;
@@ -27,7 +28,7 @@ void store_16(void *addr, uint16_t val)
 void store_32(void *addr, uint32_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
@@ -38,7 +39,7 @@ void store_32(void *addr, uint32_t val)
 void store_64(void *addr, uint64_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
@@ -53,7 +54,7 @@ void store_64(void *addr, uint64_t val)
 uint8_t load_8(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	return *((uint8_t *)addr);
 }
@@ -61,7 +62,7 @@ uint8_t load_8(const void *addr)
 uint16_t load_16(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
 	return *((uint16_t *)addr);
@@ -70,7 +71,7 @@ uint16_t load_16(const void *addr)
 uint32_t load_32(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	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));
@@ -81,7 +82,7 @@ uint32_t load_32(const void *addr)
 uint64_t load_64(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	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));
@@ -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);
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckWrite(tid, addr);
+	//DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite8(tid, addr);
 }
 
 void cds_store16(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckWrite(tid, addr);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
+	//DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite16(tid, addr);
 }
 
 void cds_store32(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
-	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));
+	//DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite32(tid, addr);
 }
 
 void cds_store64(void *addr)
 {
-  //DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
-	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));
+	//DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite64(tid, addr);
+}
+
+void cds_load8(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead8(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_load16(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead16(tid, addr);
+}
+
+void cds_load32(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead32(tid, addr);
+}
+
+void cds_load64(const void *addr) {
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead64(tid, addr);
+}