validation: Improve generated test code

Move the transition map members of the test context to a dedicated
structure.  Move the transition variant pre-condition prepare, action,
and post-condition checks to a separate function to reduce the
indentation level and allow skipping of transition variants.

1 files changed, 86 insertions, 66 deletions

diff --git a/testsuites/validation/tc-intr-get-affinity.c b/testsuites/validation/tc-intr-get-affinity.c
index e0de9e37ec..d74088e15a 100644
--- a/testsuites/validation/tc-intr-get-affinity.c
+++ b/testsuites/validation/tc-intr-get-affinity.c
@@ -111,6 +111,16 @@ typedef enum {
   RtemsIntrReqGetAffinity_Post_CPUSetObj_NA
 } RtemsIntrReqGetAffinity_Post_CPUSetObj;
 
+typedef struct {
+  uint16_t Skip : 1;
+  uint16_t Pre_Vector_NA : 1;
+  uint16_t Pre_CPUSetSize_NA : 1;
+  uint16_t Pre_CPUSet_NA : 1;
+  uint16_t Pre_CanGetAffinity_NA : 1;
+  uint16_t Post_Status : 3;
+  uint16_t Post_CPUSetObj : 3;
+} RtemsIntrReqGetAffinity_Entry;
+
 /**
  * @brief Test context for spec:/rtems/intr/req/get-affinity test case.
  */
@@ -153,16 +163,33 @@ typedef struct {
    */
   cpu_set_t *cpuset;
 
-  /**
-   * @brief This member defines the pre-condition states for the next action.
-   */
-  size_t pcs[ 4 ];
-
-  /**
-   * @brief This member indicates if the test action loop is currently
-   *   executed.
-   */
-  bool in_action_loop;
+  struct {
+    /**
+     * @brief This member defines the pre-condition states for the next action.
+     */
+    size_t pcs[ 4 ];
+
+    /**
+     * @brief If this member is true, then the test action loop is executed.
+     */
+    bool in_action_loop;
+
+    /**
+     * @brief This member contains the next transition map index.
+     */
+    size_t index;
+
+    /**
+     * @brief This member contains the current transition map entry.
+     */
+    RtemsIntrReqGetAffinity_Entry entry;
+
+    /**
+     * @brief If this member is true, then the current transition variant
+     *   should be skipped.
+     */
+    bool skip;
+  } Map;
 } RtemsIntrReqGetAffinity_Context;
 
 static RtemsIntrReqGetAffinity_Context
@@ -492,7 +519,7 @@ static void RtemsIntrReqGetAffinity_Setup_Wrap( void *arg )
   RtemsIntrReqGetAffinity_Context *ctx;
 
   ctx = arg;
-  ctx->in_action_loop = false;
+  ctx->Map.in_action_loop = false;
   RtemsIntrReqGetAffinity_Setup( ctx );
 }
 
@@ -550,16 +577,6 @@ static void RtemsIntrReqGetAffinity_Action(
   }
 }
 
