Changeset 97489 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-x0.c

Timestamp:

Nov 9, 2022 9:15:54 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/bs3-cpu-basic-2: Added tests for the indirect call instructions. bugref:9898

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-x0.c (modified) (12 diffs)

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

@@ -3648 +3648 @@
 PROTO_ALL(bs3CpuBasic2_call_jv__ud2);
 PROTO_ALL(bs3CpuBasic2_call_jv_back__ud2);
+PROTO_ALL(bs3CpuBasic2_call_ind_mem__ud2);
+PROTO_ALL(bs3CpuBasic2_call_ind_xAX__ud2);
+PROTO_ALL(bs3CpuBasic2_call_ind_xDI__ud2);
+FNBS3FAR  bs3CpuBasic2_call_ind_r9__ud2_c64;
 
 PROTO_ALL(bs3CpuBasic2_jmp_opsize_begin);
@@ -3659 +3663 @@
 PROTO_ALL(bs3CpuBasic2_call_jv_opsize__ud2);
 PROTO_ALL(bs3CpuBasic2_call_jv_opsize_back__ud2);
+PROTO_ALL(bs3CpuBasic2_call_ind_mem_opsize__ud2);
+FNBS3FAR  bs3CpuBasic2_call_ind_mem_opsize__ud2__intel_c64;
+PROTO_ALL(bs3CpuBasic2_call_ind_xAX_opsize__ud2);
 PROTO_ALL(bs3CpuBasic2_jmp_opsize_end);
 #undef PROTO_ALL
@@ -3669 +3676 @@
 FNBS3FAR bs3CpuBasic2_jmp_jv16_wrap_forward__ud2;
 FNBS3FAR bs3CpuBasic2_jmp_jv16_opsize_wrap_forward__ud2;
+FNBS3FAR bs3CpuBasic2_call_jv16_wrap_forward__ud2;
+FNBS3FAR bs3CpuBasic2_call_jv16_opsize_wrap_forward__ud2;
 
 FNBS3FAR bs3CpuBasic2_jmp_target_wrap_backward;
@@ -3675 +3684 @@
 FNBS3FAR bs3CpuBasic2_jmp_jv16_wrap_backward__ud2;
 FNBS3FAR bs3CpuBasic2_jmp_jv16_opsize_wrap_backward__ud2;
+FNBS3FAR bs3CpuBasic2_call_jv16_wrap_backward__ud2;
+FNBS3FAR bs3CpuBasic2_call_jv16_opsize_wrap_backward__ud2;
 
 
@@ -3743 +3754 @@
             {  0,  true,           -1,  true, bs3CpuBasic2_call_jv_opsize__ud2_c16,             },
             {  0,  true,           -1,  true, bs3CpuBasic2_call_jv_opsize_back__ud2_c16,        },
+            {  0, false,           -1,  true, bs3CpuBasic2_call_ind_mem__ud2_c16,               },
+            {  0,  true,           -1,  true, bs3CpuBasic2_call_ind_mem_opsize__ud2_c16,        },
+            {  0, false, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX__ud2_c16,               },
+            {  0, false, X86_GREG_xDI,  true, bs3CpuBasic2_call_ind_xDI__ud2_c16,               },
+            {  0,  true, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX_opsize__ud2_c16,        },
 
             { -1, false,           -1, false, bs3CpuBasic2_jmp_jb_wrap_backward__ud2,           },
@@ -3753 +3769 @@
             { -1,  true,           -1, false, bs3CpuBasic2_jmp_jv16_opsize_wrap_backward__ud2,  },
             { +1,  true,           -1, false, bs3CpuBasic2_jmp_jv16_opsize_wrap_forward__ud2,   },
+            { -1, false,           -1,  true, bs3CpuBasic2_call_jv16_wrap_backward__ud2,        },
+            { +1, false,           -1,  true, bs3CpuBasic2_call_jv16_wrap_forward__ud2,         },
+            { -1,  true,           -1,  true, bs3CpuBasic2_call_jv16_opsize_wrap_backward__ud2, },
+            { +1,  true,           -1,  true, bs3CpuBasic2_call_jv16_opsize_wrap_forward__ud2,  },
         };
 
@@ -3821 +3841 @@
         }
 
