MdePkg BaseLib NASM Thunk16: Use NASM local labels

http://www.nasm.us/doc/nasmdoc3.html#section-3.9

A local label is a label beginning with the period, and it's actual
name is prefixed by the previous non-local label.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16022 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm b/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
index d4f0462ee0a0720439bce612c2a846c94fb40afd..c00e3ab07864fcbeb3d291303ba280d4866e709f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.nasm
@@ -59,7 +59,7 @@ SECTION .data
 ; These are global constant to convey information to C code.\r
 ;\r
 ASM_PFX(m16Size)         DW      InternalAsmThunk16 - ASM_PFX(m16Start)\r
-ASM_PFX(mThunk16Attr)    DW      _ThunkAttr - ASM_PFX(m16Start)\r
+ASM_PFX(mThunk16Attr)    DW      _BackFromUserCode.ThunkAttr - ASM_PFX(m16Start)\r
 ASM_PFX(m16Gdt)          DW      _NullSegDesc - ASM_PFX(m16Start)\r
 ASM_PFX(m16GdtrBase)     DW      _16GdtrBase - ASM_PFX(m16Start)\r
 ASM_PFX(mTransition)     DW      _EntryPoint - ASM_PFX(m16Start)\r
@@ -85,8 +85,8 @@ _BackFromUserCode:
     push    ss\r
     push    cs\r
     DB      66h\r
-    call    @Base                       ; push eip\r
-@Base:\r
+    call    .Base                       ; push eip\r
+.Base:\r
     pushfw                              ; pushfd actually\r
     cli                                 ; disable interrupts\r
     push    gs\r
@@ -95,19 +95,19 @@ _BackFromUserCode:
     push    ds\r
     pushaw                              ; pushad actually\r
     DB      66h, 0bah                   ; mov edx, imm32\r
-_ThunkAttr:     dd   0\r
+.ThunkAttr: dd   0\r
     test    dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15\r
-    jz      @1\r
+    jz      .1\r
     mov     eax, 15cd2401h              ; mov ax, 2401h & int 15h\r
     cli                                 ; disable interrupts\r
-    jnc     @2\r
-@1:\r
+    jnc     .2\r
+.1:\r
     test    dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL\r
-    jz      @2\r
+    jz      .2\r
     in      al, 92h\r
     or      al, 2\r
     out     92h, al                     ; deactivate A20M#\r
-@2:\r
+.2:\r
     xor     ax, ax                      ; xor eax, eax\r
     mov     eax, ss                     ; mov ax, ss\r
     DB      67h\r
@@ -122,18 +122,18 @@ _ThunkAttr:     dd   0
     shl     ax, 4                       ; shl eax, 4\r
     add     bp, ax                      ; add ebp, eax\r
     DB      66h, 0b8h                   ; mov eax, imm32\r
-SavedCr4:   DD      0\r
+.SavedCr4:  DD      0\r
     mov     cr4, eax\r
     DB      66h\r
-    lgdt    [cs:edi + (SavedGdt - @Base)]\r
+    lgdt    [cs:edi + (SavedGdt - .Base)]\r
     DB      66h, 0b8h                   ; mov eax, imm32\r
-SavedCr0:   DD      0\r
+.SavedCr0:  DD      0\r
     mov     cr0, eax\r
     DB      0b8h                        ; mov ax, imm16\r
-SavedSs     DW      0\r
+.SavedSs    DW      0\r
     mov     ss, eax\r
     DB      66h, 0bch                   ; mov esp, imm32\r
-SavedEsp    DD      0\r
+.SavedEsp   DD      0\r
     DB      66h\r
     retf                                ; return to protected mode\r
 \r
@@ -162,7 +162,7 @@ _ToUserCode:
     mov     cr0, eax                    ; real mode starts at next instruction\r
                                         ;  which (per SDM) *must* be a far JMP.\r
     DB      0eah\r
-_RealAddr: DW 0, 0\r
+.RealAddr: DW 0, 0\r
 \r
     mov     cr4, ebp\r
     mov     ss, esi                     ; set up 16-bit stack segment\r
@@ -172,12 +172,12 @@ _RealAddr: DW 0, 0
     DB      67h\r
     mov     ebp, [esp + IA32_REGS.size] ; BackFromUserCode address from stack\r
 \r
-;   mov     cs:[bp + (SavedSs - _BackFromUserCode)], dx\r
-    mov     [cs:esi + (SavedSs - _BackFromUserCode)], edx\r
+;   mov     cs:[bp + (_BackFromUserCode.SavedSs - _BackFromUserCode)], dx\r
+    mov     [cs:esi + (_BackFromUserCode.SavedSs - _BackFromUserCode)], edx\r
 \r
