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

Timestamp:

Mar 10, 2016 7:58:08 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: 64-bit fixes and some updates.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-cmn-SwitchTo16Bit.asm (modified) (2 diffs)
• bs3-mode-SwitchToRM.asm (modified) (3 diffs)
• bs3kit-template-footer.mac (modified) (2 diffs)
• bs3kit-template-header.mac (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-SwitchTo16Bit.asm

@@ -50 +50 @@
         ; Switch to ring-0 if v8086 mode.
         mov     ax, BS3_SYSCALL_TO_RING0
-        int     BS3_TRAP_SYSCALL
+        lock int BS3_TRAP_SYSCALL
 
 .ret_16bit:
@@ -103 +103 @@
 
         popfd
- %if TMPL_BITS == 64
-        add     sp, 4
- %endif
+        TMPL_ONLY_64BIT_STMT pop     ebx
         pop     ebx
- %if TMPL_BITS == 64
-        add     sp, 4
- %endif
+        TMPL_ONLY_64BIT_STMT pop     eax
         pop     eax
- %if TMPL_BITS == 64
-        add     sp, 4
- %endif
+        TMPL_ONLY_64BIT_STMT add     sp, 4
         ret     (TMPL_BITS - 16) / 8    ; Return and pop 2 or 6 bytes of "parameters" (unused return value)
 

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

@@ -70 +70 @@
         cmp     byte [BS3_DATA16_WRT(g_uBs3CpuDetected)], BS3CPU_80286
         ja      .do_386_prologue
-        push    bp
         push    ax
         push    bx
@@ -78 +77 @@
  %endif
 .do_386_prologue:
-        push    sBP
         push    sAX
         push    sBX
@@ -171 +169 @@
         pop     bp
  %endif
- %if TMPL_BITS != 64
 .do_386_epilogue:
         popfd
+        TMPL_ONLY_64BIT_STMT pop ebx
         pop     ebx
+        TMPL_ONLY_64BIT_STMT pop eax
         pop     eax
-%if 0
-        pop     ebp
-%else
-add     esp, 4
-%endif
- %else
-        pop     eax
-        popfd
-        pop     ebx
-        pop     ebx
-        pop     eax
-        pop     eax
-        pop     ebp
-        pop     ebp
- %endif
+        TMPL_ONLY_64BIT_STMT add sp, 4
         retn    (TMPL_BITS - 16) / 8
 

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2007-2015 Oracle Corporation
+; Copyright (C) 2007-2016 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -123 +123 @@
 %undef sSI
 
+%unmacro TMPL_ONLY_16BIT_STMT 1+
+%unmacro TMPL_ONLY_32BIT_STMT 1+
+%unmacro TMPL_ONLY_64BIT_STMT 1+
+

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

@@ -431 +431 @@
 %endif
 
+;; @def TMPL_ONLY_16BIT_STMT
+; Version of BS3_ONLY_16BIT_STMT that follows the code template.
+%if TMPL_BITS == 16
+ %macro TMPL_ONLY_16BIT_STMT 1+
+        %1
+ %endmacro
+%else
+ %macro TMPL_ONLY_16BIT_STMT 1+
+ %endmacro
+%endif
+
+;; @def TMPL_ONLY_32BIT_STMT
+; Version of BS3_ONLY_32BIT_STMT that follows the code template.
+%if TMPL_BITS == 32
+ %macro TMPL_ONLY_32BIT_STMT 1+
+        %1
+ %endmacro
+%else
+ %macro TMPL_ONLY_32BIT_STMT 1+
+ %endmacro
+%endif
+
+;; @def TMPL_ONLY_64BIT_STMT
+; Version of BS3_ONLY_64BIT_STMT that follows the code template.
+%if TMPL_BITS == 64
+ %macro TMPL_ONLY_64BIT_STMT 1+
+        %1
+ %endmacro
+%else
+ %macro TMPL_ONLY_64BIT_STMT 1+
+ %endmacro
+%endif
+
 ;
 ; Default code segment (changes BITS too).