Changeset 39158 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Nov 1, 2011 8:24:34 AM (13 years ago)

Author:

vboxsync

Message:

EFI: modifies thunk to boot firmware based on EDK2 r9572.

File:

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

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

@@ -199 +199 @@
 
         ;
+        ; UEFI spec requires FPU initialization.
+        ;
+
+        mov eax,cr4
+        or eax, X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT
+        mov cr4,eax
+        ;
         ; Jump to 32-bit entry point of the firmware, interrupts still disabled.
         ;
@@ -205 +212 @@
         ; around all it wants for all we care.
         ;
+
         mov     eax,[0xfffff000 + DEVEFIINFO.fFlags]
         and      eax, DEVEFI_INFO_FLAGS_AMD64
         jnz trampoline_64
+        xor     eax,eax
+        xor     edi,edi
         mov     ebp, [0xfffff000 + DEVEFIINFO.PhysFwVol]
-        mov     esi, [0xfffff000 + DEVEFIINFO.pfnFirmwareEP]
-        mov     edi, [0xfffff000 + DEVEFIINFO.pfnPeiEP]
+        ;mov     esi, [0xfffff000 + DEVEFIINFO.pfnFirmwareEP]
+        ;mov     edi, [0xfffff000 + DEVEFIINFO.pfnPeiEP]
         jmp     [0xfffff000 + DEVEFIINFO.pfnFirmwareEP]
         jmp     HaltForEver
@@ -281 +291 @@
 
         mov eax,cr4
-        or eax, X86_CR4_PAE|X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT
+        or eax, X86_CR4_PAE
         mov cr4,eax
 
@@ -301 +311 @@
 efi_64:
         mov     ebp, [0xff009] ;  DEVEFIINFO.PhysFwVol
-        mov     esi, [0xff000]; + DEVEFIINFO.pfnFirmwareEP]
-        mov     edi, [0xff000 + 0x28]; + DEVEFIINFO.pfnPeiEP]
+        ;mov     esi, [0xff000]; + DEVEFIINFO.pfnFirmwareEP]
+        ;mov     edi, [0xff000 + 0x28]; + DEVEFIINFO.pfnPeiEP]
+        xor     rax,rax
+        xor     rdi,rdi
         jmp     [0xff000]; + DEVEFIINFO.pfnFirmwareEP]
         jmp     HaltForEver