-;   mov     cs:[bp + (SavedEsp - _BackFromUserCode)], ebx\r
+;   mov     cs:[bp + (_BackFromUserCode.SavedEsp - _BackFromUserCode)], ebx\r
     DB      2eh, 66h, 89h, 9eh\r
-    DW      SavedEsp - _BackFromUserCode\r
+    DW      _BackFromUserCode.SavedEsp - _BackFromUserCode\r
 \r
 ;   lidt    cs:[bp + (_16Idtr - _BackFromUserCode)]\r
     DB      2eh, 66h, 0fh, 01h, 9eh\r
@@ -241,28 +241,28 @@ ASM_PFX(InternalAsmThunk16):
     rep     movsd                       ; copy RegSet\r
     mov     eax, [esp + 40]             ; eax <- address of transition code\r
     mov     esi, edx                    ; esi <- 16-bit stack segment\r
-    lea     edx, [eax + (SavedCr0 - ASM_PFX(m16Start))]\r
+    lea     edx, [eax + (_BackFromUserCode.SavedCr0 - ASM_PFX(m16Start))]\r
     mov     ecx, eax\r
     and     ecx, 0fh\r
     shl     eax, 12\r
     lea     ecx, [ecx + (_BackFromUserCode - ASM_PFX(m16Start))]\r
     mov     ax, cx\r
     stosd                               ; [edi] <- return address of user code\r
-    add     eax, _RealAddr + 4 - _BackFromUserCode\r
-    mov     [edx + (_RealAddr - SavedCr0)], eax\r
-    sgdt    [edx + (SavedGdt - SavedCr0)]\r
+    add     eax, _ToUserCode.RealAddr + 4 - _BackFromUserCode\r
+    mov     [edx + (_ToUserCode.RealAddr - _BackFromUserCode.SavedCr0)], eax\r
+    sgdt    [edx + (SavedGdt - _BackFromUserCode.SavedCr0)]\r
     sidt    [esp + 36]        ; save IDT stack in argument space\r
     mov     eax, cr0\r
-    mov     [edx], eax                  ; save CR0 in SavedCr0\r
+    mov     [edx], eax                  ; save CR0 in _BackFromUserCode.SavedCr0\r
     and     eax, 7ffffffeh              ; clear PE, PG bits\r
     mov     ebp, cr4\r
-    mov     [edx + (SavedCr4 - SavedCr0)], ebp\r
+    mov     [edx + (_BackFromUserCode.SavedCr4 - _BackFromUserCode.SavedCr0)], ebp\r
     and     ebp, ~30h                ; clear PAE, PSE bits\r
     push    10h\r
     pop     ecx                         ; ecx <- selector for data segments\r
-    lgdt    [edx + (_16Gdtr - SavedCr0)]\r
+    lgdt    [edx + (_16Gdtr - _BackFromUserCode.SavedCr0)]\r
     pushfd                              ; Save df/if indeed\r
-    call    dword far [edx + (_EntryPoint - SavedCr0)]\r
+    call    dword far [edx + (_EntryPoint - _BackFromUserCode.SavedCr0)]\r
     popfd\r
     lidt    [esp + 36]        ; restore protected mode IDTR\r
     lea     eax, [ebp - IA32_REGS.size] ; eax <- the address of IA32_REGS\r

diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.nasm b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
index edd418c15a29186a706d00b1a820de8e5f62dc19..cabe9d94d13ff807e7014dc0c5728d01638ac587 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Thunk16.nasm
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.nasm
@@ -57,7 +57,7 @@ SECTION .data
 ; These are global constant to convey information to C code.\r
 ;\r
 ASM_PFX(m16Size)         DW      InternalAsmThunk16 - ASM_PFX(m16Start)\r
-ASM_PFX(mThunk16Attr)    DW      _ThunkAttr - ASM_PFX(m16Start)\r
+ASM_PFX(mThunk16Attr)    DW      _BackFromUserCode.ThunkAttr - ASM_PFX(m16Start)\r
 ASM_PFX(m16Gdt)          DW      _NullSeg - ASM_PFX(m16Start)\r
 ASM_PFX(m16GdtrBase)     DW      _16GdtrBase - ASM_PFX(m16Start)\r
 ASM_PFX(mTransition)     DW      _EntryPoint - ASM_PFX(m16Start)\r
