cvs commit: src/sys/boot/i386 bootasm.h bootasmdef.c src/sys/boot/i386/boot2 Makefile boot1.S boot2.c src/sys/boot/i386/btx/lib btxcsu.S
Matthew Dillon
dillon at crater.dragonflybsd.org
Tue Jul 27 12:38:53 PDT 2004
dillon 2004/07/27 12:37:19 PDT
DragonFly src repository
Modified files:
sys/boot/i386 bootasm.h bootasmdef.c
sys/boot/i386/boot2 Makefile boot1.S boot2.c
sys/boot/i386/btx/lib btxcsu.S
Log:
Boot1 tries to clear boot2's BSS. It makes several assumptions that are
incorrect (or incorrect now), and doesn't really know how much BSS to clear
anyway. Remove the BSS clearing code from boot1 and add BSS clearing code
to the boot2 (in particular, /usr/src/sys/boot/i386/btx/lib/btxcsu.S).
This should solve numerous issues including boot2 getting confused about
the default boot device file path.
Collapse some boot2 code to make it fit again.
Move the BOOT2 virtual origin (relative to the BTX client address space)
into bootasm.h, replace an undocumented hardwired BOOT2 origin calculation
(that was SIZ_PAG*2) with BOOT2_VORIGIN. Replace the hardwired ORG2
constant in boot2's Makefile with code to pull BOOT2_VORIGIN out of the
header file.
Revision Changes Path
1.4 +6 -0 src/sys/boot/i386/bootasm.h
1.2 +3 -1 src/sys/boot/i386/bootasmdef.c
1.10 +1 -1 src/sys/boot/i386/boot2/Makefile
1.8 +26 -12 src/sys/boot/i386/boot2/boot1.S
1.13 +7 -5 src/sys/boot/i386/boot2/boot2.c
1.6 +10 -2 src/sys/boot/i386/btx/lib/btxcsu.S
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/bootasm.h.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/bootasmdef.c.diff?r1=1.1&r2=1.2&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/boot2/Makefile.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/boot2/boot1.S.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/boot2/boot2.c.diff?r1=1.12&r2=1.13&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/btx/lib/btxcsu.S.diff?r1=1.5&r2=1.6&f=u
More information about the Commits
mailing list