mirror of https://github.com/acidanthera/audk.git
Use .p2align directive instead of ambiguous .align directive.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9164 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
f315cfa5b7
commit
9811c39250
|
@ -153,7 +153,7 @@ EfiLdrOffset:
|
|||
ret
|
||||
|
||||
# db "**** DEFAULT IDT ENTRY ***",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
Halt:
|
||||
INT0:
|
||||
pushl $0x0 # push error code place holder on the stack
|
||||
|
|
|
@ -177,7 +177,7 @@ EfiLdrOffset:
|
|||
.byte 0xc3
|
||||
|
||||
# db "**** DEFAULT IDT ENTRY ***",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
Halt:
|
||||
INT0:
|
||||
pushl $0x0 # push error code place holder on the stack
|
||||
|
|
|
@ -580,7 +580,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .long GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -588,7 +588,7 @@ Empty8042Loop:
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -678,7 +678,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -695,7 +695,7 @@ idtr: .long IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
IDT_BASE:
|
||||
|
@ -1064,7 +1064,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -595,7 +595,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .long GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -603,7 +603,7 @@ Empty8042Loop:
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -693,7 +693,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -710,7 +710,7 @@ idtr: .long IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
IDT_BASE:
|
||||
|
@ -1079,7 +1079,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -450,7 +450,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .long GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -458,7 +458,7 @@ Empty8042Loop:
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -535,7 +535,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -551,7 +551,7 @@ idtr: .long IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
IDT_BASE:
|
||||
# divide by zero (INT 0)
|
||||
|
@ -847,7 +847,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -444,7 +444,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .word GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -452,7 +452,7 @@ gdtr: .word GDT_END - GDT_BASE - 1 # GDT limit
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -529,7 +529,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -545,7 +545,7 @@ idtr: .word IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
IDT_BASE:
|
||||
# divide by zero (INT 0)
|
||||
|
@ -841,7 +841,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -459,7 +459,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .word GDT_END - GDT_BASE - 1
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -467,7 +467,7 @@ gdtr: .word GDT_END - GDT_BASE - 1
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -544,7 +544,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -560,7 +560,7 @@ idtr: .word IDT_END - IDT_BASE - 1
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
IDT_BASE:
|
||||
# divide by zero (INT 0)
|
||||
|
@ -856,7 +856,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -587,7 +587,7 @@ Empty8042Loop:
|
|||
# data
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
gdtr: .long GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -595,7 +595,7 @@ Empty8042Loop:
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -685,7 +685,7 @@ GDT_BASE:
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
|
||||
|
@ -702,7 +702,7 @@ idtr: .long IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag db "IDT",0
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
|
||||
IDT_BASE:
|
||||
|
@ -1071,7 +1071,7 @@ IDT_BASE:
|
|||
|
||||
IDT_END:
|
||||
|
||||
.align 0x2
|
||||
.p2align 1
|
||||
|
||||
MemoryMapSize: .long 0
|
||||
MemoryMap: .long 0,0,0,0,0,0,0,0
|
||||
|
|
|
@ -78,7 +78,7 @@ ASM_PFX(InstallInterruptHandler):
|
|||
.long commonIdtEntry - . - 4 # offset to jump to
|
||||
.endm
|
||||
|
||||
.align 2
|
||||
.p2align 1
|
||||
ASM_GLOBAL ASM_PFX(SystemExceptionHandler)
|
||||
ASM_PFX(SystemExceptionHandler):
|
||||
INT0:
|
||||
|
@ -418,7 +418,7 @@ ExceptionDone:
|
|||
#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
.data
|
||||
.align 4
|
||||
.p2align 2
|
||||
|
||||
gdtr: .short GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.long 0 # (GDT base gets set above)
|
||||
|
@ -426,7 +426,7 @@ gdtr: .short GDT_END - GDT_BASE - 1 # GDT limit
|
|||
# global descriptor table (GDT)
|
||||
#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
.align 4
|
||||
.p2align 2
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -503,7 +503,7 @@ SPARE5_SEL = .-GDT_BASE
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 4
|
||||
.p2align 2
|
||||
|
||||
|
||||
|
||||
|
@ -519,7 +519,7 @@ idtr: .short IDT_END - IDT_BASE - 1 # IDT limit
|
|||
#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
#idt_tag .byte "IDT",0
|
||||
.align 4
|
||||
.p2align 2
|
||||
|
||||
IDT_BASE:
|
||||
# divide by zero (INT 0)
|
||||
|
|
|
@ -83,7 +83,7 @@ ASM_PFX(InstallInterruptHandler):
|
|||
.long commonIdtEntry - . - 4 # offset to jump to
|
||||
.endm
|
||||
|
||||
.align 2
|
||||
.p2align 1
|
||||
ASM_GLOBAL ASM_PFX(SystemExceptionHandler)
|
||||
ASM_PFX(SystemExceptionHandler):
|
||||
INT0:
|
||||
|
@ -453,7 +453,7 @@ ExceptionDone:
|
|||
##############################################################################
|
||||
|
||||
.data
|
||||
.align 0x10
|
||||
.p2align 4
|
||||
|
||||
gdtr: .short GDT_END - GDT_BASE - 1 # GDT limit
|
||||
.quad 0 # (GDT base gets set above)
|
||||
|
@ -461,7 +461,7 @@ gdtr: .short GDT_END - GDT_BASE - 1 # GDT limit
|
|||
# global descriptor table (GDT)
|
||||
##############################################################################
|
||||
|
||||
.align 0x10
|
||||
.p2align 4
|
||||
|
||||
GDT_BASE:
|
||||
# null descriptor
|
||||
|
@ -538,7 +538,7 @@ SPARE5_SEL = .-GDT_BASE
|
|||
|
||||
GDT_END:
|
||||
|
||||
.align 0x4
|
||||
.p2align 2
|
||||
|
||||
|
||||
|
||||
|
@ -554,7 +554,7 @@ idtr: .short IDT_END - IDT_BASE - 1 # IDT limit
|
|||
##############################################################################
|
||||
|
||||
#idt_tag .byte "IDT",0
|
||||
.align 0x4
|
||||
.p2align 2
|
||||
|
||||
IDT_BASE:
|
||||
# divide by zero (INT 0)
|
||||
|
|
Loading…
Reference in New Issue