@@ -86,8 +86,8 @@ _BackFromUserCode:
     DB      16h                         ; push ss\r
     DB      0eh                         ; push cs\r
     DB      66h\r
-    call    @Base                       ; push eip\r
-@Base:\r
+    call    .Base                       ; push eip\r
+.Base:\r
     DB      66h\r
     push    0                           ; reserved high order 32 bits of EFlags\r
     pushfw                              ; pushfd actually\r
@@ -98,19 +98,19 @@ _BackFromUserCode:
     DB      1eh                         ; push ds\r
     DB      66h, 60h                    ; pushad\r
     DB      66h, 0bah                   ; mov edx, imm32\r
-_ThunkAttr:     dd   0\r
+.ThunkAttr:     dd   0\r
     test    dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15\r
-    jz      @1\r
+    jz      .1\r
     mov     eax, 15cd2401h              ; mov ax, 2401h & int 15h\r
     cli                                 ; disable interrupts\r
-    jnc     @2\r
-@1:\r
+    jnc     .2\r
+.1:\r
     test    dl, THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL\r
-    jz      @2\r
+    jz      .2\r
     in      al, 92h\r
     or      al, 2\r
     out     92h, al                     ; deactivate A20M#\r
-@2:\r
+.2:\r
     xor     ax, ax                      ; xor eax, eax\r
     mov     eax, ss                     ; mov ax, ss\r
     lea     bp, [esp + IA32_REGS.size]\r
@@ -124,32 +124,32 @@ _ThunkAttr:     dd   0
     add     bp, ax                      ; add ebp, eax\r
     mov     ax, cs\r
     shl     ax, 4\r
-    lea     ax, [eax + ebx + (@64BitCode - @Base)]\r
-    DB      66h, 2eh, 89h, 87h          ; mov cs:[bx + (@64Eip - @Base)], eax\r
-    DW      @64Eip - @Base\r
+    lea     ax, [eax + ebx + (.64BitCode - .Base)]\r
+    DB      66h, 2eh, 89h, 87h          ; mov cs:[bx + (.64Eip - .Base)], eax\r
+    DW      .64Eip - .Base\r
     DB      66h, 0b8h                   ; mov eax, imm32\r
-SavedCr4:   DD      0\r
+.SavedCr4:  DD      0\r
     mov     cr4, rax\r
     ;\r
     ; rdi in the instruction below is indeed bx in 16-bit code\r
     ;\r
     DB      66h, 2eh                    ; 2eh is "cs:" segment override\r
-    lgdt    [rdi + (SavedGdt - @Base)]\r
+    lgdt    [rdi + (SavedGdt - .Base)]\r
     DB      66h\r
     mov     ecx, 0c0000080h\r
     rdmsr\r
     or      ah, 1\r
     wrmsr\r
     DB      66h, 0b8h                   ; mov eax, imm32\r
-SavedCr0:   DD      0\r
+.SavedCr0:  DD      0\r
     mov     cr0, rax\r
-    DB      66h, 0eah                   ; jmp far cs:@64Bit\r
-@64Eip:     DD      0\r
-SavedCs:    DW      0\r
-@64BitCode:\r
+    DB      66h, 0eah                   ; jmp far cs:.64Bit\r
+.64Eip:     DD      0\r
+.SavedCs:   DW      0\r
+.64BitCode:\r
     db      090h \r
     db      048h, 0bch                 ; mov rsp, imm64\r
-SavedSp:    DQ   0                     ; restore stack\r
+.SavedSp:   DQ   0                     ; restore stack\r
     nop\r
     ret\r
 \r
@@ -184,16 +184,16 @@ _ToUserCode:
     mov     ss, esi                     ; set up 16-bit stack segment\r
     mov     sp, bx                      ; set up 16-bit stack pointer\r
     DB      66h                         ; make the following call 32-bit\r
-    call    @ToUserCodeBase                       ; push eip\r
-@ToUserCodeBase:\r
-    pop     bp                          ; ebp <- address of @ToUserCodeBase\r
+    call    .Base                       ; push eip\r
+.Base:\r
+    pop     bp                          ; ebp <- address of .Base\r
     push    qword [esp + IA32_REGS.size + 2]\r
-    lea     eax, [rsi + (@RealMode - @ToUserCodeBase)]    ; rsi is "bp" in 16-bit code\r
+    lea     eax, [rsi + (.RealMode - .Base)]    ; rsi is "bp" in 16-bit code\r
     push    rax\r
     retf                                ; execution begins at next instruction\r
-@RealMode:\r
+.RealMode:\r
     DB      66h, 2eh                    ; CS and operand size override\r