-        /* Limit the wraparound CS segment to exlcude bs3CpuBasic2_jmp_target_wrap_backward
+        /* Limit the wraparound CS segment to exclude bs3CpuBasic2_jmp_target_wrap_backward
            and run the backward wrapping tests. */
         if (!BS3_MODE_IS_RM_OR_V86(bMode))
         {
             Bs3GdteSpare03.Gen.u16LimitLow = BS3_FP_OFF(bs3CpuBasic2_jmp_target_wrap_backward) - 1;
-            CtxExpected.cs = Ctx.cs = BS3_SEL_SPARE_03;
+            CtxExpected.cs    = Ctx.cs = BS3_SEL_SPARE_03;
+            CtxExpected.rsp.u = Ctx.rsp.u;
             for (iTest = 0; iTest < RT_ELEMENTS(s_aTests); iTest++)
                 if (s_aTests[iTest].iWrap < 0)
@@ -3848 +3869 @@
                     else
                         CtxExpected.rip.u = BS3_FP_OFF(bs3CpuBasic2_jmp_target_wrap_backward);
+                    CtxExpected.rsp.u = Ctx.rsp.u;
+                    if (s_aTests[iTest].fCall && (s_aTests[iTest].iWrap == 0 || !s_aTests[iTest].fOpSizePfx))
+                        CtxExpected.rsp.u -= s_aTests[iTest].fOpSizePfx ? 4 : 2;
                     //Bs3TestPrintf("cs:rip=%04RX16:%04RX64 v2\n", Ctx.cs, Ctx.rip.u);
                     Bs3TrapSetJmpAndRestore(&Ctx, &TrapCtx);
@@ -3893 +3917 @@
             {  32,  true, false,           -1,  true, bs3CpuBasic2_call_jv_opsize__ud2_c32,            },
             {  32,  true, false,           -1,  true, bs3CpuBasic2_call_jv_opsize_back__ud2_c32,       },
+            {  32, false, false,           -1,  true, bs3CpuBasic2_call_ind_mem__ud2_c32,              },
+            {  32,  true, false,           -1,  true, bs3CpuBasic2_call_ind_mem_opsize__ud2_c32,       },
+            {  32, false, false, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX__ud2_c32,              },
+            {  32, false, false, X86_GREG_xDI,  true, bs3CpuBasic2_call_ind_xDI__ud2_c32,              },
+            {  32,  true, false, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX_opsize__ud2_c32,       },
             /* 64bit/Intel: Use the _c64 tests, which are written to ignore the o16 prefix. */
             {  64, false,  true,           -1, false, bs3CpuBasic2_jmp_jb__ud2_c64,                    },
@@ -3912 +3941 @@
             {  64,  true,  true,           -1,  true, bs3CpuBasic2_call_jv_opsize__ud2_c64,            },
             {  64,  true,  true,           -1,  true, bs3CpuBasic2_call_jv_opsize_back__ud2_c64,       },
+            {  64, false,  true,           -1,  true, bs3CpuBasic2_call_ind_mem__ud2_c64,              },
+            {  64,  true,  true,           -1,  true, bs3CpuBasic2_call_ind_mem_opsize__ud2__intel_c64,},
+            {  64, false,  true, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX__ud2_c64,              },
+            {  64, false,  true, X86_GREG_xDI,  true, bs3CpuBasic2_call_ind_xDI__ud2_c64,              },
+            {  64, false,  true, X86_GREG_x9,   true, bs3CpuBasic2_call_ind_r9__ud2_c64,               },
+            {  64,  true,  true, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX_opsize__ud2_c64,       }, /* no intel version needed */
             /* 64bit/AMD: Use the _c32 tests. */
             {  64, false, false,           -1, false, bs3CpuBasic2_jmp_jb__ud2_c32,                    },
@@ -3922 +3957 @@
             {  64,  true, false,           -1, false, bs3CpuBasic2_jmp_jv_opsize_back__ud2_c32,        },
             {  64, false, false,           -1, false, bs3CpuBasic2_jmp_ind_mem__ud2_c64,               }, /* using c64 here */
-            {  64,  true, false,           -1, false, bs3CpuBasic2_jmp_ind_mem_opsize__ud2_c64,        }, /* using c64 here */
+            {  64,  true, false,           -1, false, bs3CpuBasic2_jmp_ind_mem_opsize__ud2_c64,        }, /* ditto */
             {  64, false, false, X86_GREG_xAX, false, bs3CpuBasic2_jmp_ind_xAX__ud2_c64,               }, /* ditto */
             {  64, false, false, X86_GREG_xDI, false, bs3CpuBasic2_jmp_ind_xDI__ud2_c64,               }, /* ditto */
@@ -3931 +3966 @@
             {  64,  true, false,           -1,  true, bs3CpuBasic2_call_jv_opsize__ud2_c32,            },
             {  64,  true, false,           -1,  true, bs3CpuBasic2_call_jv_opsize_back__ud2_c32,       },
+            {  64, false, false,           -1,  true, bs3CpuBasic2_call_ind_mem__ud2_c64,              }, /* using c64 here */
+            {  64,  true, false,           -1,  true, bs3CpuBasic2_call_ind_mem_opsize__ud2_c64,       }, /* ditto */
+            {  64, false, false, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX__ud2_c64,              }, /* ditto */
+            {  64, false, false, X86_GREG_xDI,  true, bs3CpuBasic2_call_ind_xDI__ud2_c64,              }, /* ditto */
+            {  64, false, false, X86_GREG_x9,   true, bs3CpuBasic2_call_ind_r9__ud2_c64,               }, /* ditto */
+            {  64,  true, false, X86_GREG_xAX,  true, bs3CpuBasic2_call_ind_xAX_opsize__ud2_c64,       }, /* ditto */
         };
         uint8_t const           cBits    = BS3_MODE_IS_64BIT_CODE(bMode) ? 64 : 32;