From 139259bcc2c4563b6208698f216f10f318c94099 Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 31 May 2012 01:34:44 +0000
Subject: 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
---
 UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S                                  | 9 +--------
 UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm                                | 9 +--------
 .../Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S    | 7 -------
 .../Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm  | 7 -------
 4 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'UefiCpuPkg')

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
index 38f46ab335..3b43b6fd8b 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #*
-#*   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#*   Copyright (c) 2006 - 2012, 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
@@ -151,13 +151,6 @@ HasErrorCode:
     #
     xchgl   (%esp), %ecx 
 
-    #
-    # Fall through to join main routine code
-    # at ErrorCodeAndVectorOnStack
-    #
-CommonInterruptEntry_al_0000:
-    jmp CommonInterruptEntry_al_0000
-
 ErrorCodeAndVectorOnStack:
     pushl   %ebp
     movl    %esp, %ebp
diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
index a279e6ab5a..0924dc5bb3 100644
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
+++ b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
@@ -1,7 +1,7 @@
       TITLE   CpuAsm.asm:
 ;------------------------------------------------------------------------------
 ;*
-;*   Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+;*   Copyright (c) 2006 - 2012, 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
@@ -149,13 +149,6 @@ HasErrorCode:
     ;
     xchg    ecx, [esp]
 
-    ;
-    ; Fall through to join main routine code
-    ; at ErrorCodeAndVectorOnStack
-    ;
-@@:
-    jmp @B
-
 ErrorCodeAndVectorOnStack:
     push    ebp
     mov     ebp, esp
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
index 8b3f6319b6..b9e881ac5e 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
@@ -213,13 +213,6 @@ HasErrorCode:
     #
     xchgl   (%esp), %ecx 
 
-    #
-    # Fall through to join main routine code
-    # at ErrorCodeAndVectorOnStack
-    #
-CommonInterruptEntry_al_0000:
-    jmp CommonInterruptEntry_al_0000
-
 ErrorCodeAndVectorOnStack:
     pushl   %ebp
     movl    %esp, %ebp
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
index dc71959bd1..869f18dfde 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.asm
@@ -218,13 +218,6 @@ HasErrorCode:
     ;
     xchg    ecx, [esp]
 
-    ;
-    ; Fall through to join main routine code
-    ; at ErrorCodeAndVectorOnStack
-    ;
-@@:
-    jmp @B
-
 ErrorCodeAndVectorOnStack:
     push    ebp
     mov     ebp, esp
-- 
cgit v1.2.3