CVS commit: src/sys/arch

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    src
Committed By:   thorpej
Date:           Thu Apr 23 02:54:41 UTC 2026

Modified Files:
        src/sys/arch/amiga/amiga: machdep.c
        src/sys/arch/atari/atari: machdep.c
        src/sys/arch/atari/conf: files.atari
        src/sys/arch/cesfic/cesfic: machdep.c
        src/sys/arch/hp300/dev: hpib.c
        src/sys/arch/hp300/hp300: clock.c machdep.c
        src/sys/arch/hp300/include: hp300spu.h
        src/sys/arch/luna68k/luna68k: machdep.c
        src/sys/arch/m68k/include: m68k.h types.h
        src/sys/arch/m68k/m68k: m68k_machdep.c
        src/sys/arch/mac68k/conf: files.mac68k
        src/sys/arch/mac68k/mac68k: machdep.c
        src/sys/arch/mvme68k/include: cpu.h types.h
        src/sys/arch/mvme68k/mvme68k: machdep.c
        src/sys/arch/news68k/include: cpu.h types.h
        src/sys/arch/news68k/news68k: machdep.c
        src/sys/arch/next68k/next68k: machdep.c
        src/sys/arch/sun2/sun2: locore2.c machdep.c
        src/sys/arch/sun3/conf: files.sun3
        src/sys/arch/sun3/sun3: locore2.c machdep.c
        src/sys/arch/sun3/sun3x: machdep.c
        src/sys/arch/sun68k/conf: files.sun68k
        src/sys/arch/sun68k/include: cpu.h types.h
        src/sys/arch/virt68k/virt68k: machdep.c
        src/sys/arch/x68k/x68k: machdep.c
Added Files:
        src/sys/arch/sun68k/sun68k: sun68k_machdep.c
Removed Files:
        src/sys/arch/atari/atari: fpu_machdep.c
        src/sys/arch/mac68k/mac68k: fpu_machdep.c
        src/sys/arch/sun3/sun3: fpu_machdep.c

Log Message:
Re-factor the various m68k platforms' identifycpu() functions, and bring
some consistency to how the CPU/FPU/MMU/cache information is displayed.
Each platform now provides a machine_set_model() function that is called
from cpu_startup_common().  This function is respondible for calling
cpu_setmodel() with platform-specific model description.  Then, common code
is responsible for printing the model information, along with the CPU
and cache info, but separately (and this is no longer included in the
hw.model sysctl node; at least it's now consistent!)

Some examples:

  Qemu 10.1.2 Virt platform
  MC68040+MMU+FPU, 4k+4k on-chip I/D caches

(hw.model == "Qemu 10.1.2 Virt platform")

  Motorola MVME-147
  MC68030 CPU+MMU @ 25MHz, MC68882 FPU

(hw.model == "Motorola MVME-147")

  HP 9000/350
  MC68020 CPU @ 25MHz, HP MMU, MC68881 FPU @ 20MHz
  External 32K virtual-address cache

(hw.model == "HP 9000/350")

  HP 9000/433s
  MC68040 CPU+MMU+FPU @ 33MHz, 4K+4K on-chip I/D caches

(hw.model == "HP 9000/433s")

A hook is provided for customized model banners:

  Model: sun2 {120,170}
  MC68010 CPU @ 10MHz, Sun MMU

(hw.model == "sun2 {120,170}")

  Model: sun3 160
  MC68020 CPU @ 16.67MHz, Sun MMU, MC68881 FPU

(hw.model == "sun3 160")

  Model: sun3 50
  MC68020 CPU @ 16MHz, Sun MMU, emulated FPU

(hw.model == "sun3 50")

An additional hook is provided for more complicated model banners:

  SONY NET WORK STATION, Model NWS-1710, Machine ID #123456
  MC68030 CPU+MMU @ 25MHz, MC68882 FPU

(hw.model == "NWS-1710")

The Sun banners are likely to change once a different way to get the
"kernel_arch" is provided for the installer miniroot script, in which
case they will match more closely what the firmware prints at start-up.

Prep work for adopting the generic banner() routine is included here;
that change will come in a future commit.


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/atari/atari/fpu_machdep.c
cvs rdiff -u -r1.204 -r1.205 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/atari/conf/files.atari
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp300/dev/hpib.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/hp300/clock.c
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/include/hp300spu.h
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/include/m68k.h \
    src/sys/arch/m68k/include/types.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/m68k/m68k/m68k_machdep.c
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/mac68k/conf/files.mac68k
cvs rdiff -u -r1.2 -r0 src/sys/arch/mac68k/mac68k/fpu_machdep.c
cvs rdiff -u -r1.384 -r1.385 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/include/types.h
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/news68k/include/types.h
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun2/sun2/locore2.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sun3/conf/files.sun3
cvs rdiff -u -r1.4 -r0 src/sys/arch/sun3/sun3/fpu_machdep.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sun3/sun3/locore2.c
cvs rdiff -u -r1.224 -r1.225 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sun68k/conf/files.sun68k
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sun68k/include/cpu.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sun68k/include/types.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/sun68k/sun68k/sun68k_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/virt68k/virt68k/machdep.c
cvs rdiff -u -r1.228 -r1.229 src/sys/arch/x68k/x68k/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.