Re: CVS commit: src/sys/arch/news68k/conf
OK, it makes sense. I will revert the changes. Thanks for your explanations. On Sun, Oct 8, 2023 at 12:49 PM matthew green wrote: > > > I was changing news68k specific code, thus wasn't treating them as > > common. But I understand the point. > > there's a *LOT* of m68k code that is copied into all the ports > that is almost identical, and should really be shared, but it > not, and changes like can make this harder to share. > > ie, while it might appear news68k specific, ideally most of it > would end up in arch/m68k instead. > > it would really be far better for that merge, than to worry > about obscure compile options -- there's a real cost when we > have platform changes to make, and 10 m68k copies are needed > instead of 1. we've done some of this over time (for not > just m68k) but there's quite a lot of left here.. > > thanks. > > > .mrg.
re: CVS commit: src/sys/arch/news68k/conf
> I was changing news68k specific code, thus wasn't treating them as > common. But I understand the point. there's a *LOT* of m68k code that is copied into all the ports that is almost identical, and should really be shared, but it not, and changes like can make this harder to share. ie, while it might appear news68k specific, ideally most of it would end up in arch/m68k instead. it would really be far better for that merge, than to worry about obscure compile options -- there's a real cost when we have platform changes to make, and 10 m68k copies are needed instead of 1. we've done some of this over time (for not just m68k) but there's quite a lot of left here.. thanks. .mrg.
Re: CVS commit: src/sys/arch/news68k/conf
On Sun, Oct 8, 2023 at 6:56 AM Izumi Tsutsui wrote:
>
> > In this case maybe I should remove all FPSP references (vectors.S,
> > locore.S, Makefile.news68k (MD_LIBS={FPSP})?
>
> IMO we don't have to keep strict consistencies or buildabilities of
> options but rather should consider readabilities and maintainabilities.
>
> - options FPSP in a config file is not necessary for users on news68k
> (unless some users build own 040/060 upgrade mod like x68k)
Yes, that's understandable and true. However, if someone would have a
mod, he would need to understand why FPSP build fails in the first
place.
I just wanted to avoid confusion, that code has ifdef blocks, but
there's no way to build it.
> - #ifdef FPSP (and other m68k specific options) blocks in common
> sources might help to check diffs from other m68k ports
I was changing news68k specific code, thus wasn't treating them as
common. But I understand the point.
I can return FPSP block in vectors.s, if that helps with readability
and maintainability.
However, those copy pasted common files usually diverge between ports
(from what I've seen),
makes it difficult to understand what is still common and what is the
"latest" code at times (likely not in this case).
> - In the perfect world, we should have a common m68k/locore.s etc.
>and move port specific blocks into locore_machdep.s like mips,
>but m68k CPUs are too flexible and all m68k ports have too many
>historical difficulties to refactor them
I admit I went a bit impatient this time without waiting for the
proper answer. I am OK to settle with the best option in the context,
either revert everything to original state, keep partial changes or
leave current state. Sorry for this.
>
> I don't mind your changes in this case, but it's appreciated
> to ask design considerations before changes, as you did for mmeye.
>
> Thanks,
> ---
> Izumi Tsutsui
Re: CVS commit: src/sys/arch/news68k/conf
> In this case maybe I should remove all FPSP references (vectors.S,
> locore.S, Makefile.news68k (MD_LIBS={FPSP})?
IMO we don't have to keep strict consistencies or buildabilities of
options but rather should consider readabilities and maintainabilities.
- options FPSP in a config file is not necessary for users on news68k
(unless some users build own 040/060 upgrade mod like x68k)
- #ifdef FPSP (and other m68k specific options) blocks in common
sources might help to check diffs from other m68k ports
- In the perfect world, we should have a common m68k/locore.s etc.
and move port specific blocks into locore_machdep.s like mips,
but m68k CPUs are too flexible and all m68k ports have too many
historical difficulties to refactor them
I don't mind your changes in this case, but it's appreciated
to ask design considerations before changes, as you did for mmeye.
Thanks,
---
Izumi Tsutsui
Re: CVS commit: src/sys/arch/news68k/conf
In this case maybe I should remove all FPSP references (vectors.S,
locore.S, Makefile.news68k (MD_LIBS={FPSP})?
On Sun, Oct 1, 2023 at 10:08 PM Izumi Tsutsui wrote:
>
> > Module Name: src
> > Committed By: andvar
> > Date: Sun Oct 1 18:50:53 UTC 2023
> >
> > Modified Files:
> > src/sys/arch/news68k/conf: Makefile.news68k
> >
> > Log Message:
> > include fpsp Makefile.inc in Makefile.news68k, same as other m68k ports.
> >
> > needed for FPSP option to build, otherwise FPSP specific vectors are
> > undefined.
>
> FPSP is neccesary only for 68040 (and 68060) and
> there is no 040 NEWS machines. That's the reason
> why news68k doesn't include fpsp.
>
> ---
> Izumi Tsutsui
Re: CVS commit: src/sys/arch/news68k/conf
> Module Name: src > Committed By: andvar > Date: Sun Oct 1 18:50:53 UTC 2023 > > Modified Files: > src/sys/arch/news68k/conf: Makefile.news68k > > Log Message: > include fpsp Makefile.inc in Makefile.news68k, same as other m68k ports. > > needed for FPSP option to build, otherwise FPSP specific vectors are > undefined. FPSP is neccesary only for 68040 (and 68060) and there is no 040 NEWS machines. That's the reason why news68k doesn't include fpsp. --- Izumi Tsutsui
CVS commit: src/sys/arch/news68k/conf
Module Name:src
Committed By: andvar
Date: Sun Oct 1 18:50:53 UTC 2023
Modified Files:
src/sys/arch/news68k/conf: Makefile.news68k
Log Message:
include fpsp Makefile.inc in Makefile.news68k, same as other m68k ports.
needed for FPSP option to build, otherwise FPSP specific vectors are undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/news68k/conf/Makefile.news68k
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/news68k/conf/Makefile.news68k
diff -u src/sys/arch/news68k/conf/Makefile.news68k:1.22 src/sys/arch/news68k/conf/Makefile.news68k:1.23
--- src/sys/arch/news68k/conf/Makefile.news68k:1.22 Sat Sep 22 12:24:02 2018
+++ src/sys/arch/news68k/conf/Makefile.news68k Sun Oct 1 18:50:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.news68k,v 1.22 2018/09/22 12:24:02 rin Exp $
+# $NetBSD: Makefile.news68k,v 1.23 2023/10/01 18:50:53 andvar Exp $
#
# Makefile for NetBSD
#
@@ -46,6 +46,9 @@ OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
##
+# for the Motorola 68040 Floating Point Software Product
+.include "$S/arch/m68k/fpsp/Makefile.inc"
+
MD_OBJS= locore.o
MD_LIBS= ${FPSP}
MD_CFILES=
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: andvar Date: Sun Oct 1 18:50:53 UTC 2023 Modified Files: src/sys/arch/news68k/conf: Makefile.news68k Log Message: include fpsp Makefile.inc in Makefile.news68k, same as other m68k ports. needed for FPSP option to build, otherwise FPSP specific vectors are undefined. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/news68k/conf/Makefile.news68k Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: martin Date: Fri Nov 16 17:07:10 UTC 2018 Modified Files: src/sys/arch/news68k/conf: INSTALL Log Message: Bump space for ramdisk image To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/news68k/conf/INSTALL 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/news68k/conf/INSTALL diff -u src/sys/arch/news68k/conf/INSTALL:1.64 src/sys/arch/news68k/conf/INSTALL:1.65 --- src/sys/arch/news68k/conf/INSTALL:1.64 Wed Aug 1 20:04:13 2018 +++ src/sys/arch/news68k/conf/INSTALL Fri Nov 16 17:07:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.64 2018/08/01 20:04:13 maxv Exp $ +# $NetBSD: INSTALL,v 1.65 2018/11/16 17:07:10 martin Exp $ # config for bootable floppy kernel # @@ -18,7 +18,7 @@ options CPU_SINGLE # Will IOP be suppo options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=3200 # 1.60 Megabytes +options MEMORY_DISK_ROOT_SIZE=3600 # 1.80 Megabytes options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # Standard system options
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: martin Date: Fri Nov 16 17:07:10 UTC 2018 Modified Files: src/sys/arch/news68k/conf: INSTALL Log Message: Bump space for ramdisk image To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/news68k/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: tsutsui Date: Fri Jul 18 17:19:36 UTC 2014 Modified Files: src/sys/arch/news68k/conf: GENERIC Log Message: Shrink GENERIC and enable MODULAR instead. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/news68k/conf/GENERIC 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/news68k/conf/GENERIC diff -u src/sys/arch/news68k/conf/GENERIC:1.119 src/sys/arch/news68k/conf/GENERIC:1.120 --- src/sys/arch/news68k/conf/GENERIC:1.119 Sat Jul 5 09:14:02 2014 +++ src/sys/arch/news68k/conf/GENERIC Fri Jul 18 17:19:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.119 2014/07/05 09:14:02 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.120 2014/07/18 17:19:35 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/news68k/conf/std.news68k options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.119 $ +#ident GENERIC-$Revision: 1.120 $ makeoptions COPTS=-O2 -fno-reorder-blocks # see share/mk/sys.mk @@ -40,7 +40,7 @@ options SYSVMSG # System V message qu options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -#options MODULAR # new style module(7) framework +options MODULAR # new style module(7) framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) @@ -85,7 +85,7 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? # Filesystem options file-system FFS # Berkeley Fast Filesystem -file-system LFS # log-structured file system +#file-system LFS # log-structured file system file-system NFS # Sun NFS-compatible filesystem client file-system MFS # memory-based filesystem file-system CD9660 # ISO 9660 + Rock Ridge file system @@ -94,10 +94,10 @@ file-system KERNFS # /kern file-system PROCFS # /proc file-system FDESC # /dev/fd/* file-system NULLFS # loopback file system -file-system OVERLAY # overlay file system -file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) -file-system UMAPFS # NULLFS + uid and gid remapping -file-system UNION # union file system +#file-system OVERLAY # overlay file system +#file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) +#file-system UMAPFS # NULLFS + uid and gid remapping +#file-system UNION # union file system #file-system CODA # Coda File System; also needs vcode (below) file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system @@ -108,7 +108,7 @@ options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # ffs endian independent support options WAPBL # File system journaling support -#options FFS_NO_SNAPSHOT # No FFS snapshot support +options FFS_NO_SNAPSHOT # No FFS snapshot support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental # Networking options @@ -120,8 +120,8 @@ options INET6 # IPV6 #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options NETATALK # AppleTalk networking protocols -options PPP_BSDCOMP # BSD-Compress compression support for PPP -options PPP_DEFLATE # Deflate compression support for PPP +#options PPP_BSDCOMP # BSD-Compress compression support for PPP +#options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support @@ -223,8 +223,8 @@ uk* at scsibus? target ? lun ? # unknow # # accept filters -pseudo-device accf_data # dataready accept filter -pseudo-device accf_http # httpready accept filter +#pseudo-device accf_data # dataready accept filter +#pseudo-device accf_http # httpready accept filter # Misc. pseudo-device loop # loopback interface; required @@ -244,7 +244,7 @@ pseudo-device raid # RAIDframe disk dr #options RF_INCLUDE_INTERDECLUSTER=1 #options RF_INCLUDE_PARITY_DECLUSTERING=1 #options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 -pseudo-device fss # file system snapshot device +#pseudo-device fss # file system snapshot device pseudo-device sl # SLIP interfaces pseudo-device ppp # PPP interfaces pseudo-device pppoe # PPP over Ethernet (RFC 2516)
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: tsutsui Date: Fri Jul 18 17:19:36 UTC 2014 Modified Files: src/sys/arch/news68k/conf: GENERIC Log Message: Shrink GENERIC and enable MODULAR instead. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/news68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: tsutsui Date: Sat Jul 5 09:14:02 UTC 2014 Modified Files: src/sys/arch/news68k/conf: GENERIC GENERIC_TINY Log Message: Use COPTS=-O2 -fno-reorder-blocks as defined in sys.mk for userland. with -O2: textdata bss dec hex filename 3297898 65044 122584 3485526 352f56 netbsd with -O2 -fno-reorder-blocks: textdata bss dec hex filename 2930782 65044 122584 3118410 2f954a netbsd To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.79 -r1.80 src/sys/arch/news68k/conf/GENERIC_TINY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: tsutsui Date: Sat Oct 16 13:55:11 UTC 2010 Modified Files: src/sys/arch/news68k/conf: GENERIC Log Message: Add commented out options MODULAR. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/arch/news68k/conf/GENERIC 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/news68k/conf/GENERIC diff -u src/sys/arch/news68k/conf/GENERIC:1.101 src/sys/arch/news68k/conf/GENERIC:1.102 --- src/sys/arch/news68k/conf/GENERIC:1.101 Sat May 8 22:16:28 2010 +++ src/sys/arch/news68k/conf/GENERIC Sat Oct 16 13:55:11 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.101 2010/05/08 22:16:28 mrg Exp $ +# $NetBSD: GENERIC,v 1.102 2010/10/16 13:55:11 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.101 $ +#ident GENERIC-$Revision: 1.102 $ maxusers 8 @@ -38,6 +38,9 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support + +#options MODULAR # new style module framework + options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
CVS commit: src/sys/arch/news68k/conf
Module Name:src Committed By: tsutsui Date: Sat Oct 16 13:55:11 UTC 2010 Modified Files: src/sys/arch/news68k/conf: GENERIC Log Message: Add commented out options MODULAR. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/arch/news68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
