Changeset 59946 in vbox for trunk

Timestamp:

Mar 7, 2016 4:37:34 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: fixes (can switch to every weird mode now, though v86 requires some additional work).

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-mode-SwitchToLM16.asm (modified) (1 diff)
• bs3-mode-TestDoModes.c (modified) (1 diff)
• bs3-mode-TestDoModesHlp.asm (modified) (2 diffs)
• bs3kit-template-header.mac (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToLM16.asm

@@ -66 +66 @@
 
         extern  _Bs3SwitchTo16Bit_c32
+ %if TMPL_BITS == 16
+        sub     esp, 2
+        shr     dword [esp], 16
+ %elif TMPL_BITS == 64
+        pop     dword [esp + 4]
+ %endif
         jmp     _Bs3SwitchTo16Bit_c32
 %endif

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModes.c

@@ -172 +172 @@
 {
     bool const      fDoV86Mode    = false;
-    uint8_t const   bCpuType      = BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_TYPE_MASK;
-    bool const      fHavePae      = RT_BOOL(BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_F_PAE);
-    bool const      fHaveLongMode = RT_BOOL(BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_F_LONG_MODE);
+    uint16_t const  uCpuDetected  = BS3_DATA_NM(g_uBs3CpuDetected);
+    uint8_t const   bCpuType      = uCpuDetected & BS3CPU_TYPE_MASK;
+    bool const      fHavePae      = RT_BOOL(uCpuDetected & BS3CPU_F_PAE);
+    bool const      fHaveLongMode = RT_BOOL(uCpuDetected & BS3CPU_F_LONG_MODE);
     unsigned        i;
 
+#if 1 /* debug. */
+    Bs3Printf("Bs3TestDoModes: uCpuDetected=%#x fHavePae=%d fHaveLongMode=%d\n", uCpuDetected, fHavePae, fHaveLongMode);
+#endif
     bs3TestWarnAboutSkippedModes(paEntries, cEntries, bCpuType, fHavePae, fHaveLongMode);
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModesHlp.asm

@@ -81 +81 @@
 ; @param    xAX     Where to jump to for the main event.
 ;
-TMPL_NM(bs3TestCallDoerPrologue):
+BS3_GLOBAL_NAME_EX TMPL_NM(bs3TestCallDoerPrologue), , 0
         BS3_CALL_CONV_PROLOG 1
         push    xBP
@@ -120 +120 @@
 ; @param    xAX     Return code.
 ;
-TMPL_NM(bs3TestCallDoerEpilogue):
+BS3_GLOBAL_NAME_EX TMPL_NM(bs3TestCallDoerEpilogue), , 0
         ; Restore registers.
 %if TMPL_BITS == 16

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.mac

@@ -330 +330 @@
 %elif TMPL_MODE == BS3_MODE_PAE32_16
  %define TMPL_PAE32_16
- %define TMPL_MODE_STR          "32-bit pae, 32-bit"
+ %define TMPL_MODE_STR          "32-bit pae, 16-bit"
  %define TMPL_NM(Name)          _ %+ Name %+ _pae32_16
  %define TMPL_MODE_LNAME        pae32_16