diff options
Diffstat (limited to 'sys/arch/i386/stand/libsa/gidt.S')
| -rw-r--r-- | sys/arch/i386/stand/libsa/gidt.S | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sys/arch/i386/stand/libsa/gidt.S b/sys/arch/i386/stand/libsa/gidt.S index baff57dceaf..fea51002506 100644 --- a/sys/arch/i386/stand/libsa/gidt.S +++ b/sys/arch/i386/stand/libsa/gidt.S @@ -1,4 +1,4 @@ -/* $OpenBSD: gidt.S,v 1.9 1997/07/29 16:48:40 flipk Exp $ */ +/* $OpenBSD: gidt.S,v 1.10 1997/07/30 19:40:58 flipk Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -38,8 +38,6 @@ #include <machine/psl.h> #define _LOCORE #include <machine/trap.h> -#include <machine/biosvar.h> -#include <machine/specialreg.h> #include <machine/segments.h> #include <debug_md.h> #undef _LOCORE @@ -362,7 +360,7 @@ EMUh: prot2real addr32 - movl _C_LABEL(BIOS_regs)+(BIOSR_ES), %eax + movl _C_LABEL(BIOS_regs)+(biosr_es), %eax movl %ax, %es data32 @@ -377,10 +375,10 @@ intno = . - 1 addr32 data32 - movl %ebx, _C_LABEL(BIOS_regs)+(BIOSR_BX) + movl %ebx, _C_LABEL(BIOS_regs)+(biosr_bx) movl %es, %bx addr32 - movl %bx, _C_LABEL(BIOS_regs)+(BIOSR_ES) + movl %bx, _C_LABEL(BIOS_regs)+(biosr_es) movb %ah, %bh /* save flags to return to caller */ lahf xchgb %ah, %bh @@ -402,12 +400,12 @@ intno = . - 1 movb %bh , 0xf*4(%esp) /* save registers into save area */ - movl %eax, _C_LABEL(BIOS_regs)+BIOSR_AX - movl %ecx, _C_LABEL(BIOS_regs)+BIOSR_CX - movl %edx, _C_LABEL(BIOS_regs)+BIOSR_DX - movl %ebp, _C_LABEL(BIOS_regs)+BIOSR_BP - movl %esi, _C_LABEL(BIOS_regs)+BIOSR_SI - movl %edi, _C_LABEL(BIOS_regs)+BIOSR_DI + movl %eax, _C_LABEL(BIOS_regs)+biosr_ax + movl %ecx, _C_LABEL(BIOS_regs)+biosr_cx + movl %edx, _C_LABEL(BIOS_regs)+biosr_dx + movl %ebp, _C_LABEL(BIOS_regs)+biosr_bp + movl %esi, _C_LABEL(BIOS_regs)+biosr_si + movl %edi, _C_LABEL(BIOS_regs)+biosr_di popl %gs popl %fs |