tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 23:24:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeMdeModulePkg/BootScriptExecutorDxe: Replaces absolute addressing that requires a relocation entry with PC relative addressing that does not require a relocation entry. This patch is required to make this file assemble and link with Xcode

Browse Source 
Signed-off-by: Andrew Fish <afish@apple.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14279 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
erictian 2013-04-16 02:45:36 +00:00
parent 3a146f2a7d
commit d9a1844ed3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.S
View File

@ -2,7 +2,7 @@
# This is the assembly code for transferring to control to OS S3 waking vector # This is the assembly code for transferring to control to OS S3 waking vector
# for X64 platform # for X64 platform
# #
# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are # This program and the accompanying materials are
# licensed and made available under the terms and conditions of the BSD License # licensed and made available under the terms and conditions of the BSD License
@ -18,14 +18,14 @@ ASM_GLOBAL ASM_PFX(AsmTransferControl)
ASM_PFX(AsmTransferControl): ASM_PFX(AsmTransferControl):
# rcx S3WakingVector :DWORD # rcx S3WakingVector :DWORD
# rdx AcpiLowMemoryBase :DWORD # rdx AcpiLowMemoryBase :DWORD
lea _AsmTransferControl_al_0000, %eax lea _AsmTransferControl_al_0000(%rip), %eax
movq $0x2800000000, %r8 movq $0x2800000000, %r8
orq %r8, %rax orq %r8, %rax
pushq %rax pushq %rax
shrd $20, %ecx, %ebx shrd $20, %ecx, %ebx
andl $0x0f, %ecx andl $0x0f, %ecx
movw %cx, %bx movw %cx, %bx
movl %ebx, jmp_addr movl %ebx, jmp_addr(%rip)
lret lret
_AsmTransferControl_al_0000: _AsmTransferControl_al_0000:
.byte 0x0b8, 0x30, 0 # mov ax, 30h as selector .byte 0x0b8, 0x30, 0 # mov ax, 30h as selector
@ -124,7 +124,7 @@ ASM_PFX(PageFaultHandlerHook):
popq %rcx popq %rcx
popq %rax # restore all volatile registers popq %rax # restore all volatile registers
jnz L1 jnz L1
jmpq *ASM_PFX(mOriginalHandler) jmpq *ASM_PFX(mOriginalHandler)(%rip)
L1: L1:
addq $0x08, %rsp # skip error code for PF addq $0x08, %rsp # skip error code for PF
iretq iretq