Grap the bootinfo structure the bootblock passes us.

5 files changed, 43 insertions, 8 deletions

diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index f7a8876..d3cd26d 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.18 1994/10/26 10:18:24 jkh Exp $
+ *	$Id: genassym.c,v 1.19 1994/10/26 22:01:11 bde Exp $
  */
 
 #include <stdio.h>
@@ -197,6 +197,7 @@ main()
 	printf("#define\tEFAULT %d\n", EFAULT);
 	printf("#define\tENAMETOOLONG %d\n", ENAMETOOLONG);
 	printf("#define\tMAXPATHLEN %d\n", MAXPATHLEN);
+	printf("#define\tBOOTINFO_SIZE %d\n", sizeof *bootinfo);
 	printf("#define\tBOOTINFO_VERSION %d\n", &bootinfo->version);
 	printf("#define\tBOOTINFO_KERNELNAME %d\n", &bootinfo->kernelname);
 	printf("#define\tBOOTINFO_NFS_DISKLESS %d\n", &bootinfo->nfs_diskless);
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 3e08b22..7f32a04 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.43 1994/10/31 17:20:15 joerg Exp $
+ *	$Id: locore.s,v 1.44 1994/11/06 22:18:45 phk Exp $
  */
 
 /*
@@ -119,11 +119,12 @@ tmpstk:
 
 	.globl	_boothowto,_bootdev
 
-	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id
+	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id,_bootinfo
 
 _cpu:	.long	0				/* are we 386, 386sx, or 486 */
 _cpu_id:	.long	0			/* stepping ID */
 _cpu_vendor:	.space	20			/* CPU origin code */
+_bootinfo:	.space	BOOTINFO_SIZE		/* the bootstrapper knew it! */
 _cold:	.long	1				/* cold till we are not */
 _atdevbase:	.long	0			/* location of start of iomem in virtual */
 _atdevphys:	.long	0			/* location of device mapping ptes (phys) */
@@ -263,6 +264,16 @@ NON_GPROF_ENTRY(btext)
 	movsb
 
 1:
+	/* 
+	 * Copy the bootinfo structure
+	 */
+	movl	%ebx,%esi
+	lea	_bootinfo-KERNBASE,%edi
+	movl	$BOOTINFO_SIZE,%ecx
+	cld
+	rep
+	movsb
+
 #ifdef NFS
 	/*
 	 * If we have a nfs_diskless structure copy it in
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 3e08b22..7f32a04 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.43 1994/10/31 17:20:15 joerg Exp $
+ *	$Id: locore.s,v 1.44 1994/11/06 22:18:45 phk Exp $
  */
 
 /*
@@ -119,11 +119,12 @@ tmpstk:
 
 	.globl	_boothowto,_bootdev
 
-	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id
+	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id,_bootinfo
 
 _cpu:	.long	0				/* are we 386, 386sx, or 486 */
 _cpu_id:	.long	0			/* stepping ID */
 _cpu_vendor:	.space	20			/* CPU origin code */
+_bootinfo:	.space	BOOTINFO_SIZE		/* the bootstrapper knew it! */
 _cold:	.long	1				/* cold till we are not */
 _atdevbase:	.long	0			/* location of start of iomem in virtual */
 _atdevphys:	.long	0			/* location of device mapping ptes (phys) */
@@ -263,6 +264,16 @@ NON_GPROF_ENTRY(btext)
 	movsb
 
 1:
+	/* 
+	 * Copy the bootinfo structure
+	 */
+	movl	%ebx,%esi
+	lea	_bootinfo-KERNBASE,%edi
+	movl	$BOOTINFO_SIZE,%ecx
+	cld
+	rep
+	movsb
+
 #ifdef NFS
 	/*
 	 * If we have a nfs_diskless structure copy it in
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index f7a8876..d3cd26d 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.18 1994/10/26 10:18:24 jkh Exp $
+ *	$Id: genassym.c,v 1.19 1994/10/26 22:01:11 bde Exp $
  */
 
 #include <stdio.h>
@@ -197,6 +197,7 @@ main()
 	printf("#define\tEFAULT %d\n", EFAULT);
 	printf("#define\tENAMETOOLONG %d\n", ENAMETOOLONG);
 	printf("#define\tMAXPATHLEN %d\n", MAXPATHLEN);
+	printf("#define\tBOOTINFO_SIZE %d\n", sizeof *bootinfo);
 	printf("#define\tBOOTINFO_VERSION %d\n", &bootinfo->version);
 	printf("#define\tBOOTINFO_KERNELNAME %d\n", &bootinfo->kernelname);
 	printf("#define\tBOOTINFO_NFS_DISKLESS %d\n", &bootinfo->nfs_diskless);
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 3e08b22..7f32a04 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.43 1994/10/31 17:20:15 joerg Exp $
+ *	$Id: locore.s,v 1.44 1994/11/06 22:18:45 phk Exp $
  */
 
 /*
@@ -119,11 +119,12 @@ tmpstk:
 
 	.globl	_boothowto,_bootdev
 
-	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id
+	.globl	_cpu,_cold,_atdevbase,_cpu_vendor,_cpu_id,_bootinfo
 
 _cpu:	.long	0				/* are we 386, 386sx, or 486 */
 _cpu_id:	.long	0			/* stepping ID */
 _cpu_vendor:	.space	20			/* CPU origin code */
+_bootinfo:	.space	BOOTINFO_SIZE		/* the bootstrapper knew it! */
 _cold:	.long	1				/* cold till we are not */
 _atdevbase:	.long	0			/* location of start of iomem in virtual */
 _atdevphys:	.long	0			/* location of device mapping ptes (phys) */
@@ -263,6 +264,16 @@ NON_GPROF_ENTRY(btext)
 	movsb
 
 1:
+	/* 
+	 * Copy the bootinfo structure
+	 */
+	movl	%ebx,%esi
+	lea	_bootinfo-KERNBASE,%edi
+	movl	$BOOTINFO_SIZE,%ecx
+	cld
+	rep
+	movsb
+
 #ifdef NFS
 	/*
 	 * If we have a nfs_diskless structure copy it in