Deleted Added
full compact
locore.s (131814) locore.s (131840)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 16 unchanged lines hidden (view full) ---

25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * from: @(#)locore.s 7.3 (Berkeley) 5/13/91
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 16 unchanged lines hidden (view full) ---

25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * from: @(#)locore.s 7.3 (Berkeley) 5/13/91
33 * $FreeBSD: head/sys/i386/i386/locore.s 131814 2004-07-08 13:40:33Z brian $
33 * $FreeBSD: head/sys/i386/i386/locore.s 131840 2004-07-08 22:35:36Z brian $
34 *
35 * originally from: locore.s, by William F. Jolitz
36 *
37 * Substantially rewritten by David Greenman, Rod Grimes,
38 * Bruce Evans, Wolfgang Solfrank, Poul-Henning Kamp
39 * and many others.
40 */
41
34 *
35 * originally from: locore.s, by William F. Jolitz
36 *
37 * Substantially rewritten by David Greenman, Rod Grimes,
38 * Bruce Evans, Wolfgang Solfrank, Poul-Henning Kamp
39 * and many others.
40 */
41
42#include "opt_bootp.h"
42#include "opt_compat.h"
43#include "opt_nfsroot.h"
44#include "opt_pmap.h"
45
46#include <sys/syscall.h>
47#include <sys/reboot.h>
48
49#include <machine/asmacros.h>

--- 486 unchanged lines hidden (view full) ---

536 jbe got_common_bi_size
537 movl $BOOTINFO_SIZE,%ecx
538got_common_bi_size:
539 cld
540 rep
541 movsb
542
543#ifdef NFS_ROOT
43#include "opt_compat.h"
44#include "opt_nfsroot.h"
45#include "opt_pmap.h"
46
47#include <sys/syscall.h>
48#include <sys/reboot.h>
49
50#include <machine/asmacros.h>

--- 486 unchanged lines hidden (view full) ---

537 jbe got_common_bi_size
538 movl $BOOTINFO_SIZE,%ecx
539got_common_bi_size:
540 cld
541 rep
542 movsb
543
544#ifdef NFS_ROOT
545#ifndef BOOTP_NFSV3
544 /*
545 * If we have a nfs_diskless structure copy it in
546 */
547 movl BI_NFS_DISKLESS(%ebx),%esi
548 cmpl $0,%esi
549 je olddiskboot
550 movl $R(nfs_diskless),%edi
551 movl $NFSDISKLESS_SIZE,%ecx
552 cld
553 rep
554 movsb
555 movl $R(nfs_diskless_valid),%edi
556 movl $1,(%edi)
557#endif
546 /*
547 * If we have a nfs_diskless structure copy it in
548 */
549 movl BI_NFS_DISKLESS(%ebx),%esi
550 cmpl $0,%esi
551 je olddiskboot
552 movl $R(nfs_diskless),%edi
553 movl $NFSDISKLESS_SIZE,%ecx
554 cld
555 rep
556 movsb
557 movl $R(nfs_diskless_valid),%edi
558 movl $1,(%edi)
559#endif
560#endif
558
559 /*
560 * The old style disk boot.
561 * (*btext)(howto, bootdev, cyloffset, esym);
562 * Note that the newer boot code just falls into here to pick
563 * up howto and bootdev, cyloffset and esym are no longer used
564 */
565olddiskboot:

--- 391 unchanged lines hidden ---
561
562 /*
563 * The old style disk boot.
564 * (*btext)(howto, bootdev, cyloffset, esym);
565 * Note that the newer boot code just falls into here to pick
566 * up howto and bootdev, cyloffset and esym are no longer used
567 */
568olddiskboot:

--- 391 unchanged lines hidden ---