[src/trunk]: src/sys/arch/x68k/stand Revert placing .bss right after .data, a...

[isaki <isaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/34610833a8cd
branches:  trunk
changeset: 1006811:34610833a8cd
user:      isaki <isaki%NetBSD.org@localhost>
date:      Tue Jan 28 11:57:22 2020 +0000

description:
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.

diffstat:

 sys/arch/x68k/stand/boot_ufs/boot.S            |  9 +++++----
 sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript |  1 +
 sys/arch/x68k/stand/xxboot/boot.S              |  9 +++++----
 sys/arch/x68k/stand/xxboot/xxboot.ldscript     |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diffs (74 lines):

diff -r 37a6639e262d -r 34610833a8cd sys/arch/x68k/stand/boot_ufs/boot.S
--- a/sys/arch/x68k/stand/boot_ufs/boot.S       Tue Jan 28 11:52:21 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/boot.S       Tue Jan 28 11:57:22 2020 +0000
@@ -2,7 +2,7 @@
 | author: chapuni(webmaster%chapuni.com@localhost)
 |         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      |
 |  :            :        :            :        +------------+
 |  :            :        :            :        :            :
diff -r 37a6639e262d -r 34610833a8cd sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
--- a/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript    Tue Jan 28 11:52:21 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript    Tue Jan 28 11:57:22 2020 +0000
@@ -35,6 +35,7 @@
     edata  =  .;
     _edata  =  .;
   }
+  . = TEXTADDR + 0x2000;
   .bss :
   {
     __bss_start = .;
diff -r 37a6639e262d -r 34610833a8cd sys/arch/x68k/stand/xxboot/boot.S
--- a/sys/arch/x68k/stand/xxboot/boot.S Tue Jan 28 11:52:21 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/boot.S Tue Jan 28 11:57:22 2020 +0000
@@ -2,7 +2,7 @@
 | author: chapuni(webmaster%chapuni.com@localhost)
 |         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      |
 |  :            :        :            :        +------------+
 |  :            :        :            :        :            :
diff -r 37a6639e262d -r 34610833a8cd sys/arch/x68k/stand/xxboot/xxboot.ldscript
--- a/sys/arch/x68k/stand/xxboot/xxboot.ldscript        Tue Jan 28 11:52:21 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot.ldscript        Tue Jan 28 11:57:22 2020 +0000
@@ -35,6 +35,7 @@
     edata  =  .;
     _edata  =  .;
   }
+  . = TEXTADDR + TEXTDATASIZE;
   .bss :
   {
     __bss_start = .;