Changeset 53609 in vbox for trunk/src/VBox

Timestamp:

Dec 30, 2014 6:34:49 PM (10 years ago)

Author:

vboxsync

Message:

cidet: More add test values. Need to have separate indexes for each result value set or we might skip test values.

Location:

trunk/src/VBox/ValidationKit/utils/cpu

Files:

• cidet-core.cpp (modified) (1 diff)
• cidet-instr-1.cpp (modified) (6 diffs)
• cidet.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp

@@ -1546 +1546 @@
      * Reset various things.
      */
-    pThis->iInOut = 0;
+    for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aiInOut); i++)
+        pThis->aiInOut[i] = 0;
 
     return true;

trunk/src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp

@@ -137 +137 @@
     Assert(pThis->idxMrmRmOp  < 2);
     Assert(pThis->idxMrmRmOp != pThis->idxMrmRegOp);
+    AssertCompile(RT_ELEMENTS(pThis->aiInOut) >= 4);
 
     if (!fInvalid)
@@ -149 +150 @@
                 case 1:
                 {
-                    uint16_t                       idx    = ++pThis->iInOut % pResults->c8Entries;
+                    uint16_t                       idx    = ++pThis->aiInOut[0] % pResults->c8Entries;
                     PCCIDET2IN1OUTWITHFLAGSU8ENTRY pEntry = &pResults->pa8Entries[idx];
                     rc = idx ? VINF_SUCCESS : VINF_EOF;
@@ -165 +166 @@
                 case 2:
                 {
-                    uint16_t                        idx    = ++pThis->iInOut % pResults->c16Entries;
+                    uint16_t                        idx    = ++pThis->aiInOut[1] % pResults->c16Entries;
                     PCCIDET2IN1OUTWITHFLAGSU16ENTRY pEntry = &pResults->pa16Entries[idx];
                     rc = idx ? VINF_SUCCESS : VINF_EOF;
@@ -181 +182 @@
                 case 4:
                 {
-                    uint16_t                        idx    = ++pThis->iInOut % pResults->c32Entries;
+                    uint16_t                        idx    = ++pThis->aiInOut[2] % pResults->c32Entries;
                     PCCIDET2IN1OUTWITHFLAGSU32ENTRY pEntry = &pResults->pa32Entries[idx];
                     rc = idx ? VINF_SUCCESS : VINF_EOF;
@@ -199 +200 @@
                 case 8:
                 {
-                    uint16_t                        idx    = ++pThis->iInOut % pResults->c64Entries;
+                    uint16_t                        idx    = ++pThis->aiInOut[3] % pResults->c64Entries;
                     PCCIDET2IN1OUTWITHFLAGSU64ENTRY pEntry = &pResults->pa64Entries[idx];
                     rc = idx ? VINF_SUCCESS : VINF_EOF;
@@ -232 +233 @@
     {
         { UINT8_C(0x00), UINT8_C(0x00), 0, UINT8_C(0x00), ZF | PF },
+        { UINT8_C(0xff), UINT8_C(0x01), 0, UINT8_C(0x00), CF | ZF | AF | PF  },
+        { UINT8_C(0x7f), UINT8_C(0x80), 0, UINT8_C(0xff), SF | PF },
+        { UINT8_C(0x01), UINT8_C(0x01), 0, UINT8_C(0x02), 0 },
     };
     static const CIDET2IN1OUTWITHFLAGSU16ENTRY s_a16Results[] =
     {
         { UINT16_C(0x0000), UINT16_C(0x0000), 0, UINT16_C(0x0000), ZF | PF },
+        { UINT16_C(0xfefd), UINT16_C(0x0103), 0, UINT16_C(0x0000), CF | ZF | AF | PF },
+        { UINT16_C(0x8e7d), UINT16_C(0x7182), 0, UINT16_C(0xffff), SF | PF },
+        { UINT16_C(0x0001), UINT16_C(0x0001), 0, UINT16_C(0x0002), 0 },
     };
     static const CIDET2IN1OUTWITHFLAGSU32ENTRY s_a32Results[] =
     {
         { UINT32_C(0x00000000), UINT32_C(0x00000000), 0, UINT32_C(0x00000000), ZF | PF },
+        { UINT32_C(0xfefdfcfb), UINT32_C(0x01020305), 0, UINT32_C(0x00000000), CF | ZF | AF | PF },
+        { UINT32_C(0x8efdfcfb), UINT32_C(0x71020304), 0, UINT32_C(0xffffffff), SF | PF },
+        { UINT32_C(0x00000001), UINT32_C(0x00000001), 0, UINT32_C(0x00000002), 0 },
     };
     static const CIDET2IN1OUTWITHFLAGSU64ENTRY s_a64Results[] =
     {
         { UINT64_C(0x0000000000000000), UINT64_C(0x0000000000000000), 0, UINT64_C(0x0000000000000000), ZF | PF },
+        { UINT64_C(0xfefdfcfbfaf9f8f7), UINT64_C(0x0102030405060709), 0, UINT64_C(0x0000000000000000), CF | ZF | AF | PF },
+        { UINT64_C(0x7efdfcfbfaf9f8f7), UINT64_C(0x8102030405060708), 0, UINT64_C(0xffffffffffffffff), SF | PF },
+        { UINT64_C(0x0000000000000001), UINT64_C(0x0000000000000001), 0, UINT64_C(0x0000000000000002), 0 },
     };
     static const CIDET2IN1OUTWITHFLAGS s_Results = CIDET2IN1OUTWITHFLAGS_INITIALIZER(CF | PF | AF | SF | OF);

trunk/src/VBox/ValidationKit/utils/cpu/cidet.h

@@ -872 +872 @@
     DECLCALLBACKMEMBER(void, pfnFailure)(struct CIDETCORE *pThis, const char *pszFormat, va_list va);
 
-    /** Variable that's incremented each time the FNCIDETSETUPINOUT is called
-     *  for an instruction.  Reset when changing instruction or switching
-     *  between valid and invalid inputs. */
-    uint32_t            iInOut;
+    /** Array of indexes for use by FNCIDETSETUPINOUT.
+     * Reset when changing instruction or switching between valid and invalid
+     * inputs. */
+    uint32_t            aiInOut[4];
 
     /** @name Copyied and extracted instruction information.