GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tly cosmetical. don't use movw because we use mov in most places. 

Also, drop some dead code at the very end where some segment registers
get set up and are immediately overwritten by pops.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Nils Jacobs <njacobs8@hetnet.nl>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5613 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-06-05 09:52:37 +00:00 committed by Stefan Reinauer
parent 0c47c4d02d
commit 1946284594
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/devices/oprom/x86_asm.S
View File

@ -82,10 +82,10 @@ __realmode_call = RELOCATED(.)
/* entry point */ /* entry point */
movl 36(%ebp), %eax movl 36(%ebp), %eax
movw %ax, __lcall_instr + 1 mov %ax, __lcall_instr + 1
andl $0xffff0000, %eax andl $0xffff0000, %eax
shrl $4, %eax shrl $4, %eax
movw %ax, __lcall_instr + 3 mov %ax, __lcall_instr + 3
/* initial register values */ /* initial register values */
movl 40(%ebp), %eax movl 40(%ebp), %eax
@ -147,7 +147,7 @@ __realmode_call = RELOCATED(.)
movl __registers + 8, %ecx movl __registers + 8, %ecx
movl __registers + 12, %edx movl __registers + 12, %edx
movl __registers + 16, %esi movl __registers + 16, %esi
movl __registers + 20, %edi movl __registers + 20, %edi
/* Set all segments to 0x0000, ds to 0x0040 */ /* Set all segments to 0x0000, ds to 0x0040 */
push %ax push %ax
@ -165,8 +165,8 @@ __lcall_instr = RELOCATED(.)
.word 0x0000, 0x0000 .word 0x0000, 0x0000
/* ************************************ */ /* ************************************ */
/* If we got here, just about done. /* If we got here, we are just about done.
* Need to get back to protected mode * Need to get back to protected mode.
*/ */
movl %cr0, %eax movl %cr0, %eax
orl $PE, %eax orl $PE, %eax
@ -178,7 +178,7 @@ __lcall_instr = RELOCATED(.)
data32 ljmp $0x10, $RELOCATED(1f) data32 ljmp $0x10, $RELOCATED(1f)
1: 1:
.code32 .code32
movw $0x18, %ax mov $0x18, %ax
mov %ax, %ds mov %ax, %ds
mov %ax, %es mov %ax, %es
mov %ax, %fs mov %ax, %fs
@ -294,7 +294,7 @@ __intXX_instr = RELOCATED(.)
data32 ljmp $0x10, $RELOCATED(1f) data32 ljmp $0x10, $RELOCATED(1f)
1: 1:
.code32 .code32
movw $0x18, %ax mov $0x18, %ax
mov %ax, %ds mov %ax, %ds
mov %ax, %es mov %ax, %es
mov %ax, %fs mov %ax, %fs
@ -337,7 +337,7 @@ __interrupt_handler_16bit = RELOCATED(.)
data32 ljmp $0x10, $RELOCATED(1f) data32 ljmp $0x10, $RELOCATED(1f)
1: 1:
.code32 .code32
movw $0x18, %ax mov $0x18, %ax
mov %ax, %ds mov %ax, %ds
mov %ax, %es mov %ax, %es
mov %ax, %fs mov %ax, %fs
@ -382,13 +382,6 @@ __interrupt_handler_16bit = RELOCATED(.)
mov %ax, %ds mov %ax, %ds
lidt __realmode_idt lidt __realmode_idt
/* Set up segment registers to segment 0x0000 and ds to 0x040 */
mov %ax, %es
mov %ax, %fs
mov %ax, %gs
mov $0x40, %ax
mov %ax, %ds
/* Restore all registers, including those /* Restore all registers, including those
* manipulated by the C handler * manipulated by the C handler
*/ */