X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=a9bb7052ebca835ae5fc0fd69cf212cdb410f983;hb=995962127d29a128fa2de578f47953308600b605;hp=1219bf3285b39505fec9a95530b80b4790fed9cc;hpb=7af1e278a823b97b391f37da9ef6a013d58ac50e;p=c11tester.git

diff --git a/librace.cc b/librace.cc
index 1219bf32..a9bb7052 100644
--- a/librace.cc
+++ b/librace.cc
@@ -1,46 +1,143 @@
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "librace.h"
 #include "common.h"
+#include "datarace.h"
+#include "model.h"
+#include "threads-model.h"
 
 void store_8(void *addr, uint8_t val)
 {
-	DEBUG("addr = %p, val = %u\n", addr, val);
+	DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckWrite(tid, addr);
+	(*(uint8_t *)addr) = val;
 }
 
 void store_16(void *addr, uint16_t val)
 {
-	DEBUG("addr = %p, val = %u\n", addr, val);
+	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));
+	(*(uint16_t *)addr) = val;
 }
 
 void store_32(void *addr, uint32_t val)
 {
-	DEBUG("addr = %p, val = %u\n", addr, val);
+	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));
+	(*(uint32_t *)addr) = val;
 }
 
 void store_64(void *addr, uint64_t val)
 {
-	DEBUG("addr = %p, val = %llu\n", addr, val);
+	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));
+	(*(uint64_t *)addr) = val;
 }
 
-uint8_t load_8(void *addr)
+uint8_t load_8(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	return 0;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead(tid, addr);
+	return *((uint8_t *)addr);
 }
 
-uint16_t load_16(void *addr)
+uint16_t load_16(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	return 0;
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckRead(tid, addr);
+	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
+	return *((uint16_t *)addr);
 }
 
-uint32_t load_32(void *addr)
+uint32_t load_32(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	return 0;
+	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));
+	return *((uint32_t *)addr);
 }
 
-uint64_t load_64(void *addr)
+uint64_t load_64(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	return 0;
+	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));
+	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);
+	thread_id_t tid = thread_current()->get_id();
+	raceCheckWrite(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));
 }
+
+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));
+}
+
+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));
+}
+
+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); }