From: andrewfish Date: Wed, 6 Jul 2011 18:12:29 +0000 (+0000) Subject: UefiCpuPkg: Fix X64 clang compiler/assembler warnings. X-Git-Tag: edk2-stable201903~14516 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=4d0ceb8dcac598f4ef9920bbb578974ac7b186a6 UefiCpuPkg: Fix X64 clang compiler/assembler warnings. Signed-off-by: andrewfish Reviewed-by: rsun3 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11996 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S index f2ddf0836e..c38461dc9c 100644 --- a/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S +++ b/UefiCpuPkg/CpuDxe/Ia32/IvtAsm.S @@ -23,43 +23,796 @@ # Interrupt Vector Table # -.macro SingleIdtVectorMacro vectorNum + +ASM_GLOBAL ASM_PFX(AsmIdtVector00) +.p2align 3 +ASM_PFX(AsmIdtVector00): + call ASM_PFX(CommonInterruptEntry) + .short 0x00 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x01 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x02 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x03 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x04 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x05 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x06 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x07 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x08 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x09 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x0f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x10 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x11 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x12 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x13 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x14 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x15 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x16 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x17 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x18 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x19 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x1f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x00 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x21 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x22 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x23 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x24 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x25 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x26 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x27 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x28 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x29 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x2f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x30 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x31 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x32 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x33 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x34 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x35 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x36 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x37 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x38 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x39 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x3f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x40 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x41 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x42 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x43 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x44 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x45 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x46 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x47 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x48 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x49 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x4f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x50 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x51 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x52 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x53 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x54 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x55 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x56 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x57 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x58 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x59 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x5f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x60 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x61 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x62 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x63 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x64 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x65 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x66 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x67 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x68 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x69 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x6f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x70 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x71 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x72 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x73 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x74 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x75 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x76 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x77 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x78 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x79 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x7f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x80 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x81 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x82 + nop call ASM_PFX(CommonInterruptEntry) - .short \vectorNum + .short 0x83 nop -.endm - -.macro EightIdtVectors firstVectorNum - SingleIdtVectorMacro \firstVectorNum - SingleIdtVectorMacro "(\firstVectorNum+1)" - SingleIdtVectorMacro "(\firstVectorNum+2)" - SingleIdtVectorMacro "(\firstVectorNum+3)" - SingleIdtVectorMacro "(\firstVectorNum+4)" - SingleIdtVectorMacro "(\firstVectorNum+5)" - SingleIdtVectorMacro "(\firstVectorNum+6)" - SingleIdtVectorMacro "(\firstVectorNum+7)" -.endm - -.macro SixtyFourIdtVectors firstVectorNum - EightIdtVectors \firstVectorNum - EightIdtVectors "(\firstVectorNum+0x08)" - EightIdtVectors "(\firstVectorNum+0x10)" - EightIdtVectors "(\firstVectorNum+0x18)" - EightIdtVectors "(\firstVectorNum+0x20)" - EightIdtVectors "(\firstVectorNum+0x28)" - EightIdtVectors "(\firstVectorNum+0x30)" - EightIdtVectors "(\firstVectorNum+0x38)" -.endm - -ASM_GLOBAL ASM_PFX(AsmIdtVector00) -.p2align 3 -ASM_PFX(AsmIdtVector00): - SixtyFourIdtVectors 0x00 - SixtyFourIdtVectors 0x40 - SixtyFourIdtVectors 0x80 - SixtyFourIdtVectors 0xC0 + call ASM_PFX(CommonInterruptEntry) + .short 0x84 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x85 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x86 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x87 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x88 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x89 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x8f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0x90 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x91 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x92 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x93 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x94 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x95 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x96 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x97 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x98 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x99 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9a + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9b + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9c + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9d + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9e + nop + call ASM_PFX(CommonInterruptEntry) + .short 0x9f + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xa0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xa9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xaa + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xab + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xac + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xad + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xae + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xaf + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xb0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xb9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xba + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xbb + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xbc + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xbd + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xbe + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xbf + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xc0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xc9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xca + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xcb + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xcc + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xcd + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xce + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xcf + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xd0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xd9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xda + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xdb + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xdc + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xdd + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xde + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xdf + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xe0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xe9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xea + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xeb + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xec + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xed + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xee + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xef + nop + + call ASM_PFX(CommonInterruptEntry) + .short 0xf0 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf1 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf2 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf3 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf4 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf5 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf6 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf7 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf8 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xf9 + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xfa + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xfb + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xfc + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xfd + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xfe + nop + call ASM_PFX(CommonInterruptEntry) + .short 0xff + nop + ASM_GLOBAL ASM_PFX(AsmCommonIdtEnd) ASM_PFX(AsmCommonIdtEnd): .byte 0 - + diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S b/UefiCpuPkg/CpuDxe/X64/CpuAsm.S index f1481d85d6..6c399eabfc 100644 --- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S +++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.S @@ -46,11 +46,11 @@ ASM_PFX(InitializeExternalVectorTablePtr): ASM_GLOBAL ASM_PFX(SetCodeSelector) ASM_PFX(SetCodeSelector): subq $0x10, %rsp - leaq setCodeSelectorLongJump(%rip), %rax + leaq L_setCodeSelectorLongJump(%rip), %rax movq %rax, (%rsp) movw %cx, 4(%rsp) .byte 0xFF, 0x2C, 0x24 # jmp (%rsp) note:fword jmp -setCodeSelectorLongJump: +L_setCodeSelectorLongJump: addq $0x10, %rsp ret @@ -158,13 +158,13 @@ CommonInterruptEntry_al_0000: pushq %rax # for ss movzwq 32(%rbp), %rax pushq %rax # for cs - movq %ds, %rax + movl %ds, %eax pushq %rax - movq %es, %rax + movl %es, erax pushq %rax - movq %fs, %rax + movl %fs, %eax pushq %rax - movq %gs, %rax + movl %gs, %eax pushq %rax movq %rcx, 8(%rbp) # save vector number @@ -307,9 +307,9 @@ nonNullValue: # mov %rax, %fs ; not for fs # (X64 will not use fs and gs, so we do not restore it) popq %rax - movq %rax, %es + movl %eax, %es popq %rax - movq %rax, %ds + movl %eax, %ds popq 32(%rbp) # for cs popq 56(%rbp) # for ss