X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=librace.cc;h=95b97aa90fdba45e43b1bbe9f8b1dea849a50dd3;hp=38434de70f44d4694ed2a268094e19370a2f87d1;hb=14e14603f64fe9004606ca82668adf7ef002d90e;hpb=8548c711d71b6474802af83f5a4800eb4ac30718

diff --git a/librace.cc b/librace.cc
index 38434de..95b97aa 100644
--- a/librace.cc
+++ b/librace.cc
@@ -5,6 +5,7 @@
 #include "common.h"
 #include "datarace.h"
 #include "model.h"
+#include "threads-model.h"
 
 void store_8(void *addr, uint8_t val)
 {
@@ -53,7 +54,7 @@ void store_64(void *addr, uint64_t val)
 	(*(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();
@@ -62,40 +63,40 @@ uint8_t load_8(void *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);
+	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, (void *)(((uintptr_t)addr)+1), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
-	raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), 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, (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);
+	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);
 }