remove trailing whitespace

[coreboot.git] / src / devices / oprom / x86_asm.S

diff --git a/src/devices/oprom/x86_asm.S b/src/devices/oprom/x86_asm.S
index bbae4b1bcec252369cc532af6cd56cc5ea6d19cf..488bfa6b912e625eae5b56cc4319a053e0e78839 100644 (file)
--- a/src/devices/oprom/x86_asm.S
+++ b/src/devices/oprom/x86_asm.S
@@ -66,6 +66,11 @@ __registers = RELOCATED(.)
        .long 0 /* 16 - ESI */
        .long 0 /* 20 - EDI */
 
+/* 256 byte buffer, used by int10 */
+       .globl __buffer
+__buffer = RELOCATED(.)
+       .skip 256
+
        .code32
        .globl __realmode_call
 __realmode_call = RELOCATED(.)
@@ -82,10 +87,10 @@ __realmode_call = RELOCATED(.)
 
        /* entry point */
        movl    36(%ebp), %eax
-       movw    %ax, __lcall_instr + 1
+       mov     %ax, __lcall_instr + 1
        andl    $0xffff0000, %eax
        shrl    $4, %eax
-       movw    %ax, __lcall_instr + 3
+       mov     %ax, __lcall_instr + 3
 
        /* initial register values */
        movl    40(%ebp), %eax
@@ -141,13 +146,6 @@ __realmode_call = RELOCATED(.)
        mov     %ax, %ds
        lidt    __realmode_idt
 
-       /* Set all segments to 0x0000, ds to 0x0040 */
-       mov     %ax, %es
-       mov     %ax, %fs
-       mov     %ax, %gs
-       mov     $0x40, %ax
-       mov     %ax, %ds
-
        /* initialize registers for option rom lcall */
        movl    __registers +  0, %eax
        movl    __registers +  4, %ebx
@@ -156,14 +154,24 @@ __realmode_call = RELOCATED(.)
        movl    __registers + 16, %esi
        movl    __registers + 20, %edi
 
+       /* Set all segments to 0x0000, ds to 0x0040 */
+       push    %ax
+       xor     %ax, %ax
+       mov     %ax, %es
+       mov     %ax, %fs
+       mov     %ax, %gs
+       mov     $0x40, %ax
+       mov     %ax, %ds
+       pop     %ax
+
        /* ************************************ */
 __lcall_instr = RELOCATED(.)
        .byte 0x9a
        .word 0x0000, 0x0000
        /* ************************************ */
 
-       /* If we got here, just about done.
-        * Need to get back to protected mode
+       /* If we got here, we are just about done.
+        * Need to get back to protected mode.
         */
        movl    %cr0, %eax
        orl     $PE, %eax
@@ -175,7 +183,7 @@ __lcall_instr = RELOCATED(.)
        data32  ljmp    $0x10, $RELOCATED(1f)
 1:
        .code32
-       movw    $0x18, %ax
+       mov     $0x18, %ax
        mov     %ax, %ds
        mov     %ax, %es
        mov     %ax, %fs
@@ -247,7 +255,7 @@ __realmode_interrupt = RELOCATED(.)
        data32 ljmp     $0, $RELOCATED(1f)
 1:
 
-       /* put the stack at the end of page zero.  That way we can easily 
+       /* put the stack at the end of page zero.  That way we can easily
         * share it between real mode and protected mode, because %esp and
         * %ss:%sp point to the same memory.
         */
@@ -262,12 +270,6 @@ __realmode_interrupt = RELOCATED(.)
        mov     %ax, %ds
        lidt    __realmode_idt
 
-       /* Set all segments to 0x0000 */
-       mov     %ax, %ds
-       mov     %ax, %es
-       mov     %ax, %fs
-       mov     %ax, %gs
-
        /* initialize registers for intXX call */
        movl    __registers +  0, %eax
        movl    __registers +  4, %ebx
@@ -276,6 +278,15 @@ __realmode_interrupt = RELOCATED(.)
        movl    __registers + 16, %esi
        movl    __registers + 20, %edi
 
+       /* Set all segments to 0x0000 */
+       push    %ax
+       xor     %ax, %ax
+       mov     %ax, %ds
+       mov     %ax, %es
+       mov     %ax, %fs
+       mov     %ax, %gs
+       pop     %ax
+
 __intXX_instr = RELOCATED(.)
        .byte 0xcd, 0x00 /* This becomes intXX */
 
@@ -288,7 +299,7 @@ __intXX_instr = RELOCATED(.)
        data32  ljmp    $0x10, $RELOCATED(1f)
 1:
        .code32
-       movw    $0x18, %ax
+       mov     $0x18, %ax
        mov     %ax, %ds
        mov     %ax, %es
        mov     %ax, %fs
@@ -331,7 +342,7 @@ __interrupt_handler_16bit = RELOCATED(.)
        data32 ljmp    $0x10, $RELOCATED(1f)
 1:
        .code32
-       movw    $0x18, %ax
+       mov     $0x18, %ax
        mov     %ax, %ds
        mov     %ax, %es
        mov     %ax, %fs
@@ -376,13 +387,6 @@ __interrupt_handler_16bit = RELOCATED(.)
        mov     %ax, %ds
        lidt    __realmode_idt
 
-       /* Set up segment registers to segment 0x0000 */
-       mov     %ax, %es
-       mov     %ax, %fs
-       mov     %ax, %gs
-       mov     $0x40, %ax
-       mov     %ax, %ds
-
        /* Restore all registers, including those
         * manipulated by the C handler
         */