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

diff --git a/librace.cc b/librace.cc
index bdd6093a..2c36054b 100644
--- a/librace.cc
+++ b/librace.cc
@@ -5,98 +5,90 @@
 #include "common.h"
 #include "datarace.h"
 #include "model.h"
-#include "threads.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);
+	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 = %" 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);
+	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 = %" 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);
+	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 = %" 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);
+	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);
-	thread_id_t tid=thread_current()->get_id();
-	ClockVector * cv=model->get_cv(tid);
-	raceCheckRead(tid, addr, cv);
+	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);
-	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);
+	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);
-	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);
+	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);
-	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);
+	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);
 }