Test before you Commit!!

1) missing include files in biosboot.S and gidt.S
2) macros in apm_init.S, biosdisk.S, gidt.S wrong case

4 files changed, 22 insertions, 15 deletions

diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S
index dded626b95c..3737def369b 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.S
+++ b/sys/arch/i386/stand/biosboot/biosboot.S
@@ -1,8 +1,13 @@
-/*	$OpenBSD: biosboot.S,v 1.10 1997/07/28 23:02:17 mickey Exp $	*/
+/*	$OpenBSD: biosboot.S,v 1.11 1997/07/29 16:48:38 flipk Exp $	*/
 
 	.file	"bootbios.S"
 
 #include <machine/asm.h>
+#include <machine/param.h>
+#include <machine/specialreg.h>
+#define _LOCORE
+#include <machine/segments.h>
+#undef _LOCORE
 #include <assym.h>
 
 #define addr32  .byte 0x67
diff --git a/sys/arch/i386/stand/libsa/apm_init.S b/sys/arch/i386/stand/libsa/apm_init.S
index bac23a7fb9d..4ee80280aff 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.2 1997/07/28 23:03:30 mickey Exp $	*/
+/*	$OpenBSD: apm_init.S,v 1.3 1997/07/29 16:48:39 flipk Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -96,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 89f15d66333..a2eb1a823b6 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.11 1997/07/28 23:03:30 mickey Exp $	*/
+/*	$OpenBSD: biosdisk.S,v 1.12 1997/07/29 16:48:40 flipk Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -68,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 82078374781..baff57dceaf 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.8 1997/07/28 23:03:31 mickey Exp $	*/
+/*	$OpenBSD: gidt.S,v 1.9 1997/07/29 16:48:40 flipk Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -39,6 +39,8 @@
 #define _LOCORE
 #include <machine/trap.h>
 #include <machine/biosvar.h>
+#include <machine/specialreg.h>
+#include <machine/segments.h>
 #include <debug_md.h>
 #undef _LOCORE
 #include <assym.h>
@@ -360,7 +362,7 @@ EMUh:
 	prot2real
 
 	addr32
-	movl	_C_LABEL(BIOS_regs)+(biosr_es), %eax
+	movl	_C_LABEL(BIOS_regs)+(BIOSR_ES), %eax
 	movl	%ax, %es
 
 	data32
@@ -375,10 +377,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
@@ -400,12 +402,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