Module Name: src
Committed By: isaki
Date: Thu Jan 16 13:37:27 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: boot.S
src/sys/arch/x68k/stand/boot_ustar: boot_ustar.S
src/sys/arch/x68k/stand/xxboot: boot.S
Log Message:
Use .org directive to fix disklabel location instead of hand calculation.
If the code size before disklabel is less, zero is filled automatically.
If the code size before disklabel is exceeded, assembler stops with error.
Note that this changes a padding word in the current output binary from
a NOP instruction to zero but there are no functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/boot.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/boot.S
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.12 src/sys/arch/x68k/stand/boot_ufs/boot.S:1.13
--- src/sys/arch/x68k/stand/boot_ufs/boot.S:1.12 Tue Jan 14 04:00:41 2020
+++ src/sys/arch/x68k/stand/boot_ufs/boot.S Thu Jan 16 13:37:26 2020
@@ -2,7 +2,7 @@
| author: chapuni(webmas...@chapuni.com)
| ITOH Yasufumi
|
-| $NetBSD: boot.S,v 1.12 2020/01/14 04:00:41 isaki Exp $
+| $NetBSD: boot.S,v 1.13 2020/01/16 13:37:26 isaki Exp $
#include <machine/asm.h>
#include "iocscall.h"
@@ -44,7 +44,7 @@ ASENTRY_NOPROFILE(entry0)
| Disklabel= 404bytes
| Since LABELOFFSET in <machine/disklabel.h> is 0x40,
| entry must be after 0x000001d4 (0x000f01d4)
- nop
+ .org 0x40
disklabel:
.space 404
Index: src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S
diff -u src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S:1.9 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S:1.10
--- src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S:1.9 Mon Jan 13 03:34:05 2020
+++ src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S Thu Jan 16 13:37:26 2020
@@ -3,7 +3,7 @@
| ITOH Yasufumi
| mino...@netbsd.org
|
-| $NetBSD: boot_ustar.S,v 1.9 2020/01/13 03:34:05 isaki Exp $
+| $NetBSD: boot_ustar.S,v 1.10 2020/01/16 13:37:26 isaki Exp $
| supports floppy only
@@ -46,8 +46,8 @@ ASENTRY_NOPROFILE(entry0)
| Disklabel= 404bytes
| Since LABELOFFSET in <machine/disklabel.h> is 0x40,
| entry must be after 0x000001d4 (0x000021d4)
- nop
-GLOBAL(disklabel)
+ .org 0x40
+disklabel:
.space 404
ASENTRY_NOPROFILE(entry)
Index: src/sys/arch/x68k/stand/xxboot/boot.S
diff -u src/sys/arch/x68k/stand/xxboot/boot.S:1.4 src/sys/arch/x68k/stand/xxboot/boot.S:1.5
--- src/sys/arch/x68k/stand/xxboot/boot.S:1.4 Mon Jan 13 03:34:05 2020
+++ src/sys/arch/x68k/stand/xxboot/boot.S Thu Jan 16 13:37:27 2020
@@ -2,7 +2,7 @@
| author: chapuni(webmas...@chapuni.com)
| ITOH Yasufumi
|
-| $NetBSD: boot.S,v 1.4 2020/01/13 03:34:05 isaki Exp $
+| $NetBSD: boot.S,v 1.5 2020/01/16 13:37:27 isaki Exp $
#include <machine/asm.h>
#include "iocscall.h"
@@ -46,7 +46,7 @@ ASENTRY_NOPROFILE(entry0)
| Disklabel= 404bytes
| Since LABELOFFSET in <machine/disklabel.h> is 0x40,
| entry must be after 0x000001d4 (0x000f01d4)
- nop
+ .org 0x40
disklabel:
.space 404
