Changeset 60367 in vbox for trunk

Timestamp:

Apr 7, 2016 2:58:16 AM (9 years ago)

Author:

vboxsync

Message:

bs3-cmn-TestIsVmmDevTestingPresent.asm: 286 fixes.

File:

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

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

@@ -28 +28 @@
 %include "VBox/VMMDevTesting.mac"
 
+;*********************************************************************************************************************************
+;*  External Symbols                                                                                                             *
+;*********************************************************************************************************************************
+BS3_EXTERN_DATA16 g_uBs3CpuDetected
 TMPL_BEGIN_TEXT
+
 
 ;;
@@ -41 +46 @@
         ; Check the response from the NOP port.
         mov     dx, VMMDEV_TESTING_IOPORT_NOP
+        cmp     byte [g_uBs3CpuDetected], BS3CPU_80386
+        jb      .ancient_cpu
         in      eax, dx
         cmp     eax, VMMDEV_TESTING_NOP_RET
-        mov     eax, 0
+.set_ax_and_return:
+        mov     ax, 0
         jne     .return
-        mov     eax, 1
+        mov     ax, 1
 
 .return:
         pop     xDX
-        leave
+        pop     xBP
         BS3_CALL_CONV_EPILOG 2
         ret
+
+.ancient_cpu:
+        in      ax, dx
+        cmp     ax, (VMMDEV_TESTING_NOP_RET & 0xffff)
+        jmp     .set_ax_and_return
 BS3_PROC_END_CMN   bs3TestIsVmmDevTestingPresent
 
-