X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=5e775f3f1b471a21e5f473d6e274a481af62d59c;hb=07b041c2dd6958bb3a52ffcba07e8e642130548c;hp=fa9a1101c07c0b05868ea60165d354a9588ef3c5;hpb=810306cb85accaaace9a50f174264f105991230b;p=model-checker.git

diff --git a/librace.cc b/librace.cc
index fa9a110..5e775f3 100644
--- a/librace.cc
+++ b/librace.cc
@@ -3,51 +3,100 @@
 
 #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 = %" 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;
 }
 
 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);
 	(*(uint16_t *)addr) = 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();
+	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;
 }
 
 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);
 	(*(uint64_t *)addr) = val;
 }
 
-uint8_t load_8(void *addr)
+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);
 	return *((uint8_t *)addr);
 }
 
-uint16_t load_16(void *addr)
+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);
 	return *((uint16_t *)addr);
 }
 
-uint32_t load_32(void *addr)
+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);
 	return *((uint32_t *)addr);
 }
 
-uint64_t load_64(void *addr)
+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);
 	return *((uint64_t *)addr);
 }