1. Separated DxeSmmCpuExceptionHandlerLib.inf into 2 instance DxeCpuExceptionHandlerLib.inf and SmmCpuExceptionHandlerLib.inf.
2. Updated CPU Exception Handler Library instance according to the new CPU Exception Handler Library class definitions. 3. Updated CPU Exception Handler Library instance to handle the vector attributes defined in PI 1.2.1. Signed-off-by: Jeff Fan <jeff.fan@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Reviewed-by: Feng Tian <feng.tian@intel.com> Reviewed-by: Hot Tian <hot.tian@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14885 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#------------------------------------------------------------------------------
|
||||
#*
|
||||
#* Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
|
||||
#* Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
#* This program and the accompanying materials
|
||||
#* are licensed and made available under the terms and conditions of the BSD License
|
||||
#* which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -18,16 +18,15 @@
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#.MMX
|
||||
#.XMM
|
||||
|
||||
ASM_GLOBAL ASM_PFX(CommonExceptionHandler)
|
||||
ASM_GLOBAL ASM_PFX(CommonInterruptEntry)
|
||||
ASM_GLOBAL ASM_PFX(HookAfterStubEnd)
|
||||
|
||||
#EXTRN ASM_PFX(mErrorCodeFlag):DWORD # Error code flags for exceptions
|
||||
#EXTRN ASM_PFX(mErrorCodeFlag):DWORD # Error code flags for exceptions
|
||||
#EXTRN ASM_PFX(mDoFarReturnFlag):DWORD # Do far return flag
|
||||
|
||||
.text
|
||||
|
||||
@@ -35,101 +34,250 @@ ASM_GLOBAL ASM_PFX(CommonInterruptEntry)
|
||||
# exception handler stub table
|
||||
#
|
||||
Exception0Handle:
|
||||
pushl $0
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 0
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception1Handle:
|
||||
pushl $1
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 1
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception2Handle:
|
||||
pushl $2
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 2
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception3Handle:
|
||||
pushl $3
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 3
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception4Handle:
|
||||
pushl $4
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 4
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception5Handle:
|
||||
pushl $5
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 5
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception6Handle:
|
||||
pushl $6
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 6
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception7Handle:
|
||||
pushl $7
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 7
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception8Handle:
|
||||
pushl $8
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 8
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception9Handle:
|
||||
pushl $9
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 9
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception10Handle:
|
||||
pushl $10
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 10
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception11Handle:
|
||||
pushl $11
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 11
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception12Handle:
|
||||
pushl $12
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 12
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception13Handle:
|
||||
pushl $13
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 13
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception14Handle:
|
||||
pushl $14
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 14
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception15Handle:
|
||||
pushl $15
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 15
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception16Handle:
|
||||
pushl $16
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 16
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception17Handle:
|
||||
pushl $17
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 17
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception18Handle:
|
||||
pushl $18
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 18
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception19Handle:
|
||||
pushl $19
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 19
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception20Handle:
|
||||
pushl $20
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 20
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception21Handle:
|
||||
pushl $21
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 21
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception22Handle:
|
||||
pushl $22
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 22
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception23Handle:
|
||||
pushl $23
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 23
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception24Handle:
|
||||
pushl $24
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 24
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception25Handle:
|
||||
pushl $25
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 25
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception26Handle:
|
||||
pushl $26
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 26
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception27Handle:
|
||||
pushl $27
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 27
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception28Handle:
|
||||
pushl $28
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 28
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception29Handle:
|
||||
pushl $29
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 29
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception30Handle:
|
||||
pushl $30
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 30
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
Exception31Handle:
|
||||
pushl $31
|
||||
jmp ASM_PFX(CommonInterruptEntry)
|
||||
.byte 0x6a # push #VectorNum
|
||||
.byte 31
|
||||
pushl %eax
|
||||
.byte 0xB8
|
||||
.long ASM_PFX(CommonInterruptEntry)
|
||||
jmp *%eax
|
||||
|
||||
HookAfterStubBegin:
|
||||
.byte 0x6a # push
|
||||
VectorNum:
|
||||
.byte 0 # 0 will be fixed
|
||||
pushl %eax
|
||||
.byte 0xB8 # movl ASM_PFX(HookAfterStubHeaderEnd), %eax
|
||||
.long ASM_PFX(HookAfterStubHeaderEnd)
|
||||
jmp *%eax
|
||||
ASM_GLOBAL ASM_PFX(HookAfterStubHeaderEnd)
|
||||
HookAfterStubHeaderEnd:
|
||||
popl %eax
|
||||
subl $8, %esp # reserve room for filling exception data later
|
||||
pushl 8(%esp)
|
||||
xchgl (%esp), %ecx # get vector number
|
||||
bt %ecx, ASM_PFX(mErrorCodeFlag)
|
||||
jnc NoErrorData
|
||||
pushl (%esp) # addition push if exception data needed
|
||||
NoErrorData:
|
||||
xchg (%esp), %ecx # restore ecx
|
||||
pushl %eax
|
||||
|
||||
#---------------------------------------;
|
||||
# CommonInterruptEntry ;
|
||||
@@ -139,19 +287,17 @@ Exception31Handle:
|
||||
ASM_GLOBAL ASM_PFX(CommonInterruptEntry)
|
||||
ASM_PFX(CommonInterruptEntry):
|
||||
cli
|
||||
popl %eax
|
||||
#
|
||||
# All interrupt handlers are invoked through interrupt gates, so
|
||||
# IF flag automatically cleared at the entry point
|
||||
#
|
||||
|
||||
#
|
||||
# Calculate vector number
|
||||
#
|
||||
# Get the return address of call, actually, it is the
|
||||
# address of vector number.
|
||||
# Get vector number from top of stack
|
||||
#
|
||||
xchgl (%esp), %ecx
|
||||
andl $0x0FFFF, %ecx
|
||||
andl $0x0FF, %ecx # Vector number should be less than 256
|
||||
cmpl $32, %ecx # Intel reserved vector for exceptions?
|
||||
jae NoErrorCode
|
||||
bt %ecx, ASM_PFX(mErrorCodeFlag)
|
||||
@@ -241,6 +387,10 @@ ErrorCodeAndVectorOnStack:
|
||||
andl $0x0fffffff0, %esp
|
||||
subl $12, %esp
|
||||
|
||||
subl $8, %esp
|
||||
pushl $0 # check EXCEPTION_HANDLER_CONTEXT.OldIdtHandler
|
||||
pushl $0 # check EXCEPTION_HANDLER_CONTEXT.ExceptionDataFlag
|
||||
|
||||
#; UINT32 Edi, Esi, Ebp, Esp, Ebx, Edx, Ecx, Eax;
|
||||
pushl %eax
|
||||
pushl %ecx
|
||||
@@ -405,18 +555,41 @@ ErrorCodeAndVectorOnStack:
|
||||
popl %ecx
|
||||
popl %eax
|
||||
|
||||
popl -8(%ebp)
|
||||
popl -4(%ebp)
|
||||
movl %ebp, %esp
|
||||
popl %ebp
|
||||
addl $8, %esp
|
||||
cmpl $0, -16(%esp) # check EXCEPTION_HANDLER_CONTEXT.OldIdtHandler
|
||||
jz DoReturn
|
||||
cmpl $1, -20(%esp) # check EXCEPTION_HANDLER_CONTEXT.ExceptionDataFlag
|
||||
jz ErrorCode
|
||||
jmp *-16(%esp)
|
||||
ErrorCode:
|
||||
subl $4, %esp
|
||||
jmp *-12(%esp)
|
||||
|
||||
DoReturn:
|
||||
cmpl $0, ASM_PFX(mDoFarReturnFlag)
|
||||
jz DoIret
|
||||
pushl 8(%esp) # save EFLAGS
|
||||
addl $16, %esp
|
||||
pushl -8(%esp) # save CS in new location
|
||||
pushl -8(%esp) # save EIP in new location
|
||||
pushl -8(%esp) # save EFLAGS in new location
|
||||
popfl # restore EFLAGS
|
||||
retf # far return
|
||||
|
||||
DoIret:
|
||||
iretl
|
||||
|
||||
|
||||
#---------------------------------------;
|
||||
# _GetTemplateAddressMap ;
|
||||
#----------------------------------------------------------------------------;
|
||||
# _AsmGetTemplateAddressMap ;
|
||||
#---------------------------------------;
|
||||
#
|
||||
# Protocol prototype
|
||||
# GetTemplateAddressMap (
|
||||
# AsmGetTemplateAddressMap (
|
||||
# EXCEPTION_HANDLER_TEMPLATE_MAP *AddressMap
|
||||
# );
|
||||
#
|
||||
@@ -443,8 +616,8 @@ ErrorCodeAndVectorOnStack:
|
||||
#-------------------------------------------------------------------------------------
|
||||
# AsmGetAddressMap (&AddressMap);
|
||||
#-------------------------------------------------------------------------------------
|
||||
ASM_GLOBAL ASM_PFX(GetTemplateAddressMap)
|
||||
ASM_PFX(GetTemplateAddressMap):
|
||||
ASM_GLOBAL ASM_PFX(AsmGetTemplateAddressMap)
|
||||
ASM_PFX(AsmGetTemplateAddressMap):
|
||||
|
||||
pushl %ebp
|
||||
movl %esp,%ebp
|
||||
@@ -453,8 +626,17 @@ ASM_PFX(GetTemplateAddressMap):
|
||||
movl 0x8(%ebp), %ebx
|
||||
movl $Exception0Handle, (%ebx)
|
||||
movl $(Exception1Handle - Exception0Handle), 0x4(%ebx)
|
||||
movl $(HookAfterStubBegin), 0x8(%ebx)
|
||||
|
||||
popal
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
#-------------------------------------------------------------------------------------
|
||||
# AsmVectorNumFixup (*VectorBase, VectorNum);
|
||||
#-------------------------------------------------------------------------------------
|
||||
ASM_GLOBAL ASM_PFX(AsmVectorNumFixup)
|
||||
ASM_PFX(AsmVectorNumFixup):
|
||||
movl 8(%esp), %eax
|
||||
movl 4(%esp), %ecx
|
||||
movb %al, (VectorNum - HookAfterStubBegin)(%ecx)
|
||||
ret
|
||||
|
Reference in New Issue
Block a user