Changeset 36650 in vbox for trunk/src/VBox/Devices/EFI/Thunk/EfiThunk.asm

Timestamp:

Apr 12, 2011 11:19:47 AM (14 years ago)

Author:

vboxsync

Message:

EFI64: initialization of task register before switch to compatible mode. (xTracker/5643).

File:

• trunk/src/VBox/Devices/EFI/Thunk/EfiThunk.asm (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/Thunk/EfiThunk.asm

@@ -76 +76 @@
         dw      0xffff, 0, 0x9300, 0x00cf       ; 32 bit flat stack segment (0x30)
         dw      0xffff, 0, 0x9a00, 0x00af       ; 64 bit flat code segment (0x38)
-        dw      0,      0, 0,      0            ; ditto
+        dw      0xffff, 0, 0x8900, 0x0080       ; 64 bit TSS descriptor (0x40)
         dw      0,      0, 0,      0            ; ditto
 
@@ -92 +92 @@
         db      0x0f                            ; base  23:16
         db      0x00                            ; unused
-        
+
 BITS 32
 
@@ -224 +224 @@
 %endmacro
 
-%define base 0x800000;0xfffff000 
+%define base 0x800000;0xfffff000
         mov ecx, 0x800 ; pde size
         mov ebx, base - (6 << X86_PAGE_4K_SHIFT)
         xor eax, eax
-        ;; or flags to eax 
-        or eax, (X86_PDE_P|X86_PDE_A|X86_PDE_PS|X86_PDE_PCD|X86_PDE_RW|RT_BIT(6)) 
+        ;; or flags to eax
+        or eax, (X86_PDE_P|X86_PDE_A|X86_PDE_PS|X86_PDE_PCD|X86_PDE_RW|RT_BIT(6))
         fill_pkt (1 << X86_PAGE_2M_SHIFT)
 
         ;; pdpt (1st 4 entries describe 4Gb)
         mov ebx, base - (2 << X86_PAGE_4K_SHIFT)
-        mov eax, base - (6 << X86_PAGE_4K_SHIFT) ;; 
-        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
-        mov [ebx],eax
-        xor edx,edx
-        mov [ebx + 4], edx
-        add ebx, 8
-
-        mov eax, base - 5 * (1 << X86_PAGE_4K_SHIFT) ;; 
-        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
-        mov [ebx],eax
-        xor edx,edx
-        mov [ebx + 4], edx
-        add ebx, 8
-
-        mov eax, base - 4 * (1 << X86_PAGE_4K_SHIFT) ;; 
-        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
-        mov [ebx],eax
-        xor edx,edx
-        mov [ebx + 4], edx
-        add ebx, 8
-
-        mov eax, base - 3 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        mov eax, base - (6 << X86_PAGE_4K_SHIFT) ;;
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 5 * (1 << X86_PAGE_4K_SHIFT) ;;
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 4 * (1 << X86_PAGE_4K_SHIFT) ;;
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 3 * (1 << X86_PAGE_4K_SHIFT) ;;
         or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
         mov [ebx],eax
@@ -264 +264 @@
         mov ecx, 0x1f7 ; pdte size
         mov ebx, base - 2 * (1 << X86_PAGE_4K_SHIFT) + 4 * 8
-        mov eax, base - 6 * (1 << X86_PAGE_4K_SHIFT);; 
-        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
-        ;; or flags to eax 
+        mov eax, base - 6 * (1 << X86_PAGE_4K_SHIFT);;
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        ;; or flags to eax
         fill_pkt 3 * (1 << X86_PAGE_4K_SHIFT)
-        
+
         mov ecx, 0x200 ; pml4 size
         mov ebx, base - (1 << X86_PAGE_4K_SHIFT)
-        mov eax, base - 2 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        mov eax, base - 2 * (1 << X86_PAGE_4K_SHIFT) ;;
         or eax, (X86_PML4E_P|X86_PML4E_PCD|X86_PML4E_A|X86_PML4E_RW)
-        ;; or flags to eax 
+        ;; or flags to eax
         fill_pkt 0
 
@@ -283 +283 @@
         or eax, X86_CR4_PAE|X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT
         mov cr4,eax
-        
+
         mov ecx, MSR_K6_EFER
         rdmsr
         or  eax, MSR_K6_EFER_LME
         wrmsr
+
+        mov ax, 0x40
+        ltr ax
 
         mov     eax, cr0