Changeset 66174 in vbox

Timestamp:

Mar 21, 2017 10:20:57 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114086

Message:

bs3-cpu-generated-1: split main function

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c

@@ -1771 +1771 @@
 
 
-BS3_DECL_FAR(uint8_t) BS3_CMN_NM(Bs3Cg1Worker)(uint8_t bMode)
-{
-    BS3CG1STATE                 ThisIsIt;
-    PBS3CG1STATE                pThis = &ThisIsIt;
-    unsigned const              iFirstRing = BS3_MODE_IS_V86(bMode)       ? 3 : 0;
-    uint8_t const               cRings     = BS3_MODE_IS_RM_OR_V86(bMode) ? 1 : 4;
-    uint8_t                     iRing;
-    unsigned                    iInstr;
-    BS3MEMKIND const            enmMemKind = BS3_MODE_IS_RM_OR_V86(bMode) ? BS3MEMKIND_REAL
-                                           : !BS3_MODE_IS_64BIT_CODE(bMode) ? BS3MEMKIND_TILED : BS3MEMKIND_FLAT32;
-
-#if 0
-    if (bMode != BS3_MODE_PP16_V86)
-        return BS3TESTDOMODE_SKIPPED;
-#endif
-
-    /*
-     * Initalize the state.
-     */
+/**
+ * Destroys the state, freeing all allocations and such.
+ *
+ * @param   pThis               The state.
+ */
+static void Bs3Cg1Destroy(PBS3CG1STATE pThis)
+{
+    if (BS3_MODE_IS_PAGED(pThis->bMode))
+    {
+        Bs3MemGuardedTestPageFree(pThis->pbCodePg);
+        Bs3MemGuardedTestPageFree(pThis->pbDataPg);
+    }
+    else
+    {
+        Bs3MemFree(pThis->pbCodePg, X86_PAGE_SIZE);
+        Bs3MemFree(pThis->pbDataPg, X86_PAGE_SIZE);
+    }
+}
+
+
+/**
+ * Initializes the state.
+ *
+ * @returns Success indicator (true/false)
+ * @param   pThis               The state.
+ * @param   bMode               The mode being tested.
+ */
+static bool Bs3Cg1Init(PBS3CG1STATE pThis, uint8_t bMode, uint8_t cRings, uint8_t iFirstRing)
+{
+    BS3MEMKIND const    enmMemKind = BS3_MODE_IS_RM_OR_V86(bMode) ? BS3MEMKIND_REAL
+                                   : !BS3_MODE_IS_64BIT_CODE(bMode) ? BS3MEMKIND_TILED : BS3MEMKIND_FLAT32;
+    unsigned            iRing;
+
     Bs3MemSet(pThis, 0, sizeof(*pThis));
 
@@ -1887 +1901 @@
         }
     }
+
+    return true;
+}
+
+
+BS3_DECL_FAR(uint8_t) BS3_CMN_NM(Bs3Cg1Worker)(uint8_t bMode)
+{
+    BS3CG1STATE                 ThisIsIt;
+    PBS3CG1STATE                pThis = &ThisIsIt;
+    unsigned const              iFirstRing = BS3_MODE_IS_V86(bMode)       ? 3 : 0;
+    uint8_t const               cRings     = BS3_MODE_IS_RM_OR_V86(bMode) ? 1 : 4;
+    uint8_t                     iRing;
+    unsigned                    iInstr;
+
+#if 0
+    if (bMode != BS3_MODE_PP16_V86)
+        return BS3TESTDOMODE_SKIPPED;
+#endif
+
+    /*
+     * Initalize the state.
+     */
+    if (!Bs3Cg1Init(pThis, bMode, cRings, iFirstRing))
+        return 1;
 
     /*
@@ -2043 +2081 @@
      * Clean up.
      */
-    if (BS3_MODE_IS_PAGED(bMode))
-    {
-        Bs3MemGuardedTestPageFree(pThis->pbCodePg);
-        Bs3MemGuardedTestPageFree(pThis->pbDataPg);
-    }
-    else
-    {
-        Bs3MemFree(pThis->pbCodePg, X86_PAGE_SIZE);
-        Bs3MemFree(pThis->pbDataPg, X86_PAGE_SIZE);
-    }
-
+    Bs3Cg1Destroy(pThis);
     Bs3TestSubDone();
+
 #if 0
     if (bMode >= BS3_MODE_PE16_32)