-typedef struct {
-  uint16_t Skip : 1;
-  uint16_t Pre_Vector_NA : 1;
-  uint16_t Pre_CPUSetSize_NA : 1;
-  uint16_t Pre_CPUSet_NA : 1;
-  uint16_t Pre_CanGetAffinity_NA : 1;
-  uint16_t Post_Status : 3;
-  uint16_t Post_CPUSetObj : 3;
-} RtemsIntrReqGetAffinity_Entry;
-
 static const RtemsIntrReqGetAffinity_Entry
 RtemsIntrReqGetAffinity_Entries[] = {
   { 0, 0, 0, 0, 0, RtemsIntrReqGetAffinity_Post_Status_InvAddr,
@@ -589,8 +606,13 @@ static size_t RtemsIntrReqGetAffinity_Scope( void *arg, char *buf, size_t n )
 
   ctx = arg;
 
-  if ( ctx->in_action_loop ) {
-    return T_get_scope( RtemsIntrReqGetAffinity_PreDesc, buf, n, ctx->pcs );
+  if ( ctx->Map.in_action_loop ) {
+    return T_get_scope(
+      RtemsIntrReqGetAffinity_PreDesc,
+      buf,
+      n,
+      ctx->Map.pcs
+    );
   }
 
   return 0;
@@ -604,15 +626,38 @@ static T_fixture RtemsIntrReqGetAffinity_Fixture = {
   .initial_context = &RtemsIntrReqGetAffinity_Instance
 };
 
-static inline RtemsIntrReqGetAffinity_Entry RtemsIntrReqGetAffinity_GetEntry(
-  size_t index
+static inline RtemsIntrReqGetAffinity_Entry RtemsIntrReqGetAffinity_PopEntry(
+  RtemsIntrReqGetAffinity_Context *ctx
 )
 {
+  size_t index;
+
+  index = ctx->Map.index;
+  ctx->Map.index = index + 1;
   return RtemsIntrReqGetAffinity_Entries[
     RtemsIntrReqGetAffinity_Map[ index ]
   ];
 }
 
+static void RtemsIntrReqGetAffinity_TestVariant(
+  RtemsIntrReqGetAffinity_Context *ctx
+)
+{
+  RtemsIntrReqGetAffinity_Pre_Vector_Prepare( ctx, ctx->Map.pcs[ 0 ] );
+  RtemsIntrReqGetAffinity_Pre_CPUSetSize_Prepare( ctx, ctx->Map.pcs[ 1 ] );
+  RtemsIntrReqGetAffinity_Pre_CPUSet_Prepare( ctx, ctx->Map.pcs[ 2 ] );
+  RtemsIntrReqGetAffinity_Pre_CanGetAffinity_Prepare(
+    ctx,
+    ctx->Map.entry.Pre_CanGetAffinity_NA ? RtemsIntrReqGetAffinity_Pre_CanGetAffinity_NA : ctx->Map.pcs[ 3 ]
+  );
+  RtemsIntrReqGetAffinity_Action( ctx );
+  RtemsIntrReqGetAffinity_Post_Status_Check( ctx, ctx->Map.entry.Post_Status );
+  RtemsIntrReqGetAffinity_Post_CPUSetObj_Check(
+    ctx,
+    ctx->Map.entry.Post_CPUSetObj
+  );
+}
+
 /**
  * @fn void T_case_body_RtemsIntrReqGetAffinity( void )
  */
@@ -622,58 +667,33 @@ T_TEST_CASE_FIXTURE(
 )
 {
   RtemsIntrReqGetAffinity_Context *ctx;
-  size_t index;
 
   ctx = T_fixture_context();
-  ctx->in_action_loop = true;
-  index = 0;
+  ctx->Map.in_action_loop = true;
+  ctx->Map.index = 0;
 
   for (
-    ctx->pcs[ 0 ] = RtemsIntrReqGetAffinity_Pre_Vector_Valid;
-    ctx->pcs[ 0 ] < RtemsIntrReqGetAffinity_Pre_Vector_NA;
-    ++ctx->pcs[ 0 ]
+    ctx->Map.pcs[ 0 ] = RtemsIntrReqGetAffinity_Pre_Vector_Valid;
+    ctx->Map.pcs[ 0 ] < RtemsIntrReqGetAffinity_Pre_Vector_NA;
+    ++ctx->Map.pcs[ 0 ]
   ) {
     for (
-      ctx->pcs[ 1 ] = RtemsIntrReqGetAffinity_Pre_CPUSetSize_Valid;
-      ctx->pcs[ 1 ] < RtemsIntrReqGetAffinity_Pre_CPUSetSize_NA;
-      ++ctx->pcs[ 1 ]
+      ctx->Map.pcs[ 1 ] = RtemsIntrReqGetAffinity_Pre_CPUSetSize_Valid;
+      ctx->Map.pcs[ 1 ] < RtemsIntrReqGetAffinity_Pre_CPUSetSize_NA;
+      ++ctx->Map.pcs[ 1 ]
     ) {
       for (
-        ctx->pcs[ 2 ] = RtemsIntrReqGetAffinity_Pre_CPUSet_Valid;
-        ctx->pcs[ 2 ] < RtemsIntrReqGetAffinity_Pre_CPUSet_NA;
-        ++ctx->pcs[ 2 ]
+        ctx->Map.pcs[ 2 ] = RtemsIntrReqGetAffinity_Pre_CPUSet_Valid;
+        ctx->Map.pcs[ 2 ] < RtemsIntrReqGetAffinity_Pre_CPUSet_NA;
+        ++ctx->Map.pcs[ 2 ]
       ) {
         for (
-          ctx->pcs[ 3 ] = RtemsIntrReqGetAffinity_Pre_CanGetAffinity_Yes;
-          ctx->pcs[ 3 ] < RtemsIntrReqGetAffinity_Pre_CanGetAffinity_NA;
-          ++ctx->pcs[ 3 ]
+          ctx->Map.pcs[ 3 ] = RtemsIntrReqGetAffinity_Pre_CanGetAffinity_Yes;
+          ctx->Map.pcs[ 3 ] < RtemsIntrReqGetAffinity_Pre_CanGetAffinity_NA;
+          ++ctx->Map.pcs[ 3 ]
         ) {
-          RtemsIntrReqGetAffinity_Entry entry;
-          size_t pcs[ 4 ];
-
-          entry = RtemsIntrReqGetAffinity_GetEntry( index );
-          ++index;
-
-          memcpy( pcs, ctx->pcs, sizeof( pcs ) );
-
-          if ( entry.Pre_CanGetAffinity_NA ) {
-            ctx->pcs[ 3 ] = RtemsIntrReqGetAffinity_Pre_CanGetAffinity_NA;
-          }
-
-          RtemsIntrReqGetAffinity_Pre_Vector_Prepare( ctx, ctx->pcs[ 0 ] );
-          RtemsIntrReqGetAffinity_Pre_CPUSetSize_Prepare( ctx, ctx->pcs[ 1 ] );
-          RtemsIntrReqGetAffinity_Pre_CPUSet_Prepare( ctx, ctx->pcs[ 2 ] );
-          RtemsIntrReqGetAffinity_Pre_CanGetAffinity_Prepare(
-            ctx,
-            ctx->pcs[ 3 ]
-          );
-          RtemsIntrReqGetAffinity_Action( ctx );
-          RtemsIntrReqGetAffinity_Post_Status_Check( ctx, entry.Post_Status );
-          RtemsIntrReqGetAffinity_Post_CPUSetObj_Check(
-            ctx,
-            entry.Post_CPUSetObj
-          );
-          memcpy( ctx->pcs, pcs, sizeof( ctx->pcs ) );
+          ctx->Map.entry = RtemsIntrReqGetAffinity_PopEntry( ctx );
+          RtemsIntrReqGetAffinity_TestVariant( ctx );
         }
       }
     }