X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=95b97aa90fdba45e43b1bbe9f8b1dea849a50dd3;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=bdd6093a6b6d4ea1f8c9665219a660dc23d1a813;hpb=f4d77c40b4029cdc18f4aaa5a4e01dfbcfca5f7b;p=model-checker.git

diff --git a/librace.cc b/librace.cc
index bdd6093..95b97aa 100644
--- a/librace.cc
+++ b/librace.cc
@@ -5,7 +5,7 @@
 #include "common.h"
 #include "datarace.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 
 void store_8(void *addr, uint8_t val)
 {
@@ -54,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();
@@ -63,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);
 }