mickey has pieces he has not committed.

if he puts the tree in an unbuildable state again..
anyway, all these problems came from the fact that etc/genassym.cf
wasn't even being used, and assym.h is where key defines were supposed
to be coming from. now we actually include etc/genassym.cf in the
genassym.sh processing, and remove the #includes i had in place to
work around it. now if mickey had committed machine/biosvar.h, etc/Makefile,
and these asm files all at the same time, there wouldn't have been
a problem....

5 files changed, 20 insertions, 24 deletions

diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S
index 3737def369b..5c702201274 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.S
+++ b/sys/arch/i386/stand/biosboot/biosboot.S
@@ -1,10 +1,8 @@
-/*	$OpenBSD: biosboot.S,v 1.11 1997/07/29 16:48:38 flipk Exp $	*/
+/*	$OpenBSD: biosboot.S,v 1.12 1997/07/30 19:40:45 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
diff --git a/sys/arch/i386/stand/etc/Makefile b/sys/arch/i386/stand/etc/Makefile
index a9fb86655ca..ed30d53cddb 100644
--- a/sys/arch/i386/stand/etc/Makefile
+++ b/sys/arch/i386/stand/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1997/07/28 22:03:27 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 1997/07/30 19:40:50 flipk Exp $
 
 S=	${.CURDIR}/../../../..
 I386=	${.CURDIR}/../..
@@ -13,12 +13,12 @@ machine-links:
 assym.h: $S/kern/genassym.sh ${I386}/i386/genassym.cf
 	@echo '#define NISA 1' > isa.h
 	@echo '#define NAPM 1' > apm.h
+	cat ${I386}/i386/genassym.cf ${.CURDIR}/genassym.cf | \
 	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${I386}/i386/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+	    ${PARAM} > assym.h.tmp && mv -f assym.h.tmp assym.h
 
-clean:
-	@rm -f isa.h apm.h assym.h
+clean cleandir:
+	rm -f isa.h apm.h assym.h
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/sys/arch/i386/stand/libsa/apm_init.S b/sys/arch/i386/stand/libsa/apm_init.S
index 4ee80280aff..d86872e39a4 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.3 1997/07/29 16:48:39 flipk Exp $	*/
+/*	$OpenBSD: apm_init.S,v 1.4 1997/07/30 19:40:53 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 a2eb1a823b6..196bb723de3 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.12 1997/07/29 16:48:40 flipk Exp $	*/
+/*	$OpenBSD: biosdisk.S,v 1.13 1997/07/30 19:40:56 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 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