diff options
| author | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-10-24 07:39:52 +0000 |
|---|---|---|
| committer | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-10-24 07:39:52 +0000 |
| commit | 14f268ba2a9e9bc13aaf54f7f0eaeaa1f517ee21 (patch) | |
| tree | d26aabc18f5e92b72dbbd54c7163ea02bad8466b | |
| parent | 610204a84c02a4a6cc1da628eb22b238f53a9373 (diff) | |
| download | edk2-14f268ba2a9e9bc13aaf54f7f0eaeaa1f517ee21.tar.gz edk2-14f268ba2a9e9bc13aaf54f7f0eaeaa1f517ee21.tar.bz2 edk2-14f268ba2a9e9bc13aaf54f7f0eaeaa1f517ee21.zip | |
Revert CpuId and CpuIdEx to r6213.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6216 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/CpuId.c | 24 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/CpuIdEx.c | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c index cbd0b9a57b..9745ae21d4 100644 --- a/MdePkg/Library/BaseLib/Ia32/CpuId.c +++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c @@ -25,13 +25,13 @@ @param Index The 32-bit value to load into EAX prior to invoking the CPUID
instruction.
- @param Eax Pointer to the 32-bit EAX value returned by the CPUID
+ @param RegisterEax Pointer to the 32-bit EAX value returned by the CPUID
instruction. This is an optional parameter that may be NULL.
- @param Ebx Pointer to the 32-bit EBX value returned by the CPUID
+ @param RegisterEbx Pointer to the 32-bit EBX value returned by the CPUID
instruction. This is an optional parameter that may be NULL.
- @param Ecx Pointer to the 32-bit ECX value returned by the CPUID
+ @param RegisterEcx Pointer to the 32-bit ECX value returned by the CPUID
instruction. This is an optional parameter that may be NULL.
- @param Edx Pointer to the 32-bit EDX value returned by the CPUID
+ @param RegisterEdx Pointer to the 32-bit EDX value returned by the CPUID
instruction. This is an optional parameter that may be NULL.
@return Index
@@ -41,30 +41,30 @@ UINT32 EFIAPI
AsmCpuid (
IN UINT32 Index,
- OUT UINT32 *Eax, OPTIONAL
- OUT UINT32 *Ebx, OPTIONAL
- OUT UINT32 *Ecx, OPTIONAL
- OUT UINT32 *Edx OPTIONAL
+ OUT UINT32 *RegisterEax, OPTIONAL
+ OUT UINT32 *RegisterEbx, OPTIONAL
+ OUT UINT32 *RegisterEcx, OPTIONAL
+ OUT UINT32 *RegisterEdx OPTIONAL
)
{
_asm {
mov eax, Index
cpuid
push ecx
- mov ecx, Eax
+ mov ecx, RegisterEax
jecxz SkipEax
mov [ecx], eax
SkipEax:
- mov ecx, Ebx
+ mov ecx, RegisterEbx
jecxz SkipEbx
mov [ecx], ebx
SkipEbx:
pop eax
- mov ecx, Ecx
+ mov ecx, RegisterEcx
jecxz SkipEcx
mov [ecx], eax
SkipEcx:
- mov ecx, Edx
+ mov ecx, RegisterEdx
jecxz SkipEdx
mov [ecx], edx
SkipEdx:
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c index e288de2c04..1133397670 100644 --- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c +++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c @@ -28,16 +28,16 @@ CPUID instruction.
@param SubIndex The 32-bit value to load into ECX prior to invoking the
CPUID instruction.
- @param Eax Pointer to the 32-bit EAX value returned by the CPUID
+ @param RegisterEax Pointer to the 32-bit EAX value returned by the CPUID
instruction. This is an optional parameter that may be
NULL.
- @param Ebx Pointer to the 32-bit EBX value returned by the CPUID
+ @param RegisterEbx Pointer to the 32-bit EBX value returned by the CPUID
instruction. This is an optional parameter that may be
NULL.
- @param Ecx Pointer to the 32-bit ECX value returned by the CPUID
+ @param RegisterEcx Pointer to the 32-bit ECX value returned by the CPUID
instruction. This is an optional parameter that may be
NULL.
- @param Edx Pointer to the 32-bit EDX value returned by the CPUID
+ @param RegisterEdx Pointer to the 32-bit EDX value returned by the CPUID
instruction. This is an optional parameter that may be
NULL.
@@ -49,10 +49,10 @@ EFIAPI AsmCpuidEx (
IN UINT32 Index,
IN UINT32 SubIndex,
- OUT UINT32 *Eax, OPTIONAL
- OUT UINT32 *Ebx, OPTIONAL
- OUT UINT32 *Ecx, OPTIONAL
- OUT UINT32 *Edx OPTIONAL
+ OUT UINT32 *RegisterEax, OPTIONAL
+ OUT UINT32 *RegisterEbx, OPTIONAL
+ OUT UINT32 *RegisterEcx, OPTIONAL
+ OUT UINT32 *RegisterEdx OPTIONAL
)
{
_asm {
@@ -60,20 +60,20 @@ AsmCpuidEx ( mov ecx, SubIndex
cpuid
push ecx
- mov ecx, Eax
+ mov ecx, RegisterEax
jecxz SkipEax
mov [ecx], eax
SkipEax:
- mov ecx, Ebx
+ mov ecx, RegisterEbx
jecxz SkipEbx
mov [ecx], ebx
SkipEbx:
pop eax
- mov ecx, Ecx
+ mov ecx, RegisterEcx
jecxz SkipEcx
mov [ecx], eax
SkipEcx:
- mov ecx, Edx
+ mov ecx, RegisterEdx
jecxz SkipEdx
mov [ecx], edx
SkipEdx:
|