Changeset 60205 in vbox

Timestamp:

Mar 27, 2016 12:45:44 PM (9 years ago)

Author:

vboxsync

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

106239

Message:

bs3-cmn-syscall.asm: Save and restore g_uBs3TrapEipHint in 16-bit and 32-bit mode so the testcases doesn't need to set it for each trap in the same location.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-Syscall.asm (modified) (2 diffs)

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

@@ -56 +56 @@
         push    xBX
 
-%if TMPL_BITS == 16
+%if TMPL_BITS == 32
+        mov     ebx, .return
+        xchg    ebx, [BS3_DATA16_WRT(g_uBs3TrapEipHint)]
+%elif TMPL_BITS == 16
         mov     bl, [BS3_DATA16_WRT(g_bBs3CurrentMode)]
         and     bl, BS3_MODE_CODE_MASK
         cmp     bl, BS3_MODE_CODE_V86
         mov     bx, 0
-        mov     [2 + BS3_DATA16_WRT(g_uBs3TrapEipHint)], bx
+        xchg    bx, [2 + BS3_DATA16_WRT(g_uBs3TrapEipHint)]
         jne     .normal
-        db 0xf0                         ; lock prefix
-%else
-        BS3_LEA_MOV_WRT_RIP(xBX, .return)
-        mov     [BS3_DATA16_WRT(g_uBs3TrapEipHint)], ebx
+
+        db      0xf0                    ; Lock prefix for causing #UD in V8086 mode.
 %endif
 .normal:
@@ -72 +73 @@
 
 .return:
+        ; Restore the EIP hint so the testcase code doesn't need to set it all the time.
+%if TMPL_BITS == 32
+        mov     [BS3_DATA16_WRT(g_uBs3TrapEipHint)], ebx
+%elif TMPL_BITS == 16
+        mov     [2 + BS3_DATA16_WRT(g_uBs3TrapEipHint)], bx
+%endif
+
         pop     xBX
         pop     xBP