commit e73b0aad62daf8f8288598d69e82bc4850647dc4
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jun 28 07:19:56 2008 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jun 28 07:19:56 2008 +0000
tree 9c07237b2cffeec97b00c123be15110ba416dd59
parent 8bfd94f9b9c725904c0d3288650983f2649322dc

Renamed "danger set" into "conflict set".

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8291 a5019735-40e9-0310-863c-91ae7b9d1cf9

exp-drd/drd_thread_bitmap.h

diff --git a/exp-drd/drd_thread_bitmap.h b/exp-drd/drd_thread_bitmap.h
index e310398..4fb098f 100644
--- a/exp-drd/drd_thread_bitmap.h
+++ b/exp-drd/drd_thread_bitmap.h
@@ -32,7 +32,7 @@
 Bool bm_access_load_1_triggers_conflict(const Addr a1)
 {
   bm_access_load_1(running_thread_get_segment()->bm, a1);
-  return bm_load_1_has_conflict_with(thread_get_danger_set(), a1);
+  return bm_load_1_has_conflict_with(thread_get_conflict_set(), a1);
 }
 
 static __inline__
@@ -41,12 +41,12 @@
   if ((a1 & 1) == 0)
   {
     bm_access_aligned_load(running_thread_get_segment()->bm, a1, 2);
-    return bm_aligned_load_has_conflict_with(thread_get_danger_set(), a1, 2);
+    return bm_aligned_load_has_conflict_with(thread_get_conflict_set(), a1, 2);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 2, eLoad);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 2, eLoad);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 2, eLoad);
   }
 }
 
@@ -56,12 +56,12 @@
   if ((a1 & 3) == 0)
   {
     bm_access_aligned_load(running_thread_get_segment()->bm, a1, 4);
-    return bm_aligned_load_has_conflict_with(thread_get_danger_set(), a1, 4);
+    return bm_aligned_load_has_conflict_with(thread_get_conflict_set(), a1, 4);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 4, eLoad);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 4, eLoad);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 4, eLoad);
   }
 }
 
@@ -71,18 +71,18 @@
   if ((a1 & 7) == 0)
   {
     bm_access_aligned_load(running_thread_get_segment()->bm, a1, 8);
-    return bm_aligned_load_has_conflict_with(thread_get_danger_set(), a1, 8);
+    return bm_aligned_load_has_conflict_with(thread_get_conflict_set(), a1, 8);
   }
   else if ((a1 & 3) == 0)
   {
     bm_access_aligned_load(running_thread_get_segment()->bm, a1 + 0, 4);
     bm_access_aligned_load(running_thread_get_segment()->bm, a1 + 4, 4);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 8, eLoad);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 8, eLoad);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 8, eLoad);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 8, eLoad);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 8, eLoad);
   }
 }
 
@@ -90,14 +90,14 @@
 Bool bm_access_load_triggers_conflict(const Addr a1, const Addr a2)
 {
   bm_access_range_load(running_thread_get_segment()->bm, a1, a2);
-  return bm_load_has_conflict_with(thread_get_danger_set(), a1, a2);
+  return bm_load_has_conflict_with(thread_get_conflict_set(), a1, a2);
 }
 
 static __inline__
 Bool bm_access_store_1_triggers_conflict(const Addr a1)
 {
   bm_access_store_1(running_thread_get_segment()->bm, a1);
-  return bm_store_1_has_conflict_with(thread_get_danger_set(), a1);
+  return bm_store_1_has_conflict_with(thread_get_conflict_set(), a1);
 }
 
 static __inline__
@@ -106,12 +106,12 @@
   if ((a1 & 1) == 0)
   {
     bm_access_aligned_store(running_thread_get_segment()->bm, a1, 2);
-    return bm_aligned_store_has_conflict_with(thread_get_danger_set(), a1, 2);
+    return bm_aligned_store_has_conflict_with(thread_get_conflict_set(), a1, 2);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 2, eStore);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 2, eStore);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 2, eStore);
   }
 }
 
@@ -121,12 +121,12 @@
   if ((a1 & 3) == 0)
   {
     bm_access_aligned_store(running_thread_get_segment()->bm, a1, 4);
-    return bm_aligned_store_has_conflict_with(thread_get_danger_set(), a1, 4);
+    return bm_aligned_store_has_conflict_with(thread_get_conflict_set(), a1, 4);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 4, eStore);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 4, eStore);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 4, eStore);
   }
 }
 
@@ -136,18 +136,18 @@
   if ((a1 & 7) == 0)
   {
     bm_access_aligned_store(running_thread_get_segment()->bm, a1, 8);
-    return bm_aligned_store_has_conflict_with(thread_get_danger_set(), a1, 8);
+    return bm_aligned_store_has_conflict_with(thread_get_conflict_set(), a1, 8);
   }
   else if ((a1 & 3) == 0)
   {
     bm_access_aligned_store(running_thread_get_segment()->bm, a1 + 0, 4);
     bm_access_aligned_store(running_thread_get_segment()->bm, a1 + 4, 4);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 8, eStore);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 8, eStore);
   }
   else
   {
     bm_access_range(running_thread_get_segment()->bm, a1, a1 + 8, eStore);
-    return bm_has_conflict_with(thread_get_danger_set(), a1, a1 + 8, eStore);
+    return bm_has_conflict_with(thread_get_conflict_set(), a1, a1 + 8, eStore);
   }
 }
 
@@ -155,7 +155,7 @@
 Bool bm_access_store_triggers_conflict(const Addr a1, const Addr a2)
 {
   bm_access_range_store(running_thread_get_segment()->bm, a1, a2);
-  return bm_store_has_conflict_with(thread_get_danger_set(), a1, a2);
+  return bm_store_has_conflict_with(thread_get_conflict_set(), a1, a2);
 }
 
 #endif // __DRD_THREAD_BITMAP_H