vbox的更動 1089 路徑 trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

時間撮記:

2007-2-28 上午08:42:35 (18 年 以前)

作者:

vboxsync

訊息:

Fixed broken return path in generic trap handler for v86 code

檔案:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm (修改) (3 筆差異)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

@@ -497 +497 @@
 
     mov     eax, dword [esp + CPUMCTXCORE.es]
-    mov     [esp + 0ch + ESPOFF], eax           ; es
+    mov     [esp + 1ch + ESPOFF], eax           ; es
     mov     eax, dword [esp + CPUMCTXCORE.ds]
-    mov     [esp + 10h + ESPOFF], eax           ; ds
+    mov     [esp + 20h + ESPOFF], eax           ; ds
     mov     eax, dword [esp + CPUMCTXCORE.fs]
-    mov     [esp + 14h + ESPOFF], eax           ; fs
+    mov     [esp + 24h + ESPOFF], eax           ; fs
     mov     eax, dword [esp + CPUMCTXCORE.gs]
-    mov     [esp + 18h + ESPOFF], eax           ; gs
+    mov     [esp + 28h + ESPOFF], eax           ; gs
 
     mov     eax, [esp + CPUMCTXCORE.eip]
@@ -914 +914 @@
     mov     edi, [esp + CPUMCTXCORE.edi]
 
+    ; In V86 mode DS, ES, FS & GS are restored by the iret
+    test    dword [esp + CPUMCTXCORE.eflags], X86_EFL_VM
+    jnz     short ti_SkipSelRegs
+
     mov     eax, [esp + CPUMCTXCORE.gs]
     TRPM_NP_GP_HANDLER NAME(trpmGCTrapInGeneric), TRPM_TRAP_IN_MOV_GS | TRPM_TRAP_IN_HYPER
@@ -927 +931 @@
     mov     ds, eax
 
+ti_SkipSelRegs:
     ; finally restore our scratch register eax
     mov     eax, [esp + CPUMCTXCORE.eax]