1. Updated function headers in all assembly files.

[mirror_edk2.git] / MdePkg / Library / BaseLib / Ia32 / Thunk16.S

diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.S b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
index 97b49f5a38a7db2403b3f3d15ed618e072cd390a..aad6bbe26ba6ced59f5c41f289d9e20425ae9bae 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.S
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
@@ -19,16 +19,10 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.global _m16Start, _m16Size, _mThunk16Attr, _m16GdtrBase, _m16Gdt, _m16GdtrBase, _mTransition\r
+.global _m16Start, _m16Size, _mThunk16Attr, _m16Gdt, _m16GdtrBase, _mTransition\r
 .global _InternalAsmThunk16\r
 \r
-#THUNK_ATTRIBUTE_BIG_REAL_MODE               EQU 1\r
-#THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15     EQU 2\r
-#THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL   EQU 4\r
-\r
-   .code: \r
-\r
-_m16Start: \r
+_m16Start:\r
 \r
 SavedGdt:     .space  6\r
 \r
@@ -37,7 +31,7 @@ _BackFromUserCode:
     push    %cs\r
     .byte   0x66\r
     call    @Base1                      # push eip\r
-@Base1: \r
+@Base1:\r
     pushfw                              # pushfd actually\r
     cli                                 # disable interrupts\r
     push    %gs\r
@@ -45,37 +39,37 @@ _BackFromUserCode:
     push    %es\r
     push    %ds\r
     pushaw                              # pushad actually\r
-    .byte   0x66,0xba                   # mov edx, imm32\r
+    .byte   0x66, 0xba                   # mov edx, imm32\r
 _ThunkAttr: .space  4\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15, %dl\r
     jz      @1\r
     movl    $0x15cd2401, %eax           # mov ax, 2401h & int 15h\r
     cli                                 # disable interrupts\r
     jnc     @2\r
-@1: \r
+@1:\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL, %dl\r
     jz      @2\r
     inb     $0x92, %al\r
     orb     $2, %al\r
     outb    %al, $0x92                  # deactivate A20M#\r
-@2: \r
+@2:\r
     movl    %ss, %eax\r
     .byte   0x67, 0x66, 0x8d, 0x6c, 0x24, 0x34, 0x66\r
-    mov    %ebp,0xffffffd8(%esi)\r
-    mov     0xfffffff8(%esi),%ebx\r
+    mov     %ebp, 0xffffffd8(%esi)\r
+    mov     0xfffffff8(%esi), %ebx\r
     shlw    $4, %ax                     # shl eax, 4\r
     addw    %ax, %bp                    # add ebp, eax\r
-    .byte   0x66,0xb8                   # mov eax, imm32\r
+    .byte   0x66, 0xb8                   # mov eax, imm32\r
 SavedCr4:   .space  4\r
     movl    %eax, %cr4\r
-    lgdtw  %cs:0xfffffff2(%edi)\r
-    .byte   0x66,0xb8                   # mov eax, imm32\r
+    lgdtw   %cs:0xfffffff2(%edi)\r
+    .byte   0x66, 0xb8                   # mov eax, imm32\r
 SavedCr0:   .space  4\r
     movl    %eax, %cr0\r
     .byte   0xb8                        # mov ax, imm16\r
 SavedSs:    .space  2\r
     movl    %eax, %ss\r
-    .byte   0x66,0xbc                   # mov esp, imm32\r
+    .byte   0x66, 0xbc                   # mov esp, imm32\r
 SavedEsp:   .space  4\r
     .byte   0x66\r
     lret                                # return to protected mode\r
@@ -100,23 +94,23 @@ _ToUserCode:
     xchgw   %bx, %sp                    # set up 16-bit stack pointer\r
     .byte   0x66\r
     call    @Base                       # push eip\r
-@Base: \r
+@Base:\r
     popw    %bp                         # ebp <- offset @Base\r
     addr16  pushl 36(%si)\r
     .byte   0x36\r
