validation: Reduce source code/rodata size

Use a common wording for the tests.  Use the new templates for action
requirements described in the RTEMS Software Engineering manual.

testsuites/validation/tc-barrier-create.c

@@ -71,6 +71,12 @@ typedef enum {
   RtemsBarrierReqCreate_Pre_Name_NA
 } RtemsBarrierReqCreate_Pre_Name;
 
+typedef enum {
+  RtemsBarrierReqCreate_Pre_Id_Valid,
+  RtemsBarrierReqCreate_Pre_Id_Null,
+  RtemsBarrierReqCreate_Pre_Id_NA
+} RtemsBarrierReqCreate_Pre_Id;
+
 typedef enum {
   RtemsBarrierReqCreate_Pre_Class_Default,
   RtemsBarrierReqCreate_Pre_Class_Manual,
@@ -84,12 +90,6 @@ typedef enum {
   RtemsBarrierReqCreate_Pre_MaxWait_NA
 } RtemsBarrierReqCreate_Pre_MaxWait;
 
-typedef enum {
-  RtemsBarrierReqCreate_Pre_Id_Valid,
-  RtemsBarrierReqCreate_Pre_Id_Null,
-  RtemsBarrierReqCreate_Pre_Id_NA
-} RtemsBarrierReqCreate_Pre_Id;
-
 typedef enum {
   RtemsBarrierReqCreate_Pre_Free_Yes,
   RtemsBarrierReqCreate_Pre_Free_No,
@@ -112,7 +112,6 @@ typedef enum {
 } RtemsBarrierReqCreate_Post_Name;
 
 typedef enum {
-  RtemsBarrierReqCreate_Post_Class_NoObj,
   RtemsBarrierReqCreate_Post_Class_Manual,
   RtemsBarrierReqCreate_Post_Class_Auto,
   RtemsBarrierReqCreate_Post_Class_NA
@@ -169,6 +168,12 @@ static const char * const RtemsBarrierReqCreate_PreDesc_Name[] = {
   "NA"
 };
 
+static const char * const RtemsBarrierReqCreate_PreDesc_Id[] = {
+  "Valid",
+  "Null",
+  "NA"
+};
+
 static const char * const RtemsBarrierReqCreate_PreDesc_Class[] = {
   "Default",
   "Manual",
@@ -182,12 +187,6 @@ static const char * const RtemsBarrierReqCreate_PreDesc_MaxWait[] = {
   "NA"
 };
 
-static const char * const RtemsBarrierReqCreate_PreDesc_Id[] = {
-  "Valid",
-  "Null",
-  "NA"
-};
-
 static const char * const RtemsBarrierReqCreate_PreDesc_Free[] = {
   "Yes",
   "No",
@@ -196,9 +195,9 @@ static const char * const RtemsBarrierReqCreate_PreDesc_Free[] = {
 
 static const char * const * const RtemsBarrierReqCreate_PreDesc[] = {
   RtemsBarrierReqCreate_PreDesc_Name,
+  RtemsBarrierReqCreate_PreDesc_Id,
   RtemsBarrierReqCreate_PreDesc_Class,
   RtemsBarrierReqCreate_PreDesc_MaxWait,
-  RtemsBarrierReqCreate_PreDesc_Id,
   RtemsBarrierReqCreate_PreDesc_Free,
   NULL
 };
@@ -251,7 +250,7 @@ static void RtemsBarrierReqCreate_Pre_Name_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_Name_Valid: {
       /*
-       * The ``name`` parameter shall be valid.
+       * While the ``name`` parameter is valid.
        */
       ctx->name = NAME;
       break;
@@ -259,7 +258,7 @@ static void RtemsBarrierReqCreate_Pre_Name_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Name_Invalid: {
       /*
-       * The ``name`` parameter shall be invalid.
+       * While the ``name`` parameter is invalid.
        */
       ctx->name = 0;
       break;
@@ -270,6 +269,33 @@ static void RtemsBarrierReqCreate_Pre_Name_Prepare(
   }
 }
 
+static void RtemsBarrierReqCreate_Pre_Id_Prepare(
+  RtemsBarrierReqCreate_Context *ctx,
+  RtemsBarrierReqCreate_Pre_Id   state
+)
+{
+  switch ( state ) {
+    case RtemsBarrierReqCreate_Pre_Id_Valid: {
+      /*
+       * While the ``id`` parameter references an object of type rtems_id.
+       */
+      ctx->id = &ctx->id_value;
+      break;
+    }
+
+    case RtemsBarrierReqCreate_Pre_Id_Null: {
+      /*
+       * While the ``id`` parameter is NULL.
+       */
+      ctx->id = NULL;
+      break;
+    }
+
+    case RtemsBarrierReqCreate_Pre_Id_NA:
+      break;
+  }
+}
+
 static void RtemsBarrierReqCreate_Pre_Class_Prepare(
   RtemsBarrierReqCreate_Context  *ctx,
   RtemsBarrierReqCreate_Pre_Class state
@@ -278,7 +304,7 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_Class_Default: {
       /*
-       * The ``attribute_set`` parameter shall specify the default class.
+       * While the ``attribute_set`` parameter specifies the default class.
        */
       /* Nothing to do */
       break;
@@ -286,7 +312,7 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Class_Manual: {
       /*
-       * The ``attribute_set`` parameter shall specify the manual release
+       * While the ``attribute_set`` parameter specifies the manual release
        * class.
        */
       ctx->attribute_set |= RTEMS_BARRIER_MANUAL_RELEASE;
@@ -295,7 +321,7 @@ static void RtemsBarrierReqCreate_Pre_Class_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Class_Auto: {
       /*
-       * The ``attribute_set`` parameter shall specify the automatic release
+       * While the ``attribute_set`` parameter specifies the automatic release
        * class.
        */
       ctx->attribute_set |= RTEMS_BARRIER_AUTOMATIC_RELEASE;
@@ -315,7 +341,7 @@ static void RtemsBarrierReqCreate_Pre_MaxWait_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_MaxWait_Zero: {
       /*
-       * The ``maximum_waiters`` parameter shall be zero.
+       * While the ``maximum_waiters`` parameter is zero.
        */
       ctx->maximum_waiters = 0;
       break;
@@ -323,7 +349,7 @@ static void RtemsBarrierReqCreate_Pre_MaxWait_Prepare(
 
     case RtemsBarrierReqCreate_Pre_MaxWait_Positive: {
       /*
-       * The ``maximum_waiters`` parameter shall be positive.
+       * While the ``maximum_waiters`` parameter is positive.
        */
       ctx->maximum_waiters = 1;
       break;
@@ -334,33 +360,6 @@ static void RtemsBarrierReqCreate_Pre_MaxWait_Prepare(
   }
 }
 
-static void RtemsBarrierReqCreate_Pre_Id_Prepare(
-  RtemsBarrierReqCreate_Context *ctx,
-  RtemsBarrierReqCreate_Pre_Id   state
-)
-{
-  switch ( state ) {
-    case RtemsBarrierReqCreate_Pre_Id_Valid: {
-      /*
-       * The ``id`` parameter shall reference an object of type rtems_id.
-       */
-      ctx->id = &ctx->id_value;
-      break;
-    }
-
-    case RtemsBarrierReqCreate_Pre_Id_Null: {
-      /*
-       * The ``id`` parameter shall be NULL.
-       */
-      ctx->id = NULL;
-      break;
-    }
-
-    case RtemsBarrierReqCreate_Pre_Id_NA:
-      break;
-  }
-}
-
 static void RtemsBarrierReqCreate_Pre_Free_Prepare(
   RtemsBarrierReqCreate_Context *ctx,
   RtemsBarrierReqCreate_Pre_Free state
@@ -369,7 +368,7 @@ static void RtemsBarrierReqCreate_Pre_Free_Prepare(
   switch ( state ) {
     case RtemsBarrierReqCreate_Pre_Free_Yes: {
       /*
-       * The system shall have at least one inactive barrier object available.
+       * While the system has at least one inactive barrier object available.
        */
       /* Nothing to do */
       break;
@@ -377,7 +376,7 @@ static void RtemsBarrierReqCreate_Pre_Free_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Free_No: {
       /*
-       * The system shall not have an inactive barrier object available.
+       * While the system has no inactive barrier object available.
        */
       ctx->seized_objects = T_seize_objects( Create, NULL );
       break;
@@ -485,18 +484,10 @@ static void RtemsBarrierReqCreate_Post_Class_Check(
   rtems_status_code sc;
 
   switch ( state ) {
-    case RtemsBarrierReqCreate_Post_Class_NoObj: {
-      /*
-       * The barrier class is not applicable since there was no barrier
-       * created.
-       */
-      /* Not applicable */
-      break;
-    }
-
     case RtemsBarrierReqCreate_Post_Class_Manual: {
       /*
-       * The class of the barrier shall be manual release.
+       * The class of the barrier created by the rtems_barrier_create() call
+       * shall be manual release.
        */
       sc = rtems_barrier_wait( ctx->id_value, RTEMS_NO_TIMEOUT );
       T_rsc_success( sc );
@@ -508,7 +499,8 @@ static void RtemsBarrierReqCreate_Post_Class_Check(
 
     case RtemsBarrierReqCreate_Post_Class_Auto: {
       /*
-       * The class of the barrier shall be automatic release.
+       * The class of the barrier created by the rtems_barrier_create() call
+       * shall be automatic release.
        */
       sc = rtems_barrier_wait( ctx->id_value, RTEMS_NO_TIMEOUT );
       T_rsc_success( sc );
@@ -605,378 +597,6 @@ static void RtemsBarrierReqCreate_Teardown_Wrap( void *arg )
   RtemsBarrierReqCreate_Teardown( ctx );
 }
 
-static size_t RtemsBarrierReqCreate_Scope( void *arg, char *buf, size_t n )
-{
-  RtemsBarrierReqCreate_Context *ctx;
-
-  ctx = arg;
-
-  if ( ctx->in_action_loop ) {
-    return T_get_scope( RtemsBarrierReqCreate_PreDesc, buf, n, ctx->pcs );
-  }
-
-  return 0;
-}
-
-static T_fixture RtemsBarrierReqCreate_Fixture = {
-  .setup = RtemsBarrierReqCreate_Setup_Wrap,
-  .stop = NULL,
-  .teardown = RtemsBarrierReqCreate_Teardown_Wrap,
-  .scope = RtemsBarrierReqCreate_Scope,
-  .initial_context = &RtemsBarrierReqCreate_Instance
-};
-
-static const uint8_t RtemsBarrierReqCreate_TransitionMap[][ 4 ] = {
-  {
-    RtemsBarrierReqCreate_Post_Status_Ok,
-    RtemsBarrierReqCreate_Post_Name_Valid,
-    RtemsBarrierReqCreate_Post_Class_Manual,
-    RtemsBarrierReqCreate_Post_IdVar_Set
-  }, {
-    RtemsBarrierReqCreate_Post_Status_TooMany,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_Ok,
-    RtemsBarrierReqCreate_Post_Name_Valid,
-    RtemsBarrierReqCreate_Post_Class_Manual,
-    RtemsBarrierReqCreate_Post_IdVar_Set
-  }, {
-    RtemsBarrierReqCreate_Post_Status_TooMany,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_Ok,
-    RtemsBarrierReqCreate_Post_Name_Valid,
-    RtemsBarrierReqCreate_Post_Class_Manual,
-    RtemsBarrierReqCreate_Post_IdVar_Set
-  }, {
-    RtemsBarrierReqCreate_Post_Status_TooMany,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_Ok,
-    RtemsBarrierReqCreate_Post_Name_Valid,
-    RtemsBarrierReqCreate_Post_Class_Manual,
-    RtemsBarrierReqCreate_Post_IdVar_Set
-  }, {
-    RtemsBarrierReqCreate_Post_Status_TooMany,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvNum,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvNum,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_Ok,
-    RtemsBarrierReqCreate_Post_Name_Valid,
-    RtemsBarrierReqCreate_Post_Class_Auto,
-    RtemsBarrierReqCreate_Post_IdVar_Set
-  }, {
-    RtemsBarrierReqCreate_Post_Status_TooMany,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvAddr,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }, {
-    RtemsBarrierReqCreate_Post_Status_InvName,
-    RtemsBarrierReqCreate_Post_Name_Invalid,
-    RtemsBarrierReqCreate_Post_Class_NoObj,
-    RtemsBarrierReqCreate_Post_IdVar_Nop
-  }
-};
-
-static const struct {
-  uint8_t Skip : 1;
-  uint8_t Pre_Name_NA : 1;
-  uint8_t Pre_Class_NA : 1;
-  uint8_t Pre_MaxWait_NA : 1;
-  uint8_t Pre_Id_NA : 1;
-  uint8_t Pre_Free_NA : 1;
-} RtemsBarrierReqCreate_TransitionInfo[] = {
-  {
-    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, 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, 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
-  }
-};
-
 static void RtemsBarrierReqCreate_Action( RtemsBarrierReqCreate_Context *ctx )
 {
   ctx->status = rtems_barrier_create(
@@ -1001,12 +621,85 @@ static void RtemsBarrierReqCreate_Cleanup( RtemsBarrierReqCreate_Context *ctx )
   T_surrender_objects( &ctx->seized_objects, rtems_barrier_delete );
 }
 
+typedef struct {
+  uint16_t Skip : 1;
+  uint16_t Pre_Name_NA : 1;
+  uint16_t Pre_Id_NA : 1;
+  uint16_t Pre_Class_NA : 1;
+  uint16_t Pre_MaxWait_NA : 1;
+  uint16_t Pre_Free_NA : 1;
+  uint16_t Post_Status : 3;
+  uint16_t Post_Name : 2;
+  uint16_t Post_Class : 2;
+  uint16_t Post_IdVar : 2;
+} RtemsBarrierReqCreate_Entry;
+
+static const RtemsBarrierReqCreate_Entry
+RtemsBarrierReqCreate_Entries[] = {
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_InvName,
+    RtemsBarrierReqCreate_Post_Name_Invalid,
+    RtemsBarrierReqCreate_Post_Class_NA, RtemsBarrierReqCreate_Post_IdVar_Nop },
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_InvAddr,
+    RtemsBarrierReqCreate_Post_Name_Invalid,
+    RtemsBarrierReqCreate_Post_Class_NA, RtemsBarrierReqCreate_Post_IdVar_Nop },
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_TooMany,
+    RtemsBarrierReqCreate_Post_Name_Invalid,
+    RtemsBarrierReqCreate_Post_Class_NA, RtemsBarrierReqCreate_Post_IdVar_Nop },
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_Ok,
+    RtemsBarrierReqCreate_Post_Name_Valid,
+    RtemsBarrierReqCreate_Post_Class_Manual,
+    RtemsBarrierReqCreate_Post_IdVar_Set },
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_InvNum,
+    RtemsBarrierReqCreate_Post_Name_Invalid,
+    RtemsBarrierReqCreate_Post_Class_NA, RtemsBarrierReqCreate_Post_IdVar_Nop },
+  { 0, 0, 0, 0, 0, 0, RtemsBarrierReqCreate_Post_Status_Ok,
+    RtemsBarrierReqCreate_Post_Name_Valid,
+    RtemsBarrierReqCreate_Post_Class_Auto, RtemsBarrierReqCreate_Post_IdVar_Set }
+};
+
+static const uint8_t
+RtemsBarrierReqCreate_Map[] = {
+  3, 2, 3, 2, 3, 2, 3, 2, 4, 4, 5, 2, 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
+};
+
+static size_t RtemsBarrierReqCreate_Scope( void *arg, char *buf, size_t n )
+{
+  RtemsBarrierReqCreate_Context *ctx;
+
+  ctx = arg;
+
+  if ( ctx->in_action_loop ) {
+    return T_get_scope( RtemsBarrierReqCreate_PreDesc, buf, n, ctx->pcs );
+  }
+
+  return 0;
+}
+
+static T_fixture RtemsBarrierReqCreate_Fixture = {
+  .setup = RtemsBarrierReqCreate_Setup_Wrap,
+  .stop = NULL,
+  .teardown = RtemsBarrierReqCreate_Teardown_Wrap,
+  .scope = RtemsBarrierReqCreate_Scope,
+  .initial_context = &RtemsBarrierReqCreate_Instance
+};
+
+static inline RtemsBarrierReqCreate_Entry RtemsBarrierReqCreate_GetEntry(
+  size_t index
+)
+{
+  return RtemsBarrierReqCreate_Entries[
+    RtemsBarrierReqCreate_Map[ index ]
+  ];
+}
+
 /**
  * @fn void T_case_body_RtemsBarrierReqCreate( void )
  */
 T_TEST_CASE_FIXTURE( RtemsBarrierReqCreate, &RtemsBarrierReqCreate_Fixture )
 {
   RtemsBarrierReqCreate_Context *ctx;
+  RtemsBarrierReqCreate_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -1018,48 +711,56 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqCreate, &RtemsBarrierReqCreate_Fixture )
     ctx->pcs[ 0 ] < RtemsBarrierReqCreate_Pre_Name_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Pre_Name_NA ) {
+    entry = RtemsBarrierReqCreate_GetEntry( index );
+
+    if ( entry.Pre_Name_NA ) {
       ctx->pcs[ 0 ] = RtemsBarrierReqCreate_Pre_Name_NA;
       index += ( RtemsBarrierReqCreate_Pre_Name_NA - 1 )
+        * RtemsBarrierReqCreate_Pre_Id_NA
         * RtemsBarrierReqCreate_Pre_Class_NA
         * RtemsBarrierReqCreate_Pre_MaxWait_NA
-        * RtemsBarrierReqCreate_Pre_Id_NA
         * RtemsBarrierReqCreate_Pre_Free_NA;
     }
 
     for (
-      ctx->pcs[ 1 ] = RtemsBarrierReqCreate_Pre_Class_Default;
+      ctx->pcs[ 1 ] = RtemsBarrierReqCreate_Pre_Id_Valid;
-      ctx->pcs[ 1 ] < RtemsBarrierReqCreate_Pre_Class_NA;
+      ctx->pcs[ 1 ] < RtemsBarrierReqCreate_Pre_Id_NA;
       ++ctx->pcs[ 1 ]
     ) {
-      if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Pre_Class_NA ) {
+      entry = RtemsBarrierReqCreate_GetEntry( index );
-        ctx->pcs[ 1 ] = RtemsBarrierReqCreate_Pre_Class_NA;
+
-        index += ( RtemsBarrierReqCreate_Pre_Class_NA - 1 )
+      if ( entry.Pre_Id_NA ) {
+        ctx->pcs[ 1 ] = RtemsBarrierReqCreate_Pre_Id_NA;
+        index += ( RtemsBarrierReqCreate_Pre_Id_NA - 1 )
+          * RtemsBarrierReqCreate_Pre_Class_NA
           * RtemsBarrierReqCreate_Pre_MaxWait_NA
-          * RtemsBarrierReqCreate_Pre_Id_NA
           * RtemsBarrierReqCreate_Pre_Free_NA;
       }
 
       for (
-        ctx->pcs[ 2 ] = RtemsBarrierReqCreate_Pre_MaxWait_Zero;
+        ctx->pcs[ 2 ] = RtemsBarrierReqCreate_Pre_Class_Default;
-        ctx->pcs[ 2 ] < RtemsBarrierReqCreate_Pre_MaxWait_NA;
+        ctx->pcs[ 2 ] < RtemsBarrierReqCreate_Pre_Class_NA;
         ++ctx->pcs[ 2 ]
       ) {
-        if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Pre_MaxWait_NA ) {
+        entry = RtemsBarrierReqCreate_GetEntry( index );
-          ctx->pcs[ 2 ] = RtemsBarrierReqCreate_Pre_MaxWait_NA;
+
-          index += ( RtemsBarrierReqCreate_Pre_MaxWait_NA - 1 )
+        if ( entry.Pre_Class_NA ) {
-            * RtemsBarrierReqCreate_Pre_Id_NA
+          ctx->pcs[ 2 ] = RtemsBarrierReqCreate_Pre_Class_NA;
+          index += ( RtemsBarrierReqCreate_Pre_Class_NA - 1 )
+            * RtemsBarrierReqCreate_Pre_MaxWait_NA
             * RtemsBarrierReqCreate_Pre_Free_NA;
         }
 
         for (
-          ctx->pcs[ 3 ] = RtemsBarrierReqCreate_Pre_Id_Valid;
+          ctx->pcs[ 3 ] = RtemsBarrierReqCreate_Pre_MaxWait_Zero;
-          ctx->pcs[ 3 ] < RtemsBarrierReqCreate_Pre_Id_NA;
+          ctx->pcs[ 3 ] < RtemsBarrierReqCreate_Pre_MaxWait_NA;
           ++ctx->pcs[ 3 ]
         ) {
-          if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Pre_Id_NA ) {
+          entry = RtemsBarrierReqCreate_GetEntry( index );
-            ctx->pcs[ 3 ] = RtemsBarrierReqCreate_Pre_Id_NA;
+
-            index += ( RtemsBarrierReqCreate_Pre_Id_NA - 1 )
+          if ( entry.Pre_MaxWait_NA ) {
+            ctx->pcs[ 3 ] = RtemsBarrierReqCreate_Pre_MaxWait_NA;
+            index += ( RtemsBarrierReqCreate_Pre_MaxWait_NA - 1 )
               * RtemsBarrierReqCreate_Pre_Free_NA;
           }
 
@@ -1068,38 +769,28 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqCreate, &RtemsBarrierReqCreate_Fixture )
             ctx->pcs[ 4 ] < RtemsBarrierReqCreate_Pre_Free_NA;
             ++ctx->pcs[ 4 ]
           ) {
-            if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Pre_Free_NA ) {
+            entry = RtemsBarrierReqCreate_GetEntry( index );
+
+            if ( entry.Pre_Free_NA ) {
               ctx->pcs[ 4 ] = RtemsBarrierReqCreate_Pre_Free_NA;
               index += ( RtemsBarrierReqCreate_Pre_Free_NA - 1 );
             }
 
-            if ( RtemsBarrierReqCreate_TransitionInfo[ index ].Skip ) {
+            if ( entry.Skip ) {
               ++index;
               continue;
             }
 
             RtemsBarrierReqCreate_Pre_Name_Prepare( ctx, ctx->pcs[ 0 ] );
-            RtemsBarrierReqCreate_Pre_Class_Prepare( ctx, ctx->pcs[ 1 ] );
+            RtemsBarrierReqCreate_Pre_Id_Prepare( ctx, ctx->pcs[ 1 ] );
-            RtemsBarrierReqCreate_Pre_MaxWait_Prepare( ctx, ctx->pcs[ 2 ] );
+            RtemsBarrierReqCreate_Pre_Class_Prepare( ctx, ctx->pcs[ 2 ] );
-            RtemsBarrierReqCreate_Pre_Id_Prepare( ctx, ctx->pcs[ 3 ] );
+            RtemsBarrierReqCreate_Pre_MaxWait_Prepare( ctx, ctx->pcs[ 3 ] );
             RtemsBarrierReqCreate_Pre_Free_Prepare( ctx, ctx->pcs[ 4 ] );
             RtemsBarrierReqCreate_Action( ctx );
-            RtemsBarrierReqCreate_Post_Status_Check(
+            RtemsBarrierReqCreate_Post_Status_Check( ctx, entry.Post_Status );
-              ctx,
+            RtemsBarrierReqCreate_Post_Name_Check( ctx, entry.Post_Name );
-              RtemsBarrierReqCreate_TransitionMap[ index ][ 0 ]
+            RtemsBarrierReqCreate_Post_Class_Check( ctx, entry.Post_Class );
-            );
+            RtemsBarrierReqCreate_Post_IdVar_Check( ctx, entry.Post_IdVar );
-            RtemsBarrierReqCreate_Post_Name_Check(
-              ctx,
-              RtemsBarrierReqCreate_TransitionMap[ index ][ 1 ]
-            );
-            RtemsBarrierReqCreate_Post_Class_Check(
-              ctx,
-              RtemsBarrierReqCreate_TransitionMap[ index ][ 2 ]
-            );
-            RtemsBarrierReqCreate_Post_IdVar_Check(
-              ctx,
-              RtemsBarrierReqCreate_TransitionMap[ index ][ 3 ]
-            );
             RtemsBarrierReqCreate_Cleanup( ctx );
             ++index;
           }

testsuites/validation/tc-barrier-delete.c

@@ -184,7 +184,7 @@ static void RtemsBarrierReqDelete_Pre_Id_Prepare(
   switch ( state ) {
     case RtemsBarrierReqDelete_Pre_Id_NoObj: {
       /*
-       * The ``id`` parameter shall not be associated with a barrier.
+       * While the ``id`` parameter is not associated with a barrier.
        */
       ctx->id = 0;
       break;
@@ -192,7 +192,7 @@ static void RtemsBarrierReqDelete_Pre_Id_Prepare(
 
     case RtemsBarrierReqDelete_Pre_Id_Barrier: {
       /*
-       * The ``id`` parameter shall be associated with a barrier.
+       * While the ``id`` parameter is associated with a barrier.
        */
       ctx->id = ctx->barrier_id;
       break;
@@ -355,50 +355,6 @@ static void RtemsBarrierReqDelete_Teardown_Wrap( void *arg )
   RtemsBarrierReqDelete_Teardown( ctx );
 }
 
-static size_t RtemsBarrierReqDelete_Scope( void *arg, char *buf, size_t n )
-{
-  RtemsBarrierReqDelete_Context *ctx;
-
-  ctx = arg;
-
-  if ( ctx->in_action_loop ) {
-    return T_get_scope( RtemsBarrierReqDelete_PreDesc, buf, n, ctx->pcs );
-  }
-
-  return 0;
-}
-
-static T_fixture RtemsBarrierReqDelete_Fixture = {
-  .setup = RtemsBarrierReqDelete_Setup_Wrap,
-  .stop = NULL,
-  .teardown = RtemsBarrierReqDelete_Teardown_Wrap,
-  .scope = RtemsBarrierReqDelete_Scope,
-  .initial_context = &RtemsBarrierReqDelete_Instance
-};
-
-static const uint8_t RtemsBarrierReqDelete_TransitionMap[][ 3 ] = {
-  {
-    RtemsBarrierReqDelete_Post_Status_InvId,
-    RtemsBarrierReqDelete_Post_Name_Valid,
-    RtemsBarrierReqDelete_Post_Flush_No
-  }, {
-    RtemsBarrierReqDelete_Post_Status_Ok,
-    RtemsBarrierReqDelete_Post_Name_Invalid,
-    RtemsBarrierReqDelete_Post_Flush_Yes
-  }
-};
-
-static const struct {
-  uint8_t Skip : 1;
-  uint8_t Pre_Id_NA : 1;
-} RtemsBarrierReqDelete_TransitionInfo[] = {
-  {
-    0, 0
-  }, {
-    0, 0
-  }
-};
-
 static void RtemsBarrierReqDelete_Prepare( RtemsBarrierReqDelete_Context *ctx )
 {
   rtems_status_code   sc;
@@ -430,12 +386,65 @@ static void RtemsBarrierReqDelete_Cleanup( RtemsBarrierReqDelete_Context *ctx )
   }
 }
 
+typedef struct {
+  uint8_t Skip : 1;
+  uint8_t Pre_Id_NA : 1;
+  uint8_t Post_Status : 2;
+  uint8_t Post_Name : 2;
+  uint8_t Post_Flush : 2;
+} RtemsBarrierReqDelete_Entry;
+
+static const RtemsBarrierReqDelete_Entry
+RtemsBarrierReqDelete_Entries[] = {
+  { 0, 0, RtemsBarrierReqDelete_Post_Status_InvId,
+    RtemsBarrierReqDelete_Post_Name_Valid, RtemsBarrierReqDelete_Post_Flush_No },
+  { 0, 0, RtemsBarrierReqDelete_Post_Status_Ok,
+    RtemsBarrierReqDelete_Post_Name_Invalid,
+    RtemsBarrierReqDelete_Post_Flush_Yes }
+};
+
+static const uint8_t
+RtemsBarrierReqDelete_Map[] = {
+  0, 1
+};
+
+static size_t RtemsBarrierReqDelete_Scope( void *arg, char *buf, size_t n )
+{
+  RtemsBarrierReqDelete_Context *ctx;
+
+  ctx = arg;
+
+  if ( ctx->in_action_loop ) {
+    return T_get_scope( RtemsBarrierReqDelete_PreDesc, buf, n, ctx->pcs );
+  }
+
+  return 0;
+}
+
+static T_fixture RtemsBarrierReqDelete_Fixture = {
+  .setup = RtemsBarrierReqDelete_Setup_Wrap,
+  .stop = NULL,
+  .teardown = RtemsBarrierReqDelete_Teardown_Wrap,
+  .scope = RtemsBarrierReqDelete_Scope,
+  .initial_context = &RtemsBarrierReqDelete_Instance
+};
+
+static inline RtemsBarrierReqDelete_Entry RtemsBarrierReqDelete_GetEntry(
+  size_t index
+)
+{
+  return RtemsBarrierReqDelete_Entries[
+    RtemsBarrierReqDelete_Map[ index ]
+  ];
+}
+
 /**
  * @fn void T_case_body_RtemsBarrierReqDelete( void )
  */
 T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
 {
   RtemsBarrierReqDelete_Context *ctx;
+  RtemsBarrierReqDelete_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -447,12 +456,14 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
     ctx->pcs[ 0 ] < RtemsBarrierReqDelete_Pre_Id_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    if ( RtemsBarrierReqDelete_TransitionInfo[ index ].Pre_Id_NA ) {
+    entry = RtemsBarrierReqDelete_GetEntry( index );
+
+    if ( entry.Pre_Id_NA ) {
       ctx->pcs[ 0 ] = RtemsBarrierReqDelete_Pre_Id_NA;
       index += ( RtemsBarrierReqDelete_Pre_Id_NA - 1 );
     }
 
-    if ( RtemsBarrierReqDelete_TransitionInfo[ index ].Skip ) {
+    if ( entry.Skip ) {
       ++index;
       continue;
     }
@@ -460,18 +471,9 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
     RtemsBarrierReqDelete_Prepare( ctx );
     RtemsBarrierReqDelete_Pre_Id_Prepare( ctx, ctx->pcs[ 0 ] );
     RtemsBarrierReqDelete_Action( ctx );
-    RtemsBarrierReqDelete_Post_Status_Check(
+    RtemsBarrierReqDelete_Post_Status_Check( ctx, entry.Post_Status );
-      ctx,
+    RtemsBarrierReqDelete_Post_Name_Check( ctx, entry.Post_Name );
-      RtemsBarrierReqDelete_TransitionMap[ index ][ 0 ]
+    RtemsBarrierReqDelete_Post_Flush_Check( ctx, entry.Post_Flush );
-    );
-    RtemsBarrierReqDelete_Post_Name_Check(
-      ctx,
-      RtemsBarrierReqDelete_TransitionMap[ index ][ 1 ]
-    );
-    RtemsBarrierReqDelete_Post_Flush_Check(
-      ctx,
-      RtemsBarrierReqDelete_TransitionMap[ index ][ 2 ]
-    );
     RtemsBarrierReqDelete_Cleanup( ctx );
     ++index;
   }

testsuites/validation/tc-barrier-release.c

@@ -214,7 +214,7 @@ static void RtemsBarrierReqRelease_Pre_Id_Prepare(
   switch ( state ) {
     case RtemsBarrierReqRelease_Pre_Id_NoObj: {
       /*
-       * The ``id`` parameter shall not be associated with a barrier.
+       * While the ``id`` parameter is not associated with a barrier.
        */
       ctx->id = 0xffffffff;
       break;
@@ -222,7 +222,7 @@ static void RtemsBarrierReqRelease_Pre_Id_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Id_Manual: {
       /*
-       * The ``id`` parameter shall be associated with a manual release
+       * While the ``id`` parameter is associated with a manual release
        * barrier.
        */
       ctx->id = ctx->manual_release_id;
@@ -231,7 +231,7 @@ static void RtemsBarrierReqRelease_Pre_Id_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Id_Auto: {
       /*
-       * The ``id`` parameter shall be associated with an automatic release
+       * While the ``id`` parameter is associated with an automatic release
        * barrier.
        */
       ctx->id = ctx->auto_release_id;
@@ -253,7 +253,8 @@ static void RtemsBarrierReqRelease_Pre_Released_Prepare(
   switch ( state ) {
     case RtemsBarrierReqRelease_Pre_Released_Valid: {
       /*
-       * The ``released`` parameter shall reference an object of type uint32_t.
+       * While the ``released`` parameter references an object of type
+       * uint32_t.
        */
       ctx->released = &ctx->released_value;
       break;
@@ -261,7 +262,7 @@ static void RtemsBarrierReqRelease_Pre_Released_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Released_Null: {
       /*
-       * The ``released`` parameter shall be NULL.
+       * While the ``released`` parameter is NULL.
        */
       ctx->released = NULL;
       break;
@@ -280,7 +281,7 @@ static void RtemsBarrierReqRelease_Pre_Waiting_Prepare(
   switch ( state ) {
     case RtemsBarrierReqRelease_Pre_Waiting_Zero: {
       /*
-       * The number of tasks waiting at the barrier shall be zero.
+       * While the number of tasks waiting at the barrier is zero.
        */
       ctx->waiting_tasks = 0;
       break;
@@ -288,7 +289,7 @@ static void RtemsBarrierReqRelease_Pre_Waiting_Prepare(
 
     case RtemsBarrierReqRelease_Pre_Waiting_Positive: {
       /*
-       * The number of tasks waiting at the barrier shall be positive.
+       * While the number of tasks waiting at the barrier is positive.
        */
       ctx->waiting_tasks = 1;
       SendEvents( ctx->worker_id, EVENT_WAIT );
@@ -461,6 +462,37 @@ static void RtemsBarrierReqRelease_Teardown_Wrap( void *arg )
   RtemsBarrierReqRelease_Teardown( ctx );
 }
 
+static void RtemsBarrierReqRelease_Action(
+  RtemsBarrierReqRelease_Context *ctx
+)
+{
+  ctx->status = rtems_barrier_release( ctx->id, ctx->released );
+}
+
+typedef struct {
+  uint8_t Skip : 1;
+  uint8_t Pre_Id_NA : 1;
+  uint8_t Pre_Released_NA : 1;
+  uint8_t Pre_Waiting_NA : 1;
+  uint8_t Post_Status : 2;
+  uint8_t Post_ReleasedVar : 2;
+} RtemsBarrierReqRelease_Entry;
+
+static const RtemsBarrierReqRelease_Entry
+RtemsBarrierReqRelease_Entries[] = {
+  { 0, 0, 0, 1, RtemsBarrierReqRelease_Post_Status_InvAddr,
+    RtemsBarrierReqRelease_Post_ReleasedVar_Nop },
+  { 0, 0, 0, 0, RtemsBarrierReqRelease_Post_Status_Ok,
+    RtemsBarrierReqRelease_Post_ReleasedVar_Set },
+  { 0, 0, 0, 1, RtemsBarrierReqRelease_Post_Status_InvId,
+    RtemsBarrierReqRelease_Post_ReleasedVar_Nop }
+};
+
+static const uint8_t
+RtemsBarrierReqRelease_Map[] = {
+  2, 2, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0
+};
+
 static size_t RtemsBarrierReqRelease_Scope( void *arg, char *buf, size_t n )
 {
   RtemsBarrierReqRelease_Context *ctx;
@@ -482,84 +514,13 @@ static T_fixture RtemsBarrierReqRelease_Fixture = {
   .initial_context = &RtemsBarrierReqRelease_Instance
 };
 
-static const uint8_t RtemsBarrierReqRelease_TransitionMap[][ 2 ] = {
+static inline RtemsBarrierReqRelease_Entry RtemsBarrierReqRelease_GetEntry(
-  {
+  size_t index
-    RtemsBarrierReqRelease_Post_Status_InvId,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvId,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_Ok,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Set
-  }, {
-    RtemsBarrierReqRelease_Post_Status_Ok,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Set
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_Ok,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Set
-  }, {
-    RtemsBarrierReqRelease_Post_Status_Ok,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Set
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }, {
-    RtemsBarrierReqRelease_Post_Status_InvAddr,
-    RtemsBarrierReqRelease_Post_ReleasedVar_Nop
-  }
-};
-
-static const struct {
-  uint8_t Skip : 1;
-  uint8_t Pre_Id_NA : 1;
-  uint8_t Pre_Released_NA : 1;
-  uint8_t Pre_Waiting_NA : 1;
-} RtemsBarrierReqRelease_TransitionInfo[] = {
-  {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 1
-  }, {
-    0, 0, 0, 1
-  }
-};
-
-static void RtemsBarrierReqRelease_Action(
-  RtemsBarrierReqRelease_Context *ctx
 )
 {
-  ctx->status = rtems_barrier_release( ctx->id, ctx->released );
+  return RtemsBarrierReqRelease_Entries[
+    RtemsBarrierReqRelease_Map[ index ]
+  ];
 }
 
 /**
@@ -568,6 +529,7 @@ static void RtemsBarrierReqRelease_Action(
 T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
 {
   RtemsBarrierReqRelease_Context *ctx;
+  RtemsBarrierReqRelease_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -579,7 +541,9 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
     ctx->pcs[ 0 ] < RtemsBarrierReqRelease_Pre_Id_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    if ( RtemsBarrierReqRelease_TransitionInfo[ index ].Pre_Id_NA ) {
+    entry = RtemsBarrierReqRelease_GetEntry( index );
+
+    if ( entry.Pre_Id_NA ) {
       ctx->pcs[ 0 ] = RtemsBarrierReqRelease_Pre_Id_NA;
       index += ( RtemsBarrierReqRelease_Pre_Id_NA - 1 )
         * RtemsBarrierReqRelease_Pre_Released_NA
@@ -591,7 +555,9 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
       ctx->pcs[ 1 ] < RtemsBarrierReqRelease_Pre_Released_NA;
       ++ctx->pcs[ 1 ]
     ) {
-      if ( RtemsBarrierReqRelease_TransitionInfo[ index ].Pre_Released_NA ) {
+      entry = RtemsBarrierReqRelease_GetEntry( index );
+
+      if ( entry.Pre_Released_NA ) {
         ctx->pcs[ 1 ] = RtemsBarrierReqRelease_Pre_Released_NA;
         index += ( RtemsBarrierReqRelease_Pre_Released_NA - 1 )
           * RtemsBarrierReqRelease_Pre_Waiting_NA;
@@ -602,12 +568,14 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
         ctx->pcs[ 2 ] < RtemsBarrierReqRelease_Pre_Waiting_NA;
         ++ctx->pcs[ 2 ]
       ) {
-        if ( RtemsBarrierReqRelease_TransitionInfo[ index ].Pre_Waiting_NA ) {
+        entry = RtemsBarrierReqRelease_GetEntry( index );
+
+        if ( entry.Pre_Waiting_NA ) {
           ctx->pcs[ 2 ] = RtemsBarrierReqRelease_Pre_Waiting_NA;
           index += ( RtemsBarrierReqRelease_Pre_Waiting_NA - 1 );
         }
 
-        if ( RtemsBarrierReqRelease_TransitionInfo[ index ].Skip ) {
+        if ( entry.Skip ) {
           ++index;
           continue;
         }
@@ -616,13 +584,10 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
         RtemsBarrierReqRelease_Pre_Released_Prepare( ctx, ctx->pcs[ 1 ] );
         RtemsBarrierReqRelease_Pre_Waiting_Prepare( ctx, ctx->pcs[ 2 ] );
         RtemsBarrierReqRelease_Action( ctx );
-        RtemsBarrierReqRelease_Post_Status_Check(
+        RtemsBarrierReqRelease_Post_Status_Check( ctx, entry.Post_Status );
-          ctx,
-          RtemsBarrierReqRelease_TransitionMap[ index ][ 0 ]
-        );
         RtemsBarrierReqRelease_Post_ReleasedVar_Check(
           ctx,
-          RtemsBarrierReqRelease_TransitionMap[ index ][ 1 ]
+          entry.Post_ReleasedVar
         );
         ++index;
       }

testsuites/validation/tc-barrier-wait.c

@@ -264,7 +264,7 @@ static void RtemsBarrierReqWait_Pre_Id_Prepare(
   switch ( state ) {
     case RtemsBarrierReqWait_Pre_Id_NoObj: {
       /*
-       * The ``id`` parameter shall not be associated with a barrier.
+       * While the ``id`` parameter is not associated with a barrier.
        */
       ctx->id = 0xffffffff;
       break;
@@ -272,7 +272,7 @@ static void RtemsBarrierReqWait_Pre_Id_Prepare(
 
     case RtemsBarrierReqWait_Pre_Id_Manual: {
       /*
-       * The ``id`` parameter shall be associated with a manual release
+       * While the ``id`` parameter is associated with a manual release
        * barrier.
        */
       ctx->id = ctx->manual_release_id;
@@ -281,7 +281,7 @@ static void RtemsBarrierReqWait_Pre_Id_Prepare(
 
     case RtemsBarrierReqWait_Pre_Id_Auto: {
       /*
-       * The ``id`` parameter shall be associated with an automatic release
+       * While the ``id`` parameter is associated with an automatic release
        * barrier.
        */
       ctx->id = ctx->auto_release_id;
@@ -301,7 +301,7 @@ static void RtemsBarrierReqWait_Pre_Timeout_Prepare(
   switch ( state ) {
     case RtemsBarrierReqWait_Pre_Timeout_Ticks: {
       /*
-       * The ``released`` parameter shall be a clock tick interval.
+       * While the ``released`` parameter is a clock tick interval.
        */
       ctx->timeout = 2;
       break;
@@ -309,7 +309,7 @@ static void RtemsBarrierReqWait_Pre_Timeout_Prepare(
 
     case RtemsBarrierReqWait_Pre_Timeout_Forever: {
       /*
-       * The ``released`` parameter shall be RTEMS_NO_TIMEOUT.
+       * While the ``released`` parameter is RTEMS_NO_TIMEOUT.
        */
       ctx->timeout = RTEMS_NO_TIMEOUT;
       break;
@@ -328,7 +328,7 @@ static void RtemsBarrierReqWait_Pre_Satisfy_Prepare(
   switch ( state ) {
     case RtemsBarrierReqWait_Pre_Satisfy_Never: {
       /*
-       * While the calling task waits at the barrier, the barrier shall not be
+       * While the calling task waits at the barrier, while the barrier is not
        * released or deleted.
        */
       if ( ctx->timeout == RTEMS_NO_TIMEOUT ) {
@@ -339,7 +339,7 @@ static void RtemsBarrierReqWait_Pre_Satisfy_Prepare(
 
     case RtemsBarrierReqWait_Pre_Satisfy_Wait: {
       /*
-       * Calling the directive shall release the barrier.
+       * While calling the directive releases the barrier.
        */
       SendEvents( ctx->high_worker_id, EVENT_WAIT );
       break;
@@ -347,7 +347,7 @@ static void RtemsBarrierReqWait_Pre_Satisfy_Prepare(
 
     case RtemsBarrierReqWait_Pre_Satisfy_Release: {
       /*
-       * While the calling task waits at the barrier, the barrier shall be
+       * While the calling task waits at the barrier, while the barrier is
        * released.
        */
       SendEvents( ctx->low_worker_id, EVENT_RELEASE );
@@ -356,7 +356,7 @@ static void RtemsBarrierReqWait_Pre_Satisfy_Prepare(
 
     case RtemsBarrierReqWait_Pre_Satisfy_Delete: {
       /*
-       * While the calling task waits at the barrier, the barrier shall be
+       * While the calling task waits at the barrier, while the barrier is
        * deleted.
        */
       SendEvents( ctx->low_worker_id, EVENT_DELETE );
@@ -533,6 +533,34 @@ static void RtemsBarrierReqWait_Teardown_Wrap( void *arg )
   RtemsBarrierReqWait_Teardown( ctx );
 }
 
+static void RtemsBarrierReqWait_Action( RtemsBarrierReqWait_Context *ctx )
+{
+  ctx->status = rtems_barrier_wait( ctx->id, ctx->timeout );
+}
+
+typedef struct {
+  uint8_t Skip : 1;
+  uint8_t Pre_Id_NA : 1;
+  uint8_t Pre_Timeout_NA : 1;
+  uint8_t Pre_Satisfy_NA : 1;
+  uint8_t Post_Status : 3;
+} RtemsBarrierReqWait_Entry;
+
+static const RtemsBarrierReqWait_Entry
+RtemsBarrierReqWait_Entries[] = {
+  { 0, 0, 1, 1, RtemsBarrierReqWait_Post_Status_InvId },
+  { 0, 0, 0, 0, RtemsBarrierReqWait_Post_Status_Ok },
+  { 0, 0, 0, 0, RtemsBarrierReqWait_Post_Status_ObjDel },
+  { 0, 0, 0, 0, RtemsBarrierReqWait_Post_Status_Timeout },
+  { 1, 0, 0, 0, RtemsBarrierReqWait_Post_Status_NA },
+  { 0, 0, 0, 0, RtemsBarrierReqWait_Post_Status_NoReturn }
+};
+
+static const uint8_t
+RtemsBarrierReqWait_Map[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 1, 2, 5, 4, 1, 2, 3, 1, 1, 2, 5, 1, 1, 2
+};
+
 static size_t RtemsBarrierReqWait_Scope( void *arg, char *buf, size_t n )
 {
   RtemsBarrierReqWait_Context *ctx;
@@ -554,118 +582,13 @@ static T_fixture RtemsBarrierReqWait_Fixture = {
   .initial_context = &RtemsBarrierReqWait_Instance
 };
 
-static const uint8_t RtemsBarrierReqWait_TransitionMap[][ 1 ] = {
+static inline RtemsBarrierReqWait_Entry RtemsBarrierReqWait_GetEntry(
-  {
+  size_t index
-    RtemsBarrierReqWait_Post_Status_InvId
+)
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_InvId
-  }, {
-    RtemsBarrierReqWait_Post_Status_Timeout
-  }, {
-    RtemsBarrierReqWait_Post_Status_NA
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_ObjDel
-  }, {
-    RtemsBarrierReqWait_Post_Status_NoReturn
-  }, {
-    RtemsBarrierReqWait_Post_Status_NA
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_ObjDel
-  }, {
-    RtemsBarrierReqWait_Post_Status_Timeout
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_ObjDel
-  }, {
-    RtemsBarrierReqWait_Post_Status_NoReturn
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_Ok
-  }, {
-    RtemsBarrierReqWait_Post_Status_ObjDel
-  }
-};
-
-static const struct {
-  uint8_t Skip : 1;
-  uint8_t Pre_Id_NA : 1;
-  uint8_t Pre_Timeout_NA : 1;
-  uint8_t Pre_Satisfy_NA : 1;
-} RtemsBarrierReqWait_TransitionInfo[] = {
-  {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 1, 1
-  }, {
-    0, 0, 0, 0
-  }, {
-    1, 0, 0, 0
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 0
-  }, {
-    0, 0, 0, 0
-  }, {
-    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
-  }
-};
-
-static void RtemsBarrierReqWait_Action( RtemsBarrierReqWait_Context *ctx )
 {
-  ctx->status = rtems_barrier_wait( ctx->id, ctx->timeout );
+  return RtemsBarrierReqWait_Entries[
+    RtemsBarrierReqWait_Map[ index ]
+  ];
 }
 
 /**
@@ -674,6 +597,7 @@ static void RtemsBarrierReqWait_Action( RtemsBarrierReqWait_Context *ctx )
 T_TEST_CASE_FIXTURE( RtemsBarrierReqWait, &RtemsBarrierReqWait_Fixture )
 {
   RtemsBarrierReqWait_Context *ctx;
+  RtemsBarrierReqWait_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -685,7 +609,9 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqWait, &RtemsBarrierReqWait_Fixture )
     ctx->pcs[ 0 ] < RtemsBarrierReqWait_Pre_Id_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    if ( RtemsBarrierReqWait_TransitionInfo[ index ].Pre_Id_NA ) {
+    entry = RtemsBarrierReqWait_GetEntry( index );
+
+    if ( entry.Pre_Id_NA ) {
       ctx->pcs[ 0 ] = RtemsBarrierReqWait_Pre_Id_NA;
       index += ( RtemsBarrierReqWait_Pre_Id_NA - 1 )
         * RtemsBarrierReqWait_Pre_Timeout_NA
@@ -697,7 +623,9 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqWait, &RtemsBarrierReqWait_Fixture )
       ctx->pcs[ 1 ] < RtemsBarrierReqWait_Pre_Timeout_NA;
       ++ctx->pcs[ 1 ]
     ) {
-      if ( RtemsBarrierReqWait_TransitionInfo[ index ].Pre_Timeout_NA ) {
+      entry = RtemsBarrierReqWait_GetEntry( index );
+
+      if ( entry.Pre_Timeout_NA ) {
         ctx->pcs[ 1 ] = RtemsBarrierReqWait_Pre_Timeout_NA;
         index += ( RtemsBarrierReqWait_Pre_Timeout_NA - 1 )
           * RtemsBarrierReqWait_Pre_Satisfy_NA;
@@ -708,12 +636,14 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqWait, &RtemsBarrierReqWait_Fixture )
         ctx->pcs[ 2 ] < RtemsBarrierReqWait_Pre_Satisfy_NA;
         ++ctx->pcs[ 2 ]
       ) {
-        if ( RtemsBarrierReqWait_TransitionInfo[ index ].Pre_Satisfy_NA ) {
+        entry = RtemsBarrierReqWait_GetEntry( index );
+
+        if ( entry.Pre_Satisfy_NA ) {
           ctx->pcs[ 2 ] = RtemsBarrierReqWait_Pre_Satisfy_NA;
           index += ( RtemsBarrierReqWait_Pre_Satisfy_NA - 1 );
         }
 
-        if ( RtemsBarrierReqWait_TransitionInfo[ index ].Skip ) {
+        if ( entry.Skip ) {
           ++index;
           continue;
         }
@@ -722,10 +652,7 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqWait, &RtemsBarrierReqWait_Fixture )
         RtemsBarrierReqWait_Pre_Timeout_Prepare( ctx, ctx->pcs[ 1 ] );
         RtemsBarrierReqWait_Pre_Satisfy_Prepare( ctx, ctx->pcs[ 2 ] );
         RtemsBarrierReqWait_Action( ctx );
-        RtemsBarrierReqWait_Post_Status_Check(
+        RtemsBarrierReqWait_Post_Status_Check( ctx, entry.Post_Status );
-          ctx,
-          RtemsBarrierReqWait_TransitionMap[ index ][ 0 ]
-        );
         ++index;
       }
     }

testsuites/validation/tc-signal-send.c

@@ -372,7 +372,7 @@ static void RtemsSignalReqSend_Pre_Task_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_Task_NoObj: {
       /*
-       * The ``id`` parameter shall not be associated with a task.
+       * While the ``id`` parameter is not associated with a task.
        */
       ctx->id = 0xffffffff;
       break;
@@ -380,7 +380,7 @@ static void RtemsSignalReqSend_Pre_Task_Prepare(
 
     case RtemsSignalReqSend_Pre_Task_Self: {
       /*
-       * The ``id`` parameter shall be associated with the calling task.
+       * While the ``id`` parameter is associated with the calling task.
        */
       ctx->id = RTEMS_SELF;
       break;
@@ -388,7 +388,7 @@ static void RtemsSignalReqSend_Pre_Task_Prepare(
 
     case RtemsSignalReqSend_Pre_Task_Other: {
       /*
-       * The ``id`` parameter shall be associated with a task other than the
+       * While the ``id`` parameter is associated with a task other than the
        * calling task.
        */
       ctx->id = ctx->worker_id;
@@ -408,7 +408,7 @@ static void RtemsSignalReqSend_Pre_Set_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_Set_Zero: {
       /*
-       * The ``signal_set`` parameter shall be zero.
+       * While the ``signal_set`` parameter is zero.
        */
       ctx->signal_set = 0;
       break;
@@ -416,7 +416,7 @@ static void RtemsSignalReqSend_Pre_Set_Prepare(
 
     case RtemsSignalReqSend_Pre_Set_NonZero: {
       /*
-       * The ``signal_set`` parameter shall be non-zero.
+       * While the ``signal_set`` parameter is non-zero.
        */
       ctx->signal_set = 0xdeadbeef;
       break;
@@ -435,8 +435,7 @@ static void RtemsSignalReqSend_Pre_Handler_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_Handler_Invalid: {
       /*
-       * When the target task has no valid ASR handler installed, the
+       * While the target task has no valid ASR handler installed.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->handler = NULL;
       break;
@@ -444,8 +443,7 @@ static void RtemsSignalReqSend_Pre_Handler_Prepare(
 
     case RtemsSignalReqSend_Pre_Handler_Valid: {
       /*
-       * When the target task has a valid ASR handler installed, the
+       * While the target task has a valid ASR handler installed.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->handler = SignalHandler;
       break;
@@ -464,8 +462,7 @@ static void RtemsSignalReqSend_Pre_ASR_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_ASR_Enabled: {
       /*
-       * When the target task has ASR processing enabled, the
+       * While the target task has ASR processing enabled.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->mode = RTEMS_DEFAULT_MODES;
       break;
@@ -473,8 +470,7 @@ static void RtemsSignalReqSend_Pre_ASR_Prepare(
 
     case RtemsSignalReqSend_Pre_ASR_Disabled: {
       /*
-       * When the target task has ASR processing disabled, the
+       * While the target task has ASR processing disabled.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->mode = RTEMS_NO_ASR;
       break;
@@ -493,8 +489,7 @@ static void RtemsSignalReqSend_Pre_Nested_Prepare(
   switch ( state ) {
     case RtemsSignalReqSend_Pre_Nested_Yes: {
       /*
-       * When the target task processes an asynchronous signal set, the
+       * While the target task processes an asynchronous signal.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->nested = 1;
       break;
@@ -502,8 +497,7 @@ static void RtemsSignalReqSend_Pre_Nested_Prepare(
 
     case RtemsSignalReqSend_Pre_Nested_No: {
       /*
-       * When the target task does not process an asynchronous signal set, the
+       * While the target task does not process an asynchronous signal.
-       * rtems_signal_send() directive shall be called.
        */
       ctx->nested = 0;
       break;
@@ -736,330 +730,6 @@ static void RtemsSignalReqSend_Teardown_Wrap( void *arg )
   RtemsSignalReqSend_Teardown( ctx );
 }
 
-static size_t RtemsSignalReqSend_Scope( void *arg, char *buf, size_t n )
-{
-  RtemsSignalReqSend_Context *ctx;
-
-  ctx = arg;
-
-  if ( ctx->in_action_loop ) {
-    return T_get_scope( RtemsSignalReqSend_PreDesc, buf, n, ctx->pcs );
-  }
-
-  return 0;
-}
-
-static T_fixture RtemsSignalReqSend_Fixture = {
-  .setup = RtemsSignalReqSend_Setup_Wrap,
-  .stop = NULL,
-  .teardown = RtemsSignalReqSend_Teardown_Wrap,
-  .scope = RtemsSignalReqSend_Scope,
-  .initial_context = &RtemsSignalReqSend_Instance
-};
-
-static const uint8_t RtemsSignalReqSend_TransitionMap[][ 3 ] = {
-  {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvId,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_DuringSend,
-    RtemsSignalReqSend_Post_Recursive_Yes
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_DuringSend,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterEnable,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterEnable,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_InvNum,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_NotDef,
-    RtemsSignalReqSend_Post_Handler_NoCall,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterDispatch,
-    RtemsSignalReqSend_Post_Recursive_Yes
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterDispatch,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterEnable,
-    RtemsSignalReqSend_Post_Recursive_No
-  }, {
-    RtemsSignalReqSend_Post_Status_Ok,
-    RtemsSignalReqSend_Post_Handler_AfterEnable,
-    RtemsSignalReqSend_Post_Recursive_No
-  }
-};
-
-static const struct {
-  uint8_t Skip : 1;
-  uint8_t Pre_Task_NA : 1;
-  uint8_t Pre_Set_NA : 1;
-  uint8_t Pre_Handler_NA : 1;
-  uint8_t Pre_ASR_NA : 1;
-  uint8_t Pre_Nested_NA : 1;
-} RtemsSignalReqSend_TransitionInfo[] = {
-  {
-    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, 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, 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
-  }
-};
-
 static void RtemsSignalReqSend_Prepare( RtemsSignalReqSend_Context *ctx )
 {
   ctx->handler_calls = 0;
@@ -1113,12 +783,89 @@ static void RtemsSignalReqSend_Action( RtemsSignalReqSend_Context *ctx )
   }
 }
 
+typedef struct {
+  uint16_t Skip : 1;
+  uint16_t Pre_Task_NA : 1;
+  uint16_t Pre_Set_NA : 1;
+  uint16_t Pre_Handler_NA : 1;
+  uint16_t Pre_ASR_NA : 1;
+  uint16_t Pre_Nested_NA : 1;
+  uint16_t Post_Status : 3;
+  uint16_t Post_Handler : 3;
+  uint16_t Post_Recursive : 2;
+} RtemsSignalReqSend_Entry;
+
+static const RtemsSignalReqSend_Entry
+RtemsSignalReqSend_Entries[] = {
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_InvNum,
+    RtemsSignalReqSend_Post_Handler_NoCall,
+    RtemsSignalReqSend_Post_Recursive_No },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_InvId,
+    RtemsSignalReqSend_Post_Handler_NoCall,
+    RtemsSignalReqSend_Post_Recursive_No },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_NotDef,
+    RtemsSignalReqSend_Post_Handler_NoCall,
+    RtemsSignalReqSend_Post_Recursive_No },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_Ok,
+    RtemsSignalReqSend_Post_Handler_AfterEnable,
+    RtemsSignalReqSend_Post_Recursive_No },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_Ok,
+    RtemsSignalReqSend_Post_Handler_DuringSend,
+    RtemsSignalReqSend_Post_Recursive_Yes },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_Ok,
+    RtemsSignalReqSend_Post_Handler_DuringSend,
+    RtemsSignalReqSend_Post_Recursive_No },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_Ok,
+    RtemsSignalReqSend_Post_Handler_AfterDispatch,
+    RtemsSignalReqSend_Post_Recursive_Yes },
+  { 0, 0, 0, 0, 0, 0, RtemsSignalReqSend_Post_Status_Ok,
+    RtemsSignalReqSend_Post_Handler_AfterDispatch,
+    RtemsSignalReqSend_Post_Recursive_No }
+};
+
+static const uint8_t
+RtemsSignalReqSend_Map[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,
+  2, 2, 4, 5, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 6, 7, 3, 3
+};
+
+static size_t RtemsSignalReqSend_Scope( void *arg, char *buf, size_t n )
+{
+  RtemsSignalReqSend_Context *ctx;
+
+  ctx = arg;
+
+  if ( ctx->in_action_loop ) {
+    return T_get_scope( RtemsSignalReqSend_PreDesc, buf, n, ctx->pcs );
+  }
+
+  return 0;
+}
+
+static T_fixture RtemsSignalReqSend_Fixture = {
+  .setup = RtemsSignalReqSend_Setup_Wrap,
+  .stop = NULL,
+  .teardown = RtemsSignalReqSend_Teardown_Wrap,
+  .scope = RtemsSignalReqSend_Scope,
+  .initial_context = &RtemsSignalReqSend_Instance
+};
+
+static inline RtemsSignalReqSend_Entry RtemsSignalReqSend_GetEntry(
+  size_t index
+)
+{
+  return RtemsSignalReqSend_Entries[
+    RtemsSignalReqSend_Map[ index ]
+  ];
+}
+
 /**
  * @fn void T_case_body_RtemsSignalReqSend( void )
  */
 T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
 {
   RtemsSignalReqSend_Context *ctx;
+  RtemsSignalReqSend_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -1130,7 +877,9 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
     ctx->pcs[ 0 ] < RtemsSignalReqSend_Pre_Task_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    if ( RtemsSignalReqSend_TransitionInfo[ index ].Pre_Task_NA ) {
+    entry = RtemsSignalReqSend_GetEntry( index );
+
+    if ( entry.Pre_Task_NA ) {
       ctx->pcs[ 0 ] = RtemsSignalReqSend_Pre_Task_NA;
       index += ( RtemsSignalReqSend_Pre_Task_NA - 1 )
         * RtemsSignalReqSend_Pre_Set_NA
@@ -1144,7 +893,9 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
       ctx->pcs[ 1 ] < RtemsSignalReqSend_Pre_Set_NA;
       ++ctx->pcs[ 1 ]
     ) {
-      if ( RtemsSignalReqSend_TransitionInfo[ index ].Pre_Set_NA ) {
+      entry = RtemsSignalReqSend_GetEntry( index );
+
+      if ( entry.Pre_Set_NA ) {
         ctx->pcs[ 1 ] = RtemsSignalReqSend_Pre_Set_NA;
         index += ( RtemsSignalReqSend_Pre_Set_NA - 1 )
           * RtemsSignalReqSend_Pre_Handler_NA
@@ -1157,7 +908,9 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
         ctx->pcs[ 2 ] < RtemsSignalReqSend_Pre_Handler_NA;
         ++ctx->pcs[ 2 ]
       ) {
-        if ( RtemsSignalReqSend_TransitionInfo[ index ].Pre_Handler_NA ) {
+        entry = RtemsSignalReqSend_GetEntry( index );
+
+        if ( entry.Pre_Handler_NA ) {
           ctx->pcs[ 2 ] = RtemsSignalReqSend_Pre_Handler_NA;
           index += ( RtemsSignalReqSend_Pre_Handler_NA - 1 )
             * RtemsSignalReqSend_Pre_ASR_NA
@@ -1169,7 +922,9 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
           ctx->pcs[ 3 ] < RtemsSignalReqSend_Pre_ASR_NA;
           ++ctx->pcs[ 3 ]
         ) {
-          if ( RtemsSignalReqSend_TransitionInfo[ index ].Pre_ASR_NA ) {
+          entry = RtemsSignalReqSend_GetEntry( index );
+
+          if ( entry.Pre_ASR_NA ) {
             ctx->pcs[ 3 ] = RtemsSignalReqSend_Pre_ASR_NA;
             index += ( RtemsSignalReqSend_Pre_ASR_NA - 1 )
               * RtemsSignalReqSend_Pre_Nested_NA;
@@ -1180,12 +935,14 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
             ctx->pcs[ 4 ] < RtemsSignalReqSend_Pre_Nested_NA;
             ++ctx->pcs[ 4 ]
           ) {
-            if ( RtemsSignalReqSend_TransitionInfo[ index ].Pre_Nested_NA ) {
+            entry = RtemsSignalReqSend_GetEntry( index );
+
+            if ( entry.Pre_Nested_NA ) {
               ctx->pcs[ 4 ] = RtemsSignalReqSend_Pre_Nested_NA;
               index += ( RtemsSignalReqSend_Pre_Nested_NA - 1 );
             }
 
-            if ( RtemsSignalReqSend_TransitionInfo[ index ].Skip ) {
+            if ( entry.Skip ) {
               ++index;
               continue;
             }
@@ -1197,17 +954,11 @@ T_TEST_CASE_FIXTURE( RtemsSignalReqSend, &RtemsSignalReqSend_Fixture )
             RtemsSignalReqSend_Pre_ASR_Prepare( ctx, ctx->pcs[ 3 ] );
             RtemsSignalReqSend_Pre_Nested_Prepare( ctx, ctx->pcs[ 4 ] );
             RtemsSignalReqSend_Action( ctx );
-            RtemsSignalReqSend_Post_Status_Check(
+            RtemsSignalReqSend_Post_Status_Check( ctx, entry.Post_Status );
-              ctx,
+            RtemsSignalReqSend_Post_Handler_Check( ctx, entry.Post_Handler );
-              RtemsSignalReqSend_TransitionMap[ index ][ 0 ]
-            );
-            RtemsSignalReqSend_Post_Handler_Check(
-              ctx,
-              RtemsSignalReqSend_TransitionMap[ index ][ 1 ]
-            );
             RtemsSignalReqSend_Post_Recursive_Check(
               ctx,
-              RtemsSignalReqSend_TransitionMap[ index ][ 2 ]
+              entry.Post_Recursive
             );
             ++index;
           }