X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=118e75c9fa100e75abc12a59e0b6f6d493b4ee84;hb=b9bb96ec1112fdf416296d4c49293eb5cbb6da41;hp=bdd6093a6b6d4ea1f8c9665219a660dc23d1a813;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=c11tester.git

diff --git a/librace.cc b/librace.cc
index bdd6093a..118e75c9 100644
--- a/librace.cc
+++ b/librace.cc
@@ -5,98 +5,80 @@
 #include "common.h"
 #include "datarace.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "snapshot-interface.h"
 
-void store_8(void *addr, uint8_t val)
+/**
+ * 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();
-	ClockVector * cv=model->get_cv(tid);
-	raceCheckWrite(tid, addr, cv);
-	(*(uint8_t *)addr) = val;
+	//DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite8(tid, addr);
 }
 
-void store_16(void *addr, uint16_t val)
+void cds_store16(void *addr)
 {
-	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);
-	(*(uint16_t *)addr) = val;
+	//DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite16(tid, addr);
 }
 
-void store_32(void *addr, uint32_t val)
+void cds_store32(void *addr)
 {
-	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);
-	(*(uint32_t *)addr) = val;
+	//DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite32(tid, addr);
 }
 
-void store_64(void *addr, uint64_t val)
+void cds_store64(void *addr)
 {
-	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);
-	(*(uint64_t *)addr) = val;
+	//DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite64(tid, addr);
 }
 
-uint8_t load_8(void *addr)
-{
+void cds_load8(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);
-	return *((uint8_t *)addr);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead8(tid, addr);
 }
 
-uint16_t load_16(void *addr)
-{
+void cds_load16(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, (void *)(((uintptr_t)addr)+1), cv);
-	return *((uint16_t *)addr);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead16(tid, addr);
 }
 
-uint32_t load_32(void *addr)
-{
+void cds_load32(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, (void *)(((uintptr_t)addr)+1), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
-	return *((uint32_t *)addr);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead32(tid, addr);
 }
 
-uint64_t load_64(void *addr)
-{
+void cds_load64(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, (void *)(((uintptr_t)addr)+1), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+4), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+5), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+6), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+7), cv);
-	return *((uint64_t *)addr);
+	if (!model)
+		return;
+	thread_id_t tid = thread_current_id();
+	raceCheckRead64(tid, addr);
 }