Module Name: src Committed By: isaki Date: Tue Jan 28 11:57:22 UTC 2020
Modified Files: src/sys/arch/x68k/stand/boot_ufs: boot.S boot_ufs.ldscript src/sys/arch/x68k/stand/xxboot: boot.S xxboot.ldscript Log Message: Revert placing .bss right after .data, and make .bss fixed at 0x5000. .bss placed right after .data was overwritten when first 1KB loads full .text+.data. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x68k/stand/boot_ufs/boot.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/xxboot/boot.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x68k/stand/boot_ufs/boot.S diff -u src/sys/arch/x68k/stand/boot_ufs/boot.S:1.18 src/sys/arch/x68k/stand/boot_ufs/boot.S:1.19 --- src/sys/arch/x68k/stand/boot_ufs/boot.S:1.18 Tue Jan 28 11:52:21 2020 +++ src/sys/arch/x68k/stand/boot_ufs/boot.S Tue Jan 28 11:57:22 2020 @@ -2,7 +2,7 @@ | author: chapuni(webmas...@chapuni.com) | ITOH Yasufumi | -| $NetBSD: boot.S,v 1.18 2020/01/28 11:52:21 isaki Exp $ +| $NetBSD: boot.S,v 1.19 2020/01/28 11:57:22 isaki Exp $ | | (1) IPL (or previous stage loader) loads first 1KB of this primary @@ -27,9 +27,10 @@ | : : +------------+ +------------+ 0x003000 | : : |full primary| |full primary| | : : |boot loader | |boot loader | -| : : +------------+ +------------+ -| : : : : : : -| : : : : +------------+ 0x006000 +| : : |(text+data) | |(text+data) | +| : : +------------+ +------------+ 0x005000 +| : : |(bss) | |(bss) | +| : : +------------+ +------------+ 0x006000 | : : : : | /boot | | : : : : +------------+ | : : : : : : Index: src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript diff -u src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.7 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.8 --- src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.7 Sat Jan 18 07:25:11 2020 +++ src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript Tue Jan 28 11:57:22 2020 @@ -35,6 +35,7 @@ SECTIONS edata = .; _edata = .; } + . = TEXTADDR + 0x2000; .bss : { __bss_start = .; Index: src/sys/arch/x68k/stand/xxboot/boot.S diff -u src/sys/arch/x68k/stand/xxboot/boot.S:1.10 src/sys/arch/x68k/stand/xxboot/boot.S:1.11 --- src/sys/arch/x68k/stand/xxboot/boot.S:1.10 Tue Jan 28 11:52:21 2020 +++ src/sys/arch/x68k/stand/xxboot/boot.S Tue Jan 28 11:57:22 2020 @@ -2,7 +2,7 @@ | author: chapuni(webmas...@chapuni.com) | ITOH Yasufumi | -| $NetBSD: boot.S,v 1.10 2020/01/28 11:52:21 isaki Exp $ +| $NetBSD: boot.S,v 1.11 2020/01/28 11:57:22 isaki Exp $ | | (1) IPL (or previous stage loader) loads first 1KB of this primary @@ -27,9 +27,10 @@ | : : +------------+ +------------+ 0x003000 | : : |full primary| |full primary| | : : |boot loader | |boot loader | -| : : +------------+ +------------+ -| : : : : : : -| : : : : +------------+ 0x006000 +| : : |(text+data) | |(text+data) | +| : : +------------+ +------------+ 0x005000 +| : : |(bss) | |(bss) | +| : : +------------+ +------------+ 0x006000 | : : : : | /boot | | : : : : +------------+ | : : : : : : Index: src/sys/arch/x68k/stand/xxboot/xxboot.ldscript diff -u src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.6 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.7 --- src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.6 Sat Jan 18 07:25:12 2020 +++ src/sys/arch/x68k/stand/xxboot/xxboot.ldscript Tue Jan 28 11:57:22 2020 @@ -35,6 +35,7 @@ SECTIONS edata = .; _edata = .; } + . = TEXTADDR + TEXTDATASIZE; .bss : { __bss_start = .;