Revert CpuId and CpuIdEx to r6213.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6216 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c
index cbd0b9a57bb00db5d3e088df3989d2c007dc9aa1..9745ae21d4846519d0da577dc8826f3dac78d629 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c
@@ -25,13 +25,13 @@
 \r
   @param  Index         The 32-bit value to load into EAX prior to invoking the CPUID\r
                         instruction.\r
-  @param  Eax           Pointer to the 32-bit EAX value returned by the CPUID\r
+  @param  RegisterEax   Pointer to the 32-bit EAX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be NULL.\r
-  @param  Ebx           Pointer to the 32-bit EBX value returned by the CPUID\r
+  @param  RegisterEbx   Pointer to the 32-bit EBX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be NULL.\r
-  @param  Ecx           Pointer to the 32-bit ECX value returned by the CPUID\r
+  @param  RegisterEcx   Pointer to the 32-bit ECX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be NULL.\r
-  @param  Edx           Pointer to the 32-bit EDX value returned by the CPUID\r
+  @param  RegisterEdx   Pointer to the 32-bit EDX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be NULL.\r
 \r
   @return Index\r
@@ -41,30 +41,30 @@ UINT32
 EFIAPI\r
 AsmCpuid (\r
   IN      UINT32                    Index,\r
-  OUT     UINT32                    *Eax,  OPTIONAL\r
-  OUT     UINT32                    *Ebx,  OPTIONAL\r
-  OUT     UINT32                    *Ecx,  OPTIONAL\r
-  OUT     UINT32                    *Edx   OPTIONAL\r
+  OUT     UINT32                    *RegisterEax,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEbx,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEcx,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEdx   OPTIONAL\r
   )\r
 {\r
   _asm {\r
     mov     eax, Index\r
     cpuid\r
     push    ecx\r
-    mov     ecx, Eax\r
+    mov     ecx, RegisterEax\r
     jecxz   SkipEax\r
     mov     [ecx], eax\r
 SkipEax:\r
-    mov     ecx, Ebx\r
+    mov     ecx, RegisterEbx\r
     jecxz   SkipEbx\r
     mov     [ecx], ebx\r
 SkipEbx:\r
     pop     eax\r
-    mov     ecx, Ecx\r
+    mov     ecx, RegisterEcx\r
     jecxz   SkipEcx\r
     mov     [ecx], eax\r
 SkipEcx:\r
-    mov     ecx, Edx\r
+    mov     ecx, RegisterEdx\r
     jecxz   SkipEdx\r
     mov     [ecx], edx\r
 SkipEdx:\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
index e288de2c045546921526787814b93c607b3d91b2..1133397670e9c22fa48a6d6c6e9c481723f56054 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
@@ -28,16 +28,16 @@
                         CPUID instruction.\r
   @param  SubIndex      The 32-bit value to load into ECX prior to invoking the\r
                         CPUID instruction.\r
-  @param  Eax           Pointer to the 32-bit EAX value returned by the CPUID\r
+  @param  RegisterEax   Pointer to the 32-bit EAX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be\r
                         NULL.\r
-  @param  Ebx           Pointer to the 32-bit EBX value returned by the CPUID\r
+  @param  RegisterEbx   Pointer to the 32-bit EBX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be\r
                         NULL.\r
-  @param  Ecx           Pointer to the 32-bit ECX value returned by the CPUID\r
+  @param  RegisterEcx   Pointer to the 32-bit ECX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be\r
                         NULL.\r
-  @param  Edx           Pointer to the 32-bit EDX value returned by the CPUID\r
+  @param  RegisterEdx   Pointer to the 32-bit EDX value returned by the CPUID\r
                         instruction. This is an optional parameter that may be\r
                         NULL.\r
 \r
@@ -49,10 +49,10 @@ EFIAPI
 AsmCpuidEx (\r
   IN      UINT32                    Index,\r
   IN      UINT32                    SubIndex,\r
-  OUT     UINT32                    *Eax,  OPTIONAL\r
-  OUT     UINT32                    *Ebx,  OPTIONAL\r
-  OUT     UINT32                    *Ecx,  OPTIONAL\r
-  OUT     UINT32                    *Edx   OPTIONAL\r
+  OUT     UINT32                    *RegisterEax,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEbx,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEcx,  OPTIONAL\r
+  OUT     UINT32                    *RegisterEdx   OPTIONAL\r
   )\r
 {\r
   _asm {\r
@@ -60,20 +60,20 @@ AsmCpuidEx (
     mov     ecx, SubIndex\r
     cpuid\r
     push    ecx\r
-    mov     ecx, Eax\r
+    mov     ecx, RegisterEax\r
     jecxz   SkipEax\r
     mov     [ecx], eax\r
 SkipEax:\r
-    mov     ecx, Ebx\r
+    mov     ecx, RegisterEbx\r
     jecxz   SkipEbx\r
     mov     [ecx], ebx\r
 SkipEbx:\r
     pop     eax\r
-    mov     ecx, Ecx\r
+    mov     ecx, RegisterEcx\r
     jecxz   SkipEcx\r
     mov     [ecx], eax\r
 SkipEcx:\r
-    mov     ecx, Edx\r
+    mov     ecx, RegisterEdx\r
     jecxz   SkipEdx\r
     mov     [ecx], edx\r
 SkipEdx:\r