X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=librace.cc;h=214026d651b66328d0465e9d10a68588dfa4a897;hp=faa98cdb02221518825e82547d2b0a5126d07685;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=39e9009d50498d0dd1bccc1a54e378f7aef5a28a

diff --git a/librace.cc b/librace.cc
index faa98cdb..214026d6 100644
--- a/librace.cc
+++ b/librace.cc
@@ -11,7 +11,7 @@
 void store_8(void *addr, uint8_t val)
 {
 	DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	(*(uint8_t *)addr) = val;
 }
@@ -19,7 +19,7 @@ void store_8(void *addr, uint8_t 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();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	(*(uint16_t *)addr) = val;
@@ -28,7 +28,7 @@ void store_16(void *addr, uint16_t 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();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
@@ -39,7 +39,7 @@ void store_32(void *addr, uint32_t 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();
+	thread_id_t tid = thread_current_id();
 	raceCheckWrite(tid, addr);
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
 	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2));
@@ -54,7 +54,7 @@ void store_64(void *addr, uint64_t val)
 uint8_t load_8(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	return *((uint8_t *)addr);
 }
@@ -62,7 +62,7 @@ uint8_t load_8(const void *addr)
 uint16_t load_16(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
 	return *((uint16_t *)addr);
@@ -71,7 +71,7 @@ uint16_t load_16(const void *addr)
 uint32_t load_32(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2));
@@ -82,7 +82,7 @@ uint32_t load_32(const void *addr)
 uint64_t load_64(const void *addr)
 {
 	DEBUG("addr = %p\n", addr);
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	raceCheckRead(tid, addr);
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
 	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2));
@@ -106,8 +106,8 @@ void cds_store8(void *addr)
 	//DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
 	if (!model)
 		return;
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckWrite(tid, addr);
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite8(tid, addr);
 }
 
 void cds_store16(void *addr)
@@ -115,9 +115,8 @@ void cds_store16(void *addr)
 	//DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
 	if (!model)
 		return;
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckWrite(tid, addr);
-	raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1));
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite16(tid, addr);
 }
 
 void cds_store32(void *addr)
@@ -125,11 +124,8 @@ void cds_store32(void *addr)
 	//DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
 	if (!model)
 		return;
-	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));
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite32(tid, addr);
 }
 
 void cds_store64(void *addr)
@@ -137,52 +133,34 @@ void cds_store64(void *addr)
 	//DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
 	if (!model)
 		return;
-	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));
+	thread_id_t tid = thread_current_id();
+	raceCheckWrite64(tid, addr);
 }
 
 void cds_load8(const void *addr) {
 	if (!model)
 		return;
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckRead(tid, addr);
+	thread_id_t tid = thread_current_id();
+	raceCheckRead8(tid, addr);
 }
 
 void cds_load16(const void *addr) {
 	if (!model)
 		return;
-	thread_id_t tid = thread_current()->get_id();
-	raceCheckRead(tid, addr);
-	raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1));
+	thread_id_t tid = thread_current_id();
+	raceCheckRead16(tid, addr);
 }
 
 void cds_load32(const void *addr) {
 	if (!model)
 		return;
-	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));
+	thread_id_t tid = thread_current_id();
+	raceCheckRead32(tid, addr);
 }
 
 void cds_load64(const void *addr) {
 	if (!model)
 		return;
-	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));
+	thread_id_t tid = thread_current_id();
+	raceCheckRead64(tid, addr);
 }