Changeset 60788 in vbox

Timestamp:

May 2, 2016 1:21:20 PM (9 years ago)

Author:

vboxsync

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

106987

Message:

bs3kit: updates

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-basic-2-x0.c (modified) (9 diffs)
• bs3-cpu-basic-2.c (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-x0.c

@@ -1719 +1719 @@
                 if (   off <= X86_PAGE_SIZE - 2
                     && Bs3MemCmp(&pbTest[off], pbExpected, 2) != 0)
-                    Bs3TestPrintf("Mismatch (#10): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
-                                  pbExpected, &pbTest[off], off);
+                    Bs3TestFailedF("Mismatch (#10): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
+                                   pbExpected, &pbTest[off], off);
                 if (   off < X86_PAGE_SIZE - 2
                     && !ASMMemIsAllU8(&pbTest[off + 2], X86_PAGE_SIZE - off - 2, bFiller))
-                    Bs3TestPrintf("Wrote partial base on #PF (#10): bFiller=%#x, got %.*Rhxs; off=%#x\n",
-                                  bFiller, X86_PAGE_SIZE - off - 2, &pbTest[off + 2], off);
+                    Bs3TestFailedF("Wrote partial base on #PF (#10): bFiller=%#x, got %.*Rhxs; off=%#x\n",
+                                   bFiller, X86_PAGE_SIZE - off - 2, &pbTest[off + 2], off);
                 if (off == X86_PAGE_SIZE - 1 && pbTest[off] != bFiller)
-                    Bs3TestPrintf("Wrote partial limit on #PF (#10): Expected %02x, got %02x\n", bFiller, pbTest[off]);
+                    Bs3TestFailedF("Wrote partial limit on #PF (#10): Expected %02x, got %02x\n", bFiller, pbTest[off]);
             }
             g_usBs3TestStep++;
@@ -1754 +1754 @@
                 if (   -off < cbIdtr
                     && !ASMMemIsAllU8(pbTest, cbIdtr + off, bFiller))
-                    Bs3TestPrintf("Wrote partial content on #PF (#12): bFiller=%#x, found %.*Rhxs; off=%d\n",
-                                  bFiller, cbIdtr + off, pbTest, off);
+                    Bs3TestFailedF("Wrote partial content on #PF (#12): bFiller=%#x, found %.*Rhxs; off=%d\n",
+                                   bFiller, cbIdtr + off, pbTest, off);
             }
             if (!ASMMemIsAllU8(&pbTest[RT_MAX(cbIdtr + off, 0)], 16, bFiller))
-                Bs3TestPrintf("Wrote beyond expected area (#13): bFiller=%#x, found %.16Rhxs; off=%d\n",
-                              bFiller, &pbTest[RT_MAX(cbIdtr + off, 0)], off);
+                Bs3TestFailedF("Wrote beyond expected area (#13): bFiller=%#x, found %.16Rhxs; off=%d\n",
+                               bFiller, &pbTest[RT_MAX(cbIdtr + off, 0)], off);
             g_usBs3TestStep++;
         }
@@ -1809 +1809 @@
                             if (   off <= X86_PAGE_SIZE - 2
                                 && Bs3MemCmp(&pbTest[off], pbExpected, 2) != 0)
-                                Bs3TestPrintf("Mismatch (#15): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
-                                              pbExpected, &pbTest[off], off);
+                                Bs3TestFailedF("Mismatch (#15): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
+                                               pbExpected, &pbTest[off], off);
                             cb = X86_PAGE_SIZE - off - 2;
                             if (   off < X86_PAGE_SIZE - 2
                                 && !ASMMemIsAllU8(&pbTest[off + 2], cb, bFiller))
-                                Bs3TestPrintf("Wrote partial base on #PF (#15): bFiller=%#x, got %.*Rhxs; off=%#x\n",
-                                              bFiller, cb, &pbTest[off + 2], off);
+                                Bs3TestFailedF("Wrote partial base on #PF (#15): bFiller=%#x, got %.*Rhxs; off=%#x\n",
+                                               bFiller, cb, &pbTest[off + 2], off);
                             if (off == X86_PAGE_SIZE - 1 && pbTest[off] != bFiller)
