|
From: <sv...@va...> - 2008-06-07 10:26:27
|
Author: bart
Date: 2008-06-07 11:26:31 +0100 (Sat, 07 Jun 2008)
New Revision: 8197
Log:
Enabled more inlining.
Modified:
trunk/exp-drd/drd_thread.c
Modified: trunk/exp-drd/drd_thread.c
===================================================================
--- trunk/exp-drd/drd_thread.c 2008-06-06 14:31:36 UTC (rev 8196)
+++ trunk/exp-drd/drd_thread.c 2008-06-07 10:26:31 UTC (rev 8197)
@@ -733,12 +733,14 @@
s_danger_set_combine_vc_count++;
}
+__inline__
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);
}
+__inline__
Bool bm_access_load_2_triggers_conflict(const Addr a1)
{
if ((a1 & 1) == 0)
@@ -753,6 +755,7 @@
}
}
+__inline__
Bool bm_access_load_4_triggers_conflict(const Addr a1)
{
if ((a1 & 3) == 0)
@@ -767,6 +770,7 @@
}
}
+__inline__
Bool bm_access_load_8_triggers_conflict(const Addr a1)
{
if ((a1 & 7) == 0)
@@ -787,18 +791,21 @@
}
}
+__inline__
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);
}
+__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);
}
+__inline__
Bool bm_access_store_2_triggers_conflict(const Addr a1)
{
if ((a1 & 1) == 0)
@@ -813,6 +820,7 @@
}
}
+__inline__
Bool bm_access_store_4_triggers_conflict(const Addr a1)
{
if ((a1 & 3) == 0)
@@ -827,6 +835,7 @@
}
}
+__inline__
Bool bm_access_store_8_triggers_conflict(const Addr a1)
{
if ((a1 & 7) == 0)
@@ -847,6 +856,7 @@
}
}
+__inline__
Bool bm_access_store_triggers_conflict(const Addr a1, const Addr a2)
{
bm_access_range_store(running_thread_get_segment()->bm, a1, a2);
|