diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-28 23:03:32 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-28 23:03:32 +0000 |
| commit | 6735a93538919738534562dc6189aeb3f7f9cc1a (patch) | |
| tree | 334e6ddac9923d9c3c7c99d360758259cbb7be28 /sys/arch/i386 | |
| parent | 52fc0e417e5cf4904937c17256bfc1d6b9c022cf (diff) | |
assym.h
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/stand/libsa/apm_init.S | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdisk.S | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/gidt.S | 23 |
3 files changed, 17 insertions, 16 deletions
diff --git a/sys/arch/i386/stand/libsa/apm_init.S b/sys/arch/i386/stand/libsa/apm_init.S index 39dacb314f6..bac23a7fb9d 100644 --- a/sys/arch/i386/stand/libsa/apm_init.S +++ b/sys/arch/i386/stand/libsa/apm_init.S @@ -1,4 +1,4 @@ -/* $OpenBSD: apm_init.S,v 1.1 1997/07/17 23:23:14 mickey Exp $ */ +/* $OpenBSD: apm_init.S,v 1.2 1997/07/28 23:03:30 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -74,6 +74,7 @@ #include <machine/biosvar.h> #include <machine/apmvar.h> #undef _LOCORE +#include <assym.h> .globl _C_LABEL(BIOS_regs) .text @@ -95,7 +96,7 @@ ENTRY(apm_init) shll $16, %eax orw %cx, %ax rorl $16, %eax - movl _C_LABEL(BIOS_regs)+BIOSR_BX, %ebx + movl _C_LABEL(BIOS_regs)+biosr_bx, %ebx cmpb $'P', %bh jne 1f cmpb $'M', %bl diff --git a/sys/arch/i386/stand/libsa/biosdisk.S b/sys/arch/i386/stand/libsa/biosdisk.S index 14a89109e86..89f15d66333 100644 --- a/sys/arch/i386/stand/libsa/biosdisk.S +++ b/sys/arch/i386/stand/libsa/biosdisk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdisk.S,v 1.10 1997/07/18 00:29:08 mickey Exp $ */ +/* $OpenBSD: biosdisk.S,v 1.11 1997/07/28 23:03:30 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -37,6 +37,7 @@ #include <machine/biosvar.h> #include "debug_md.h" #undef _LOCORE +#include <assym.h> .globl _C_LABEL(errno) /* XXX used for bios errors */ @@ -67,7 +68,7 @@ ENTRY(biosread) movl %ebx, %edi # split off for seg:off pair andl $0xf, %ebx # atomic read for up to 64k shrl $4, %edi - movl %edi, _C_LABEL(BIOS_regs)+BIOSR_ES + movl %edi, _C_LABEL(BIOS_regs)+biosr_es DOINT(0x13) movb $0, %al diff --git a/sys/arch/i386/stand/libsa/gidt.S b/sys/arch/i386/stand/libsa/gidt.S index e7de0360d0f..82078374781 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.7 1997/07/24 21:50:10 mickey Exp $ */ +/* $OpenBSD: gidt.S,v 1.8 1997/07/28 23:03:31 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -37,12 +37,11 @@ #include <machine/asm.h> #include <machine/psl.h> #define _LOCORE -#include <machine/segments.h> -#include <machine/specialreg.h> #include <machine/trap.h> #include <machine/biosvar.h> #include <debug_md.h> #undef _LOCORE +#include <assym.h> #define addr32 .byte 0x67 #define data32 .byte 0x66 @@ -361,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 @@ -376,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 @@ -401,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 |