Changeset 64704 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Nov 17, 2016 10:51:41 PM (8 years ago)

Author:

vboxsync

Message:

bs3-basic-2: started on #PF testcase

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Config.kmk (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• bs3-cpu-basic-2-32.c32 (added)
• bs3-cpu-basic-2-pf.c32 (added)
• bs3-cpu-basic-2.c (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -410 +410 @@
 $(TOOL_OPENWATCOM_COMPILE_C_CMDS)
         $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
 
@@ -444 +443 @@
 $(TOOL_OPENWATCOM_COMPILE_CXX_CMDS)
         $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
 
@@ -470 +468 @@
 $(TOOL_OPENWATCOM-16_COMPILE_C_CMDS)
         $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
 
@@ -504 +501 @@
 $(TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS)
         $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
 

trunk/src/VBox/ValidationKit/bootsectors/Makefile.kmk

@@ -244 +244 @@
         bs3-cpu-basic-2.c \
         bs3-cpu-basic-2-x0.c \
+        bs3-cpu-basic-2-32.c32 \
+        bs3-cpu-basic-2-pf.c32 \
         bs3-cpu-basic-2-asm.asm \
        bs3kit/bs3-cmn-instantiate-x0.c16 \

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

@@ -45 +45 @@
 FNBS3TESTDOMODE             bs3CpuBasic2_iret_f16;
 
+BS3_DECL_CALLBACK(void)     bs3CpuBasic2_Do32BitTests_pe32();
+
 
 /*********************************************************************************************************************************
@@ -52 +54 @@
 {
     BS3TESTMODEENTRY_MODE("tss / gate / esp", bs3CpuBasic2_TssGateEsp),
-    BS3TESTMODEENTRY_MODE("raise xcpt #1", bs3CpuBasic2_RaiseXcpt1),
+    //BS3TESTMODEENTRY_MODE("raise xcpt #1", bs3CpuBasic2_RaiseXcpt1), // !long mode is broken!
 };
 
@@ -58 +60 @@
 {
     { "iret", bs3CpuBasic2_iret_f16, 0 },
-#if 0
     { "sidt", bs3CpuBasic2_sidt_f16, 0 },
     { "sgdt", bs3CpuBasic2_sgdt_f16, 0 },
     { "lidt", bs3CpuBasic2_lidt_f16, 0 },
     { "lgdt", bs3CpuBasic2_lgdt_f16, 0 },
-#endif
 };
 
@@ -73 +73 @@
     Bs3TestPrintf("g_uBs3CpuDetected=%#x\n", g_uBs3CpuDetected);
 
+    /*
+     * Do tests driven from 16-bit code.
+     */
     NOREF(g_aModeTest); NOREF(g_aModeByOneTests); /* for when commenting out bits */
-    //Bs3TestDoModes_rm(g_aModeTest, RT_ELEMENTS(g_aModeTest));
+    Bs3TestDoModes_rm(g_aModeTest, RT_ELEMENTS(g_aModeTest));
     Bs3TestDoModesByOne_rm(g_aModeByOneTests, RT_ELEMENTS(g_aModeByOneTests), 0);
+
+    /*
+     * Do tests driven from 32-bit code (bs3-cpu-basic-2-32.c32 via assembly).
+     */
+    Bs3SwitchTo32BitAndCallC_rm(bs3CpuBasic2_Do32BitTests_pe32, 0);
 
     Bs3TestTerm();