-    lidt    [rsi + (_16Idtr - @ToUserCodeBase)]\r
+    lidt    [rsi + (_16Idtr - .Base)]\r
     DB      66h, 61h                    ; popad\r
     DB      1fh                         ; pop ds\r
     DB      07h                         ; pop es\r
@@ -269,7 +269,7 @@ ASM_PFX(InternalAsmThunk16):
     add     edi, eax                    ; edi <- linear address of 16-bit stack\r
     pop     rcx\r
     rep     movsd                       ; copy RegSet\r
-    lea     ecx, [rdx + (SavedCr4 - ASM_PFX(m16Start))]\r
+    lea     ecx, [rdx + (_BackFromUserCode.SavedCr4 - ASM_PFX(m16Start))]\r
     mov     eax, edx                    ; eax <- transition code address\r
     and     edx, 0fh\r
     shl     eax, 12                     ; segment address in high order 16 bits\r
@@ -278,11 +278,11 @@ ASM_PFX(InternalAsmThunk16):
   \r
     sgdt    [rsp + 60h]       ; save GDT stack in argument space\r
     movzx   r10, word [rsp + 60h]   ; r10 <- GDT limit \r
-    lea     r11, [rcx + (InternalAsmThunk16 - SavedCr4) + 0xf]\r
+    lea     r11, [rcx + (InternalAsmThunk16 - _BackFromUserCode.SavedCr4) + 0xf]\r
     and     r11, ~0xf            ; r11 <- 16-byte aligned shadowed GDT table in real mode buffer\r
     \r
-    mov     [rcx + (SavedGdt - SavedCr4)], r10w      ; save the limit of shadowed GDT table\r
-    mov     [rcx + (SavedGdt - SavedCr4) + 2], r11  ; save the base address of shadowed GDT table\r
+    mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4)], r10w      ; save the limit of shadowed GDT table\r
+    mov     [rcx + (SavedGdt - _BackFromUserCode.SavedCr4) + 2], r11  ; save the base address of shadowed GDT table\r
     \r
     mov     rsi, [rsp + 62h]  ; rsi <- the original GDT base address\r
     xchg    rcx, r10                    ; save rcx to r10 and initialize rcx to be the limit of GDT table\r
@@ -294,25 +294,25 @@ ASM_PFX(InternalAsmThunk16):
     \r
     sidt    [rsp + 50h]       ; save IDT stack in argument space\r
     mov     rax, cr0\r
-    mov     [rcx + (SavedCr0 - SavedCr4)], eax\r
+    mov     [rcx + (_BackFromUserCode.SavedCr0 - _BackFromUserCode.SavedCr4)], eax\r
     and     eax, 7ffffffeh              ; clear PE, PG bits\r
     mov     rbp, cr4\r
-    mov     [rcx], ebp                  ; save CR4 in SavedCr4\r
+    mov     [rcx], ebp                  ; save CR4 in _BackFromUserCode.SavedCr4\r
     and     ebp, ~30h                ; clear PAE, PSE bits\r
     mov     esi, r8d                    ; esi <- 16-bit stack segment\r
     DB      6ah, DATA32                 ; push DATA32\r
     pop     rdx                         ; rdx <- 32-bit data segment selector\r
-    lgdt    [rcx + (_16Gdtr - SavedCr4)]\r
+    lgdt    [rcx + (_16Gdtr - _BackFromUserCode.SavedCr4)]\r
     mov     ss, edx\r
     pushfq\r
     lea     edx, [rdx + DATA16 - DATA32]\r
-    lea     r8, [REL @RetFromRealMode]\r
+    lea     r8, [REL .RetFromRealMode]\r
     push    r8\r
     mov     r8d, cs\r
-    mov     [rcx + (SavedCs - SavedCr4)], r8w\r
-    mov     [rcx + (SavedSp - SavedCr4)], rsp\r
-    jmp     dword far [rcx + (_EntryPoint - SavedCr4)]\r
-@RetFromRealMode:\r
+    mov     [rcx + (_BackFromUserCode.SavedCs - _BackFromUserCode.SavedCr4)], r8w\r
+    mov     [rcx + (_BackFromUserCode.SavedSp - _BackFromUserCode.SavedCr4)], rsp\r
+    jmp     dword far [rcx + (_EntryPoint - _BackFromUserCode.SavedCr4)]\r
+.RetFromRealMode:\r
     popfq\r
     lgdt    [rsp + 60h]       ; restore protected mode GDTR\r
     lidt    [rsp + 50h]       ; restore protected mode IDTR\r