[rtems commit] score: Create prioritybitmap implementation header

Sebastian Huber sebh at rtems.org
Fri Jul 26 09:51:53 UTC 2013


Module:    rtems
Branch:    master
Commit:    f0bfd7d81d413f8af598f39e185c336a92602aca
Changeset: http://git.rtems.org/rtems/commit/?id=f0bfd7d81d413f8af598f39e185c336a92602aca

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Jul 24 13:25:57 2013 +0200

score: Create prioritybitmap implementation header

Move implementation specific parts of prioritybitmap.h and
prioritybitmap.inl into new header file prioritybitmapimpl.h.  The
prioritybitmap.h contains now only the application visible API.

Move content of bitfield.h into prioritybitmapimpl.h.

---

 cpukit/sapi/src/exinit.c                           |    2 +-
 cpukit/score/Makefile.am                           |    3 +-
 cpukit/score/include/rtems/score/bitfield.h        |  110 -------
 cpukit/score/include/rtems/score/prioritybitmap.h  |   71 +----
 .../score/include/rtems/score/prioritybitmapimpl.h |  317 ++++++++++++++++++++
 .../include/rtems/score/schedulerpriorityimpl.h    |    1 +
 cpukit/score/inline/rtems/score/prioritybitmap.inl |  198 ------------
 cpukit/score/preinstall.am                         |   12 +-
 cpukit/score/src/schedulerpriorityupdate.c         |    7 +-
 testsuites/sptests/spsize/size.c                   |    2 +-
 10 files changed, 331 insertions(+), 392 deletions(-)

diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
index a7b1661..91eac2a 100644
--- a/cpukit/sapi/src/exinit.c
+++ b/cpukit/sapi/src/exinit.c
@@ -48,7 +48,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/score/priority.h>
-#include <rtems/score/prioritybitmap.h>
+#include <rtems/score/prioritybitmapimpl.h>
 #include <rtems/score/schedulerimpl.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/tod.h>
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 09a11eb..617b99c 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -17,7 +17,6 @@ include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = include/rtems/score/address.h
 include_rtems_score_HEADERS += include/rtems/score/apiext.h
 include_rtems_score_HEADERS += include/rtems/score/apimutex.h
-include_rtems_score_HEADERS += include/rtems/score/bitfield.h
 include_rtems_score_HEADERS += include/rtems/score/chain.h
 include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
 include_rtems_score_HEADERS += include/rtems/score/context.h
@@ -41,6 +40,7 @@ include_rtems_score_HEADERS += include/rtems/score/object.h
 include_rtems_score_HEADERS += include/rtems/score/percpu.h
 include_rtems_score_HEADERS += include/rtems/score/priority.h
 include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h
+include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h
 include_rtems_score_HEADERS += include/rtems/score/rbtree.h
 include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h
 include_rtems_score_HEADERS += include/rtems/score/scheduler.h
@@ -99,7 +99,6 @@ endif
 
 ## inline
 include_rtems_score_HEADERS += inline/rtems/score/object.inl
-include_rtems_score_HEADERS += inline/rtems/score/prioritybitmap.inl
 include_rtems_score_HEADERS += inline/rtems/score/states.inl
 include_rtems_score_HEADERS += inline/rtems/score/thread.inl
 include_rtems_score_HEADERS += inline/rtems/score/threadq.inl
diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h
deleted file mode 100644
index caa289a..0000000
--- a/cpukit/score/include/rtems/score/bitfield.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @file  rtems/score/bitfield.h
- *
- * @brief Bit Field Manipulation Routines
- *
- * This include file contains all bit field manipulation routines.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2006.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_SCORE_BITFIELD_H
-#define _RTEMS_SCORE_BITFIELD_H
-
-/**
- *  @defgroup ScoreBitfield Bitfield Handler
- *
- *  @ingroup Score
- *
- *  This handler encapsulates functionality that is used to manipulate the
- *  priority bitfields used to lookup which priority has the highest
- *  priority ready to execute thread.
- */
-/**@{*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if ( CPU_USE_GENERIC_BITFIELD_DATA == TRUE )
-
-/**
- *  This table is used by the generic bitfield routines to perform
- *  a highly optimized bit scan without the use of special CPU
- *  instructions.
- */
-#ifndef SCORE_INIT
-extern const unsigned char __log2table[256];
-#else
-const unsigned char __log2table[256] = {
-    7, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-#endif
-
-#endif
-
-/**
- *  @brief Gets the @a _bit_number of the first bit set in the specified value.
- *
- *  This routine returns the @a _bit_number of the first bit set
- *  in the specified value.  The correspondence between @a _bit_number
- *  and actual bit position is processor dependent.  The search for
- *  the first bit set may run from most to least significant bit
- *  or vice-versa.
- *
- *  @param[in] _value is the value to bit scan.
- *  @param[in] _bit_number is the position of the first bit set.
- *
- *  @note This routine is used when the executing thread is removed
- *  from the ready state and, as a result, its performance has a
- *  significant impact on the performance of the executive as a whole.
- *
- *  @note This routine must be a macro because if a CPU specific version
- *  is used it will most likely use inline assembly.
- */
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-        _CPU_Bitfield_Find_first_bit( _value, _bit_number )
-#else
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-  { \
-    register uint32_t   __value = (uint32_t) (_value); \
-    register const unsigned char *__p = __log2table; \
-    \
-    if ( __value < 0x100 ) \
-      (_bit_number) = (Priority_bit_map_Control)( __p[ __value ] + 8 );  \
-    else \
-      (_bit_number) = (Priority_bit_map_Control)( __p[ __value >> 8 ] ); \
-  }
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/**@}*/
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/prioritybitmap.h b/cpukit/score/include/rtems/score/prioritybitmap.h
index 8e8f21c..cbc7151 100644
--- a/cpukit/score/include/rtems/score/prioritybitmap.h
+++ b/cpukit/score/include/rtems/score/prioritybitmap.h
@@ -19,45 +19,18 @@
 #ifndef _RTEMS_SCORE_PRIORITYBITMAP_H
 #define _RTEMS_SCORE_PRIORITYBITMAP_H
 
-/**
- *  @defgroup ScorePriorityBitmap Bitmap Priority Thread Routines
- *
- *  @ingroup Score
- */
-/**@{*/
-
-/*
- * Processor specific information.
- */
 #include <rtems/score/cpu.h>
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <rtems/score/priority.h>
-
-
-/*
- * The Priority_bit_map_Control variables are instantiated only
- * if using the bit map handler.
- */
-
 /**
- *  Each sixteen bit entry in this array is associated with one of
- *  the sixteen entries in the Priority Bit map.
- */
-extern volatile Priority_bit_map_Control _Priority_Major_bit_map;
-
-/** Each bit in the Priority Bitmap indicates whether or not there are
- *  threads ready at a particular priority.  The mapping of
- *  individual priority levels to particular bits is processor
- *  dependent as is the value of each bit used to indicate that
- *  threads are ready at that priority.
+ *  @defgroup ScorePriorityBitmap Bitmap Priority Thread Routines
+ *
+ *  @ingroup Score
  */
-extern Priority_bit_map_Control
-               _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
+/**@{*/
 
 /*
  *  The definition of the Priority_bit_map_Control type is CPU dependent.
@@ -81,45 +54,11 @@ typedef struct {
   Priority_bit_map_Control  block_minor;
 } Priority_bit_map_Information;
 
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-/**
- *  This method returns the priority bit mask for the specified major
- *  or minor bit number.
- *
- *  @param[in] _bit_number is the bit number for which we need a mask
- *
- *  @retval the priority bit mask
- *
- *  @note This may simply be a pass through to a CPU dependent implementation.
- */
-#define _Priority_Mask( _bit_number ) \
-  _CPU_Priority_Mask( _bit_number )
-#endif
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-/**
- *  This method returns the bit index position for the specified priority.
- *
- *  @param[in] _priority is the priority for which we need the index.
- *
- *  @retval This method returns the array index into the priority bit map.
- *
- *  @note This may simply be a pass through to a CPU dependent implementation.
- */
-#define _Priority_Bits_index( _priority ) \
-  _CPU_Priority_bits_index( _priority )
-#endif
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/prioritybitmap.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/cpukit/score/include/rtems/score/prioritybitmapimpl.h
new file mode 100644
index 0000000..e2db034
--- /dev/null
+++ b/cpukit/score/include/rtems/score/prioritybitmapimpl.h
@@ -0,0 +1,317 @@
+/**
+ * @file
+ *
+ * @brief Inlined Routines in the Priority Handler Bit Map Implementation
+ *
+ * This file contains the static inline implementation of all inlined
+ * routines in the Priority Handler bit map implementation
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2010.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef _RTEMS_SCORE_PRIORITYBITMAPIMPL_H
+#define _RTEMS_SCORE_PRIORITYBITMAPIMPL_H
+
+#include <rtems/score/prioritybitmap.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup ScorePriority
+ */
+/**@{**/
+
+/*
+ * The Priority_bit_map_Control variables are instantiated only
+ * if using the bit map handler.
+ */
+
+/**
+ *  Each sixteen bit entry in this array is associated with one of
+ *  the sixteen entries in the Priority Bit map.
+ */
+extern volatile Priority_bit_map_Control _Priority_Major_bit_map;
+
+/** Each bit in the Priority Bitmap indicates whether or not there are
+ *  threads ready at a particular priority.  The mapping of
+ *  individual priority levels to particular bits is processor
+ *  dependent as is the value of each bit used to indicate that
+ *  threads are ready at that priority.
+ */
+extern Priority_bit_map_Control
+               _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
+
+#if ( CPU_USE_GENERIC_BITFIELD_DATA == TRUE )
+
+/**
+ *  This table is used by the generic bitfield routines to perform
+ *  a highly optimized bit scan without the use of special CPU
+ *  instructions.
+ */
+#ifndef SCORE_INIT
+extern const unsigned char __log2table[256];
+#else
+const unsigned char __log2table[256] = {
+    7, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+#endif
+
+#endif
+
+/**
+ *  @brief Gets the @a _bit_number of the first bit set in the specified value.
+ *
+ *  This routine returns the @a _bit_number of the first bit set
+ *  in the specified value.  The correspondence between @a _bit_number
+ *  and actual bit position is processor dependent.  The search for
+ *  the first bit set may run from most to least significant bit
+ *  or vice-versa.
+ *
+ *  @param[in] _value is the value to bit scan.
+ *  @param[in] _bit_number is the position of the first bit set.
+ *
+ *  @note This routine is used when the executing thread is removed
+ *  from the ready state and, as a result, its performance has a
+ *  significant impact on the performance of the executive as a whole.
+ *
+ *  @note This routine must be a macro because if a CPU specific version
+ *  is used it will most likely use inline assembly.
+ */
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
+#define _Bitfield_Find_first_bit( _value, _bit_number ) \
+        _CPU_Bitfield_Find_first_bit( _value, _bit_number )
+#else
+#define _Bitfield_Find_first_bit( _value, _bit_number ) \
+  { \
+    register uint32_t   __value = (uint32_t) (_value); \
+    register const unsigned char *__p = __log2table; \
+    \
+    if ( __value < 0x100 ) \
+      (_bit_number) = (Priority_bit_map_Control)( __p[ __value ] + 8 );  \
+    else \
+      (_bit_number) = (Priority_bit_map_Control)( __p[ __value >> 8 ] ); \
+  }
+#endif
+
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
+/**
+ *  This method returns the priority bit mask for the specified major
+ *  or minor bit number.
+ *
+ *  @param[in] _bit_number is the bit number for which we need a mask
+ *
+ *  @retval the priority bit mask
+ *
+ *  @note This may simply be a pass through to a CPU dependent implementation.
+ */
+#define _Priority_Mask( _bit_number ) \
+  _CPU_Priority_Mask( _bit_number )
+#endif
+
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
+/**
+ *  This method returns the bit index position for the specified priority.
+ *
+ *  @param[in] _priority is the priority for which we need the index.
+ *
+ *  @retval This method returns the array index into the priority bit map.
+ *
+ *  @note This may simply be a pass through to a CPU dependent implementation.
+ */
+#define _Priority_Bits_index( _priority ) \
+  _CPU_Priority_bits_index( _priority )
+#endif
+
+/**
+ * This function returns the major portion of the_priority.
+ */
+
+RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Major (
+  Priority_Control the_priority
+)
+{
+  return (Priority_bit_map_Control)( the_priority / 16 );
+}
+
+/**
+ * This function returns the minor portion of the_priority.
+ */
+
+RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Minor (
+  Priority_Control the_priority
+)
+{
+  return (Priority_bit_map_Control)( the_priority % 16 );
+}
+
+#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
+
+/**
+ * This function returns the mask associated with the major or minor
+ * number passed to it.
+ */
+
+RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask (
+  uint32_t   bit_number
+)
+{
+  return (Priority_bit_map_Control)(0x8000u >> bit_number);
+}
+
+/**
+ * This function returns the mask bit inverted.
+ */
+
+RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask_invert (
+  uint32_t   mask
+)
+{
+  return (Priority_bit_map_Control)(~mask);
+}
+
+/**
+ * This function translates the bit numbers returned by the bit scan
+ * of a priority bit field into something suitable for use as
+ * a major or minor component of a priority.
+ */
+
+RTEMS_INLINE_ROUTINE uint32_t   _Priority_Bits_index (
+  uint32_t   bit_number
+)
+{
+  return bit_number;
+}
+
+#endif
+
+/**
+ * Priority Queue implemented by bit map
+ */
+
+/**
+ *  This is the minor bit map.
+ */
+extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
+
+/**
+ * This routine performs the initialization necessary for this handler.
+ */
+
+RTEMS_INLINE_ROUTINE void _Priority_bit_map_Handler_initialization( void )
+{
+  int index;
+
+  _Priority_Major_bit_map = 0;
+  for ( index=0 ; index <16 ; index++ )
+     _Priority_Bit_map[ index ] = 0;
+}
+
+/**
+ * This routine uses the_priority_map to update the priority
+ * bit maps to indicate that a thread has been readied.
+ */
+
+RTEMS_INLINE_ROUTINE void _Priority_bit_map_Add (
+  Priority_bit_map_Information *the_priority_map
+)
+{
+  *the_priority_map->minor |= the_priority_map->ready_minor;
+  _Priority_Major_bit_map  |= the_priority_map->ready_major;
+}
+
+/**
+ * This routine uses the_priority_map to update the priority
+ * bit maps to indicate that a thread has been removed from the
+ * ready state.
+ */
+
+RTEMS_INLINE_ROUTINE void _Priority_bit_map_Remove (
+  Priority_bit_map_Information *the_priority_map
+)
+{
+  *the_priority_map->minor &= the_priority_map->block_minor;
+  if ( *the_priority_map->minor == 0 )
+    _Priority_Major_bit_map &= the_priority_map->block_major;
+}
+
+/**
+ * This function returns the priority of the highest priority
+ * ready thread.
+ */
+
+RTEMS_INLINE_ROUTINE Priority_Control _Priority_bit_map_Get_highest( void )
+{
+  Priority_bit_map_Control minor;
+  Priority_bit_map_Control major;
+
+  _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
+  _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
+
+  return (_Priority_Bits_index( major ) << 4) +
+          _Priority_Bits_index( minor );
+}
+
+/**
+ * This routine initializes the_priority_map so that it
+ * contains the information necessary to manage a thread
+ * at new_priority.
+ */
+
+RTEMS_INLINE_ROUTINE void _Priority_bit_map_Initialize_information(
+  Priority_bit_map_Information *the_priority_map,
+  Priority_Control      new_priority
+)
+{
+  Priority_bit_map_Control major;
+  Priority_bit_map_Control minor;
+  Priority_bit_map_Control mask;
+
+  major = _Priority_Major( new_priority );
+  minor = _Priority_Minor( new_priority );
+
+  the_priority_map->minor =
+    &_Priority_Bit_map[ _Priority_Bits_index(major) ];
+
+  mask = _Priority_Mask( major );
+  the_priority_map->ready_major = mask;
+  /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
+  the_priority_map->block_major = (Priority_bit_map_Control)(~((uint32_t)mask));
+
+  mask = _Priority_Mask( minor );
+  the_priority_map->ready_minor = mask;
+  /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
+  the_priority_map->block_minor = (Priority_bit_map_Control)(~((uint32_t)mask));
+}
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
index 03568ed..6215015 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
@@ -22,6 +22,7 @@
 
 #include <rtems/score/schedulerpriority.h>
 #include <rtems/score/chainimpl.h>
+#include <rtems/score/prioritybitmapimpl.h>
 #include <rtems/score/wkspace.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/inline/rtems/score/prioritybitmap.inl b/cpukit/score/inline/rtems/score/prioritybitmap.inl
deleted file mode 100644
index 19196ce..0000000
--- a/cpukit/score/inline/rtems/score/prioritybitmap.inl
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * @file
- *
- * @brief Inlined Routines in the Priority Handler Bit Map Implementation
- *
- * This file contains the static inline implementation of all inlined
- * routines in the Priority Handler bit map implementation
- */
-
-/*
- *  COPYRIGHT (c) 1989-2010.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_SCORE_PRIORITYBITMAP_H
-# error "Never use <rtems/score/prioritybitmap.inl> directly; include <rtems/score/prioritybitmap.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_PRIORITYBITMAP_INL
-#define _RTEMS_SCORE_PRIORITYBITMAP_INL
-
-/**
- * @addtogroup ScorePriority
- */
-/**@{**/
-
-#include <rtems/score/bitfield.h>
-
-/**
- * This function returns the major portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Major (
-  Priority_Control the_priority
-)
-{
-  return (Priority_bit_map_Control)( the_priority / 16 );
-}
-
-/**
- * This function returns the minor portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Minor (
-  Priority_Control the_priority
-)
-{
-  return (Priority_bit_map_Control)( the_priority % 16 );
-}
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
-
-/**
- * This function returns the mask associated with the major or minor
- * number passed to it.
- */
-
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask (
-  uint32_t   bit_number
-)
-{
-  return (Priority_bit_map_Control)(0x8000u >> bit_number);
-}
-
-/**
- * This function returns the mask bit inverted.
- */
-
-RTEMS_INLINE_ROUTINE Priority_bit_map_Control   _Priority_Mask_invert (
-  uint32_t   mask
-)
-{
-  return (Priority_bit_map_Control)(~mask);
-}
-
-
-/**
- * This function translates the bit numbers returned by the bit scan
- * of a priority bit field into something suitable for use as
- * a major or minor component of a priority.
- */
-
-RTEMS_INLINE_ROUTINE uint32_t   _Priority_Bits_index (
-  uint32_t   bit_number
-)
-{
-  return bit_number;
-}
-
-#endif
-
-/**
- * Priority Queue implemented by bit map
- */
-
-/**
- *  This is the minor bit map.
- */
-extern Priority_bit_map_Control _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
-
-/**
- * This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_bit_map_Handler_initialization( void )
-{
-  int index;
-
-  _Priority_Major_bit_map = 0;
-  for ( index=0 ; index <16 ; index++ )
-     _Priority_Bit_map[ index ] = 0;
-}
-
-/**
- * This routine uses the_priority_map to update the priority
- * bit maps to indicate that a thread has been readied.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_bit_map_Add (
-  Priority_bit_map_Information *the_priority_map
-)
-{
-  *the_priority_map->minor |= the_priority_map->ready_minor;
-  _Priority_Major_bit_map  |= the_priority_map->ready_major;
-}
-
-/**
- * This routine uses the_priority_map to update the priority
- * bit maps to indicate that a thread has been removed from the
- * ready state.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_bit_map_Remove (
-  Priority_bit_map_Information *the_priority_map
-)
-{
-  *the_priority_map->minor &= the_priority_map->block_minor;
-  if ( *the_priority_map->minor == 0 )
-    _Priority_Major_bit_map &= the_priority_map->block_major;
-}
-
-/**
- * This function returns the priority of the highest priority
- * ready thread.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Control _Priority_bit_map_Get_highest( void )
-{
-  Priority_bit_map_Control minor;
-  Priority_bit_map_Control major;
-
-  _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
-  _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
-
-  return (_Priority_Bits_index( major ) << 4) +
-          _Priority_Bits_index( minor );
-}
-
-/**
- * This routine initializes the_priority_map so that it
- * contains the information necessary to manage a thread
- * at new_priority.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_bit_map_Initialize_information(
-  Priority_bit_map_Information *the_priority_map,
-  Priority_Control      new_priority
-)
-{
-  Priority_bit_map_Control major;
-  Priority_bit_map_Control minor;
-  Priority_bit_map_Control mask;
-
-  major = _Priority_Major( new_priority );
-  minor = _Priority_Minor( new_priority );
-
-  the_priority_map->minor =
-    &_Priority_Bit_map[ _Priority_Bits_index(major) ];
-
-  mask = _Priority_Mask( major );
-  the_priority_map->ready_major = mask;
-  /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
-  the_priority_map->block_major = (Priority_bit_map_Control)(~((uint32_t)mask));
-
-  mask = _Priority_Mask( minor );
-  the_priority_map->ready_minor = mask;
-  /* Add _Priority_Mask_invert to non-generic bitfield then change this code. */
-  the_priority_map->block_minor = (Priority_bit_map_Control)(~((uint32_t)mask));
-}
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 9c28a2d..c8625fb 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -51,10 +51,6 @@ $(PROJECT_INCLUDE)/rtems/score/apimutex.h: include/rtems/score/apimutex.h $(PROJ
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/apimutex.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/apimutex.h
 
-$(PROJECT_INCLUDE)/rtems/score/bitfield.h: include/rtems/score/bitfield.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/bitfield.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/bitfield.h
-
 $(PROJECT_INCLUDE)/rtems/score/chain.h: include/rtems/score/chain.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chain.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chain.h
@@ -147,6 +143,10 @@ $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h: include/rtems/score/prioritybit
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
 
+$(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h: include/rtems/score/prioritybitmapimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h
+
 $(PROJECT_INCLUDE)/rtems/score/rbtree.h: include/rtems/score/rbtree.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.h
@@ -327,10 +327,6 @@ $(PROJECT_INCLUDE)/rtems/score/object.inl: inline/rtems/score/object.inl $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.inl
 
-$(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl: inline/rtems/score/prioritybitmap.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
-
 $(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl
diff --git a/cpukit/score/src/schedulerpriorityupdate.c b/cpukit/score/src/schedulerpriorityupdate.c
index c269414..aa54d31 100644
--- a/cpukit/score/src/schedulerpriorityupdate.c
+++ b/cpukit/score/src/schedulerpriorityupdate.c
@@ -18,12 +18,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/prioritybitmap.h>
-#include <rtems/score/scheduler.h>
-#include <rtems/score/schedulerpriority.h>
+#include <rtems/score/schedulerpriorityimpl.h>
 #include <rtems/score/thread.h>
 
 void _Scheduler_priority_Update(
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
index 2be2ea9..6bca2eb 100644
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -77,7 +77,7 @@ void print_formula(void);
 /*
  *  This assumes the default Priority Scheduler
  */
-#include <rtems/score/prioritybitmap.h>
+#include <rtems/score/prioritybitmapimpl.h>
 #include <rtems/score/schedulerpriority.h>
 
 /* Priority scheduling uninitialized (globals) consumption */




More information about the vc mailing list