Remove CPU dead loop code from IA32 assembly codes.

Signed-off-by: Fan Jeff <jeff.fan@intel.com>
Reviewed-by: Sun Rui <rui.sun@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13388 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
index 38f46ab335d7bb8cc152a0f6c466a4233cfae4b5..3b43b6fd8b1df64e97921fa6bf2e13002260d3f1 100644 (file)
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #*\r
-#*   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 #*   This program and the accompanying materials\r
 #*   are licensed and made available under the terms and conditions of the BSD License\r
 #*   which accompanies this distribution.  The full text of the license may be found at\r
@@ -151,13 +151,6 @@ HasErrorCode:
     #\r
     xchgl   (%esp), %ecx \r
 \r
-    #\r
-    # Fall through to join main routine code\r
-    # at ErrorCodeAndVectorOnStack\r
-    #\r
-CommonInterruptEntry_al_0000:\r
-    jmp CommonInterruptEntry_al_0000\r
-\r
 ErrorCodeAndVectorOnStack:\r
     pushl   %ebp\r
     movl    %esp, %ebp\r

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
index a279e6ab5ada4c80674071ffbb1f66bf3f21a555..0924dc5bb383985d246b78544a9b497aecec0533 100644 (file)
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
@@ -1,7 +1,7 @@
       TITLE   CpuAsm.asm:\r
 ;------------------------------------------------------------------------------\r
 ;*\r
-;*   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+;*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 ;*   This program and the accompanying materials\r
 ;*   are licensed and made available under the terms and conditions of the BSD License\r
 ;*   which accompanies this distribution.  The full text of the license may be found at\r
@@ -149,13 +149,6 @@ HasErrorCode:
     ;\r
     xchg    ecx, [esp]\r
 \r
-    ;\r
-    ; Fall through to join main routine code\r
-    ; at ErrorCodeAndVectorOnStack\r
-    ;\r
-@@:\r
-    jmp @B\r
-\r
 ErrorCodeAndVectorOnStack:\r
     push    ebp\r
     mov     ebp, esp\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
index 8b3f6319b68b4e195b26e2c2f617623a4842381d..b9e881ac5e5d8fe8b28179287b23a1e9fbfdd462 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
@@ -213,13 +213,6 @@ HasErrorCode:
     #\r
     xchgl   (%esp), %ecx \r
 \r
-    #\r
-    # Fall through to join main routine code\r
-    # at ErrorCodeAndVectorOnStack\r
-    #\r
-CommonInterruptEntry_al_0000:\r
-    jmp CommonInterruptEntry_al_0000\r
-\r
 ErrorCodeAndVectorOnStack:\r
     pushl   %ebp\r
     movl    %esp, %ebp\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
index dc71959bd1fb16a90abb0405757cc3d9c54be781..869f18dfde054108b70b782cc88e7bb1731f7a92 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
@@ -218,13 +218,6 @@ HasErrorCode:
     ;\r
     xchg    ecx, [esp]\r
 \r
-    ;\r
-    ; Fall through to join main routine code\r
-    ; at ErrorCodeAndVectorOnStack\r
-    ;\r
-@@:\r
-    jmp @B\r
-\r
 ErrorCodeAndVectorOnStack:\r
     push    ebp\r
     mov     ebp, esp\r