tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SourceLevelDebugPkg/DebugAgent: Support IA32 processors without DE or FXSAVE/FXRESTOR 

Use CPUID Leaf 01 to detect support for debug extensions and FXSAVE/FXRESTOR instructions.
Do not enable those features in CR4 if they are not supported.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17220 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Michael Kinney 2015-04-27 19:53:36 +00:00 committed by mdkinney
parent ef530fe71f
commit 5f72e68c90
7 changed files with 71 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/ArchDebugSupport.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Supporting functions for IA32 architecture. Supporting functions for IA32 architecture.
Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -28,6 +28,7 @@ InitializeDebugIdt (
IA32_DESCRIPTOR IdtDescriptor; IA32_DESCRIPTOR IdtDescriptor;
UINTN Index; UINTN Index;
UINT16 CodeSegment; UINT16 CodeSegment;
UINT32 RegEdx;
AsmReadIdtr (&IdtDescriptor); AsmReadIdtr (&IdtDescriptor);
@ -59,9 +60,13 @@ InitializeDebugIdt (
IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32; IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;
// //
// If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then
// Set DE flag in CR4 to enable IO breakpoint // Set DE flag in CR4 to enable IO breakpoint
// //
AsmWriteCr4 (AsmReadCr4 () | BIT3); AsmCpuid (1, NULL, NULL, NULL, &RegEdx);
if ((RegEdx & BIT2) != 0) {
AsmWriteCr4 (AsmReadCr4 () | BIT3);
}
} }
/** /**

31
SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.S
View File

@ -1,6 +1,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
@ -232,10 +232,25 @@ NoExtrPush:
pushl %edi pushl %edi
## UINT32 Cr0, Cr1, Cr2, Cr3, Cr4; ## UINT32 Cr0, Cr1, Cr2, Cr3, Cr4;
## insure FXSAVE/FXRSTOR is enabled in CR4...
## ... while we're at it, make sure DE is also enabled...
mov $1, %eax
pushl %ebx # temporarily save value of ebx on stack
cpuid # use CPUID to determine if FXSAVE/FXRESTOR
# and DE are supported
popl %ebx # retore value of ebx that was overwritten
# by CPUID
movl %cr4, %eax movl %cr4, %eax
orl $0x208,%eax pushl %eax # push cr4 firstly
testl $BIT24, %edx # Test for FXSAVE/FXRESTOR support
jz L1
orl $BIT9, %eax # Set CR4.OSFXSR
L1:
testl $BIT2, %edx # Test for Debugging Extensions support
jz L2
orl $BIT3, %eax # Set CR4.DE
L2:
movl %eax, %cr4 movl %eax, %cr4
pushl %eax
movl %cr3, %eax movl %cr3, %eax
pushl %eax pushl %eax
movl %cr2, %eax movl %cr2, %eax
@ -303,7 +318,11 @@ NoExtrPush:
## FX_SAVE_STATE_IA32 FxSaveState; ## FX_SAVE_STATE_IA32 FxSaveState;
subl $512,%esp subl $512,%esp
movl %esp,%edi movl %esp,%edi
testl $BIT24, %edx # Test for FXSAVE/FXRESTOR support.
# edx still contains result from CPUID above
jz L3
.byte 0x0f, 0xae, 0x07 # fxsave [edi] .byte 0x0f, 0xae, 0x07 # fxsave [edi]
L3:
## save the exception data ## save the exception data
pushl 8(%esp) pushl 8(%esp)
@ -322,7 +341,13 @@ NoExtrPush:
## FX_SAVE_STATE_IA32 FxSaveState; ## FX_SAVE_STATE_IA32 FxSaveState;
movl %esp,%esi movl %esp,%esi
movl $1, %eax
cpuid # use CPUID to determine if FXSAVE/FXRESTOR
# are supported
testl $BIT24, %edx # Test for FXSAVE/FXRESTOR support
jz L4
.byte 0x0f, 0xae, 0x0e # fxrstor [esi] .byte 0x0f, 0xae, 0x0e # fxrstor [esi]
L4:
addl $512,%esp addl $512,%esp
## UINT32 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7; ## UINT32 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7;

26
SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/Ia32/AsmFuncs.asm
View File

@ -230,9 +230,21 @@ NoExtrPush:
;; UINT32 Cr0, Cr1, Cr2, Cr3, Cr4; ;; UINT32 Cr0, Cr1, Cr2, Cr3, Cr4;
;; insure FXSAVE/FXRSTOR is enabled in CR4... ;; insure FXSAVE/FXRSTOR is enabled in CR4...
;; ... while we're at it, make sure DE is also enabled... ;; ... while we're at it, make sure DE is also enabled...
mov eax, 1
push ebx ; temporarily save value of ebx on stack
cpuid ; use CPUID to determine if FXSAVE/FXRESTOR and
; DE are supported
pop ebx ; retore value of ebx that was overwritten by CPUID
mov eax, cr4 mov eax, cr4
push eax ; push cr4 firstly push eax ; push cr4 firstly
or eax, 208h test edx, BIT24 ; Test for FXSAVE/FXRESTOR support
jz @F
or eax, BIT9 ; Set CR4.OSFXSR
@@:
test edx, BIT2 ; Test for Debugging Extensions support
jz @F
or eax, BIT3 ; Set CR4.DE
@@:
mov cr4, eax mov cr4, eax
mov eax, cr3 mov eax, cr3
push eax push eax
@ -313,7 +325,12 @@ NoExtrPush:
mov ecx, 128 ;= 512 / 4 mov ecx, 128 ;= 512 / 4
rep stosd rep stosd
mov edi, esp mov edi, esp
test edx, BIT24 ; Test for FXSAVE/FXRESTOR support.
; edx still contains result from CPUID above
jz @F
db 0fh, 0aeh, 00000111y ;fxsave [edi] db 0fh, 0aeh, 00000111y ;fxsave [edi]
@@:
;; save the exception data ;; save the exception data
push dword ptr [ebp + 8] push dword ptr [ebp + 8]
@ -329,7 +346,12 @@ NoExtrPush:
;; FX_SAVE_STATE_IA32 FxSaveState; ;; FX_SAVE_STATE_IA32 FxSaveState;
mov esi, esp mov esi, esp
mov eax, 1
cpuid ; use CPUID to determine if FXSAVE/FXRESTOR are supported
test edx, BIT24 ; Test for FXSAVE/FXRESTOR support
jz @F
db 0fh, 0aeh, 00001110y ; fxrstor [esi] db 0fh, 0aeh, 00001110y ; fxrstor [esi]
@@:
add esp, 512 add esp, 512
;; UINT32 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7; ;; UINT32 Dr0, Dr1, Dr2, Dr3, Dr6, Dr7;

9
SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/X64/ArchDebugSupport.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Supporting functions for X64 architecture. Supporting functions for X64 architecture.
Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -28,6 +28,7 @@ InitializeDebugIdt (
IA32_DESCRIPTOR IdtDescriptor; IA32_DESCRIPTOR IdtDescriptor;
UINTN Index; UINTN Index;
UINT16 CodeSegment; UINT16 CodeSegment;
UINT32 RegEdx;
AsmReadIdtr (&IdtDescriptor); AsmReadIdtr (&IdtDescriptor);
@ -61,9 +62,13 @@ InitializeDebugIdt (
IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32; IdtEntry[DEBUG_TIMER_VECTOR].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;
// //
// If the CPU supports Debug Extensions(CPUID:01 EDX:BIT2), then
// Set DE flag in CR4 to enable IO breakpoint // Set DE flag in CR4 to enable IO breakpoint
// //
AsmWriteCr4 (AsmReadCr4 () | BIT3); AsmCpuid (1, NULL, NULL, NULL, &RegEdx);
if ((RegEdx & BIT2) != 0) {
AsmWriteCr4 (AsmReadCr4 () | BIT3);
}
} }
/** /**

4
SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# Debug Agent library instance for Dxe Core and Dxe modules. # Debug Agent library instance for Dxe Core and Dxe modules.
# #
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -19,7 +19,7 @@
MODULE_UNI_FILE = DxeDebugAgentLib.uni MODULE_UNI_FILE = DxeDebugAgentLib.uni
FILE_GUID = BA6BAD25-B814-4747-B0B0-0FBB61D40B90 FILE_GUID = BA6BAD25-B814-4747-B0B0-0FBB61D40B90
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 0.7 VERSION_STRING = 0.8
LIBRARY_CLASS = DebugAgentLib|DXE_CORE DXE_DRIVER LIBRARY_CLASS = DebugAgentLib|DXE_CORE DXE_DRIVER
CONSTRUCTOR = DxeDebugAgentLibConstructor CONSTRUCTOR = DxeDebugAgentLibConstructor

4
SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# Debug Agent library instance for SEC Core and PEI modules. # Debug Agent library instance for SEC Core and PEI modules.
# #
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -19,7 +19,7 @@
MODULE_UNI_FILE = SecPeiDebugAgentLib.uni MODULE_UNI_FILE = SecPeiDebugAgentLib.uni
FILE_GUID = 508B7D59-CD4E-4a6b-A45B-6D3B2D90111E FILE_GUID = 508B7D59-CD4E-4a6b-A45B-6D3B2D90111E
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 0.7 VERSION_STRING = 0.8
LIBRARY_CLASS = DebugAgentLib|SEC PEIM LIBRARY_CLASS = DebugAgentLib|SEC PEIM
# #

2
SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
View File

@ -19,7 +19,7 @@
MODULE_UNI_FILE = SmmDebugAgentLib.uni MODULE_UNI_FILE = SmmDebugAgentLib.uni
FILE_GUID = CB07D74C-598F-4268-A5D1-644FB4A481E8 FILE_GUID = CB07D74C-598F-4268-A5D1-644FB4A481E8
MODULE_TYPE = DXE_SMM_DRIVER MODULE_TYPE = DXE_SMM_DRIVER
VERSION_STRING = 0.7 VERSION_STRING = 0.8
LIBRARY_CLASS = DebugAgentLib|DXE_SMM_DRIVER LIBRARY_CLASS = DebugAgentLib|DXE_SMM_DRIVER
# #