NASM has replaced ASM and S files.
1. Remove ASM from all modules.
2. Remove S files from the drivers only.
3. https://bugzilla.tianocore.org/show_bug.cgi?id=881
After NASM is updated, S files can be removed from Library.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
+++ /dev/null
-## @file\r
-# Interrupt Redirection Template\r
-#\r
-# Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions\r
-# of the BSD License which accompanies this distribution. The\r
-# full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-##\r
-\r
-ASM_GLOBAL ASM_PFX(InterruptRedirectionTemplate)\r
-\r
-#----------------------------------------------------------------------------\r
-# Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F \r
-#\r
-# Input: None\r
-#\r
-# Output: None\r
-#\r
-# Prototype: VOID\r
-# InterruptRedirectionTemplate ( \r
-# VOID\r
-# );\r
-#\r
-# Saves: None\r
-#\r
-# Modified: None\r
-#\r
-# Description: Contains the code that is copied into low memory (below 640K).\r
-# This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.\r
-# This template must be copied into low memory, and the IDT entries\r
-# 0x68-0x6F must be point to the low memory copy of this code. Each\r
-# entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily \r
-# computed.\r
-#\r
-#----------------------------------------------------------------------------\r
-ASM_PFX(InterruptRedirectionTemplate):\r
- int $0x8\r
- .byte 0xcf\r
- nop\r
- int $0x9\r
- .byte 0xcf\r
- nop\r
- int $0xa\r
- .byte 0xcf\r
- nop\r
- int $0xb\r
- .byte 0xcf\r
- nop\r
- int $0xc\r
- .byte 0xcf\r
- nop\r
- int $0xd\r
- .byte 0xcf\r
- nop\r
- int $0xe\r
- .byte 0xcf\r
- nop\r
- int $0xf\r
- .byte 0xcf\r
- nop\r
+++ /dev/null
-;; @file\r
-; Interrupt Redirection Template\r
-;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-;\r
-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions\r
-; of the BSD License which accompanies this distribution. The\r
-; full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-;\r
-;;\r
-\r
-.686P\r
-.MODEL FLAT, C\r
-.CODE\r
-\r
-;----------------------------------------------------------------------------\r
-; Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F \r
-;\r
-; Input: None\r
-;\r
-; Output: None\r
-;\r
-; Prototype: VOID\r
-; InterruptRedirectionTemplate ( \r
-; VOID\r
-; );\r
-;\r
-; Saves: None\r
-;\r
-; Modified: None\r
-;\r
-; Description: Contains the code that is copied into low memory (below 640K).\r
-; This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.\r
-; This template must be copied into low memory, and the IDT entries\r
-; 0x68-0x6F must be point to the low memory copy of this code. Each\r
-; entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily \r
-; computed.\r
-;\r
-;----------------------------------------------------------------------------\r
-\r
-InterruptRedirectionTemplate PROC C\r
- int 08h\r
- DB 0cfh ; IRET\r
- nop\r
- int 09h\r
- DB 0cfh ; IRET\r
- nop\r
- int 0ah\r
- DB 0cfh ; IRET\r
- nop\r
- int 0bh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0ch\r
- DB 0cfh ; IRET\r
- nop\r
- int 0dh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0eh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0fh\r
- DB 0cfh ; IRET\r
- nop\r
-InterruptRedirectionTemplate ENDP\r
-\r
-END
\ No newline at end of file
#\r
# This driver installs Legacy Bios Protocol to support CSM module work in EFI system.\r
#\r
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions\r
LegacyPci.c\r
\r
[Sources.Ia32]\r
- IA32/InterruptTable.S\r
- IA32/InterruptTable.asm\r
IA32/InterruptTable.nasm\r
Thunk.c\r
LegacyBootSupport.c\r
\r
[Sources.X64]\r
X64/InterruptTable.nasm\r
- X64/InterruptTable.asm\r
- X64/InterruptTable.S\r
Thunk.c\r
LegacyBootSupport.c\r
LegacyBbs.c\r
+++ /dev/null
-## @file\r
-# Interrupt Redirection Template\r
-#\r
-# Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions\r
-# of the BSD License which accompanies this distribution. The\r
-# full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-##\r
-\r
-#text SEGMENT\r
-\r
-\r
-#----------------------------------------------------------------------------\r
-# Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F\r
-#\r
-# Input: None\r
-#\r
-# Output: None\r
-#\r
-# Prototype: VOID\r
-# InterruptRedirectionTemplate (\r
-# VOID\r
-# );\r
-#\r
-# Saves: None\r
-#\r
-# Modified: None\r
-#\r
-# Description: Contains the code that is copied into low memory (below 640K).\r
-# This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.\r
-# This template must be copied into low memory, and the IDT entries\r
-# 0x68-0x6F must be point to the low memory copy of this code. Each\r
-# entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily\r
-# computed.\r
-#\r
-#----------------------------------------------------------------------------\r
-\r
-ASM_GLOBAL ASM_PFX(InterruptRedirectionTemplate)\r
-ASM_PFX(InterruptRedirectionTemplate):\r
- int $0x08\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x09\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0a\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0b\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0c\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0d\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0e\r
- .byte 0x0cf # IRET\r
- nop\r
- int $0x0f\r
- .byte 0x0cf # IRET\r
- nop\r
-\r
-#END\r
+++ /dev/null
-;; @file\r
-; Interrupt Redirection Template\r
-;\r
-; Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-;\r
-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions\r
-; of the BSD License which accompanies this distribution. The\r
-; full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-;\r
-;;\r
-\r
-text SEGMENT\r
-\r
-;----------------------------------------------------------------------------\r
-; Procedure: InterruptRedirectionTemplate: Redirects interrupts 0x68-0x6F \r
-;\r
-; Input: None\r
-;\r
-; Output: None\r
-;\r
-; Prototype: VOID\r
-; InterruptRedirectionTemplate ( \r
-; VOID\r
-; );\r
-;\r
-; Saves: None\r
-;\r
-; Modified: None\r
-;\r
-; Description: Contains the code that is copied into low memory (below 640K).\r
-; This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.\r
-; This template must be copied into low memory, and the IDT entries\r
-; 0x68-0x6F must be point to the low memory copy of this code. Each\r
-; entry is 4 bytes long, so IDT entries 0x68-0x6F can be easily \r
-; computed.\r
-;\r
-;----------------------------------------------------------------------------\r
-\r
-InterruptRedirectionTemplate PROC\r
- int 08h\r
- DB 0cfh ; IRET\r
- nop\r
- int 09h\r
- DB 0cfh ; IRET\r
- nop\r
- int 0ah\r
- DB 0cfh ; IRET\r
- nop\r
- int 0bh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0ch\r
- DB 0cfh ; IRET\r
- nop\r
- int 0dh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0eh\r
- DB 0cfh ; IRET\r
- nop\r
- int 0fh\r
- DB 0cfh ; IRET\r
- nop\r
-InterruptRedirectionTemplate ENDP\r
-\r
-END
\ No newline at end of file