-    lea     0xc(%esi),%eax\r
-    pushl   %eax\r
+    lea     0xc(%esi), %eax\r
+    push    %eax\r
     lret\r
 \r
-@RealMode: \r
-    mov     %edx,%cs:0xffffffc5(%esi)\r
-    mov     %bx,%cs:0xffffffcb(%esi)\r
+@RealMode:\r
+    mov     %edx, %cs:0xffffffc5(%esi)\r
+    mov     %bx, %cs:0xffffffcb(%esi)\r
     lidtw   %cs:0xffffffd7(%esi)\r
     popaw                               # popad actually\r
-    popl    %ds\r
-    popl    %es\r
-    popl    %fs\r
-    popl    %gs\r
+    pop     %ds\r
+    pop     %es\r
+    pop     %fs\r
+    pop     %gs\r
     popfw                               # popfd\r
     lretw                               # transfer control to user code\r
 \r
@@ -152,41 +146,41 @@ _InternalAsmThunk16:
     push    %fs\r
     push    %gs\r
     movl    36(%esp), %esi              # esi <- RegSet\r
-    movzwl  0x32(%esi),%edx\r
-    mov     0xc(%esi),%edi\r
-    add     $0xffffffc8,%edi\r
+    movzwl  0x32(%esi), %edx\r
+    mov     0xc(%esi), %edi\r
+    add     $0xffffffc8, %edi\r
     movl    %edi, %ebx                  # ebx <- stack offset\r
-    imul    $0x10,%edx,%eax\r
+    imul    $0x10, %edx, %eax\r
     push    $0xd\r
     addl    %eax, %edi                  # edi <- linear address of 16-bit stack\r
-    popl    %ecx\r
+    pop     %ecx\r
     rep\r
     movsl                               # copy RegSet\r
     movl    40(%esp), %eax              # eax <- address of transition code\r
     movl    %edx, %esi                  # esi <- 16-bit stack segment\r
-    lea     0x5e(%eax),%edx\r
+    lea     0x5e(%eax), %edx\r
     movl    %eax, %ecx\r
     andl    $0xf, %ecx\r
     shll    $12, %eax\r
-    lea     0x6(%ecx),%ecx\r
+    lea     0x6(%ecx), %ecx\r
     movw    %cx, %ax\r
     stosl                               # [edi] <- return address of user code\r
-    sgdtl  0xffffffa2(%edx)\r
+    sgdtl   0xffffffa2(%edx)\r
     sidtl   0x24(%esp)\r
     movl    %cr0, %eax\r
     movl    %eax, (%edx)                # save CR0 in SavedCr0\r
     andl    $0x7ffffffe, %eax           # clear PE, PG bits\r
     movl    %cr4, %ebp\r
-    mov     %ebp,0xfffffff1(%edx)\r
+    mov     %ebp, 0xfffffff1(%edx)\r
     andl    $0x300, %ebp                # clear all but PCE and OSFXSR bits\r
     pushl   $0x10\r
-    popl    %ecx                        # ecx <- selector for data segments\r
+    pop     %ecx                        # ecx <- selector for data segments\r
     lgdtl   0x20(%edx)\r
     pushfl\r
     lcall   *0x14(%edx)\r
     popfl\r
     lidtl   0x24(%esp)\r
-    lea     0xffffffcc(%ebp),%eax\r
+    lea     0xffffffcc(%ebp), %eax\r
        pop     %gs\r
        pop     %fs\r
        pop     %es\r
@@ -197,11 +191,10 @@ _InternalAsmThunk16:
        pop     %ebp\r
     ret\r
 \r
-    .const: \r
+    .const:\r
 \r
 _m16Size:        .word      _InternalAsmThunk16 - _m16Start\r
 _mThunk16Attr:   .word      _ThunkAttr          - _m16Start\r
 _m16Gdt:         .word      _NullSegDesc        - _m16Start\r
 _m16GdtrBase:    .word      _16GdtrBase         - _m16Start\r
 _mTransition:    .word      _EntryPoint         - _m16Start\r
-\r