Changeset 64698 in vbox

Timestamp:

Nov 17, 2016 5:59:20 PM (8 years ago)

Author:

vboxsync

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

111977

Message:

bs3kit: fix

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-mode-SwitchTo32BitAndCallC.asm (modified) (2 diffs)
• bs3kit.h (modified) (1 diff)

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

@@ -52 +52 @@
  %if BS3_MODE_IS_16BIT_CODE_NO_V86(TMPL_MODE)
 extern              _Bs3SwitchTo16Bit_c32
- %elif BS3_MODE_IS_32BIT_CODE_NO_V86(TMPL_MODE)
+ %elif BS3_MODE_IS_V86(TMPL_MODE)
 extern              _Bs3SwitchTo16BitV86_c32
  %elif !BS3_MODE_IS_32BIT_CODE(TMPL_MODE)
@@ -137 +137 @@
 %elif BS3_MODE_IS_16BIT_CODE_NO_V86(TMPL_MODE)
         call    _Bs3SwitchTo16Bit_c32
-%elif BS3_MODE_IS_32BIT_CODE_NO_V86(TMPL_MODE)
+%elif BS3_MODE_IS_V86(TMPL_MODE)
         call    _Bs3SwitchTo16BitV86_c32
 %elif !BS3_MODE_IS_32BIT_CODE(TMPL_MODE)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -3307 +3307 @@
  * Call 32-bit prot mode C function.
  *
- * This switches from the current mode and calls the 32-bit @a fpfnCall C code
- * with @a cbParams on the stack, then returns.
+ * This switches to 32-bit mode and calls the 32-bit @a fpfnCall C code with @a
+ * cbParams on the stack, then returns in the original mode.  When called in
+ * real mode, this will switch to PE32.
  *
  * @returns 32-bit status code if the function returned anything.