X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=librace.cc;h=faa98cdb02221518825e82547d2b0a5126d07685;hp=5e775f3f1b471a21e5f473d6e274a481af62d59c;hb=2666d71b7d5a31e7707a42d8727e4c6e25b6b30d;hpb=6e5c0bb2359b9fba6160957ffa88974233ba18ac

diff --git a/librace.cc b/librace.cc
index 5e775f3f..faa98cdb 100644
--- a/librace.cc
+++ b/librace.cc
@@ -6,13 +6,13 @@
 #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();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckWrite(tid, addr, cv);
+	raceCheckWrite(tid, addr);
 	(*(uint8_t *)addr) = val;
 }
 
@@ -20,9 +20,8 @@ void store_16(void *addr, uint16_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckWrite(tid, addr, cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1), cv);
+	raceCheckWrite(tid, addr);
+	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	(*(uint16_t *)addr) = val;
 }
 
@@ -30,11 +29,10 @@ void store_32(void *addr, uint32_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckWrite(tid, addr, cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3), cv);
+	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;
 }
 
@@ -42,15 +40,14 @@ void store_64(void *addr, uint64_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckWrite(tid, addr, cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 4), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 5), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 6), cv);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 7), cv);
+	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;
 }
 
@@ -58,8 +55,7 @@ uint8_t load_8(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckRead(tid, addr, cv);
+	raceCheckRead(tid, addr);
 	return *((uint8_t *)addr);
 }
 
@@ -67,9 +63,8 @@ uint16_t load_16(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckRead(tid, addr, cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1), cv);
+	raceCheckRead(tid, addr);
+	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
 	return *((uint16_t *)addr);
 }
 
@@ -77,11 +72,10 @@ uint32_t load_32(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckRead(tid, addr, cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3), cv);
+	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);
 }
 
@@ -89,14 +83,106 @@ uint64_t load_64(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
 	thread_id_t tid = thread_current()->get_id();
-	ClockVector *cv = model->get_cv(tid);
-	raceCheckRead(tid, addr, cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 4), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 5), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 6), cv);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 7), cv);
+	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,
+ * 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);
+}
+
+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));
+}
+
+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));
+}
+
+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));
+}
+
+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));
+}