-                                Bs3TestPrintf("Wrote partial limit on #PF (#15): Expected %02x, got %02x\n", bFiller, pbTest[off]);
+                                Bs3TestFailedF("Wrote partial limit on #PF (#15): Expected %02x, got %02x\n", bFiller, pbTest[off]);
                         }
                     }
@@ -1830 +1830 @@
                                 bs3CpuBasic2_CompareGpCtx(&TrapCtx, &Ctx, 0);
                             if (Bs3MemCmp(&pbTest[off], pbExpected, 2) != 0)
-                                Bs3TestPrintf("Mismatch (#16): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
-                                              pbExpected, &pbTest[off], off);
+                                Bs3TestFailedF("Mismatch (#16): Expected limit %.2Rhxs, got %.2Rhxs; off=%#x\n",
+                                               pbExpected, &pbTest[off], off);
                             cb = X86_PAGE_SIZE - off - 2;
                             if (   off < X86_PAGE_SIZE - 2
                                 && !ASMMemIsAllU8(&pbTest[off + 2], cb, bFiller))
-                                Bs3TestPrintf("Wrote partial base with limit (#16): bFiller=%#x, got %.*Rhxs; off=%#x\n",
-                                              bFiller, cb, &pbTest[off + 2], off);
+                                Bs3TestFailedF("Wrote partial base with limit (#16): bFiller=%#x, got %.*Rhxs; off=%#x\n",
+                                               bFiller, cb, &pbTest[off + 2], off);
                         }
                         else
@@ -1844 +1844 @@
                             if (   off < X86_PAGE_SIZE
                                 && !ASMMemIsAllU8(&pbTest[off], X86_PAGE_SIZE - off, bFiller))
-                                Bs3TestPrintf("Mismatch (#16): Partial limit write on #PF: bFiller=%#x, got %.*Rhxs\n",
-                                              bFiller, X86_PAGE_SIZE - off, &pbTest[off]);
+                                Bs3TestFailedF("Mismatch (#16): Partial limit write on #PF: bFiller=%#x, got %.*Rhxs\n",
+                                               bFiller, X86_PAGE_SIZE - off, &pbTest[off]);
                         }
                     }
@@ -1857 +1857 @@
                         if (   off < X86_PAGE_SIZE
                             && !ASMMemIsAllU8(&pbTest[off], X86_PAGE_SIZE - off, bFiller))
-                            Bs3TestPrintf("Mismatch (#17): Partial write on #GP: bFiller=%#x, got %.*Rhxs\n",
-                                          bFiller, X86_PAGE_SIZE - off, &pbTest[off]);
+                            Bs3TestFailedF("Mismatch (#17): Partial write on #GP: bFiller=%#x, got %.*Rhxs\n",
+                                           bFiller, X86_PAGE_SIZE - off, &pbTest[off]);
                     }
 
@@ -2033 +2033 @@
     } Expected;
 
+    //if (bMode != BS3_MODE_LM64) return BS3TESTDOMODE_SKIPPED;
     bs3CpuBasic2_SetGlobals(bMode);
 
@@ -2060 +2061 @@
     } Expected;
 
+    //if (bMode != BS3_MODE_LM64) return BS3TESTDOMODE_SKIPPED;
     bs3CpuBasic2_SetGlobals(bMode);
 
@@ -3163 +3165 @@
     } uBuf;
     size_t cbUnused;
-//if (bMode != BS3_MODE_LM64) return BS3TESTDOMODE_SKIPPED;
-
+
+    //if (bMode != BS3_MODE_LM64) return BS3TESTDOMODE_SKIPPED;
     bs3CpuBasic2_SetGlobals(bMode);
 

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2.c

@@ -58 +58 @@
 {
     { "iret", bs3CpuBasic2_iret_f16, 0 },
-#if 0
+#if 1
     { "sidt", bs3CpuBasic2_sidt_f16, 0 },
     { "sgdt", bs3CpuBasic2_sgdt_f16, 0 },