Module Name: src
Committed By: tsutsui
Date: Sat Jul 2 08:35:50 UTC 2022
Modified Files:
src/sys/arch/atari/atari: fpu_machdep.c machdep.c
Log Message:
Use and print consistent CPU/MMU/FPU names.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/atari/atari/fpu_machdep.c
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/atari/atari/machdep.c
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/atari/atari/fpu_machdep.c
diff -u src/sys/arch/atari/atari/fpu_machdep.c:1.1 src/sys/arch/atari/atari/fpu_machdep.c:1.2
--- src/sys/arch/atari/atari/fpu_machdep.c:1.1 Tue Nov 15 12:23:21 2011
+++ src/sys/arch/atari/atari/fpu_machdep.c Sat Jul 2 08:35:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_machdep.c,v 1.1 2011/11/15 12:23:21 tsutsui Exp $ */
+/* $NetBSD: fpu_machdep.c,v 1.2 2022/07/02 08:35:49 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.1 2011/11/15 12:23:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.2 2022/07/02 08:35:49 tsutsui Exp $");
#include "opt_fpu_emulate.h"
@@ -57,8 +57,8 @@ static const char *fpu_descr[] = {
#else
[FPU_NONE] = " no ",
#endif
- [FPU_68881] = " mc68881 ",
- [FPU_68882] = " mc68882 ",
+ [FPU_68881] = " MC68881 ",
+ [FPU_68882] = " MC68882 ",
[FPU_68040] = "/",
[FPU_68060] = "/",
[FPU_UNKNOWN] = "??? "
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.186 src/sys/arch/atari/atari/machdep.c:1.187
--- src/sys/arch/atari/atari/machdep.c:1.186 Sun Mar 13 17:50:55 2022
+++ src/sys/arch/atari/atari/machdep.c Sat Jul 2 08:35:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.186 2022/03/13 17:50:55 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.187 2022/07/02 08:35:49 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 2022/03/13 17:50:55 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 2022/07/02 08:35:49 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -256,22 +256,22 @@ identifycpu(void)
case CPU_68060:
__asm(".word 0x4e7a,0x0808;"
"movl %%d0,%0" : "=d"(pcr) : : "d0");
- snprintf(cputxt, sizeof(cputxt), "68%s060 rev.%d",
+ snprintf(cputxt, sizeof(cputxt), "MC68%s060 rev.%d",
pcr & 0x10000 ? "LC/EC" : "", (pcr >> 8) & 0xff);
cpu = cputxt;
mmu = "/MMU";
break;
case CPU_68040:
- cpu = "m68040";
+ cpu = "MC68040";
mmu = "/MMU";
break;
case CPU_68030:
- cpu = "m68030";
+ cpu = "MC68030";
mmu = "/MMU";
break;
default: /* XXX */
- cpu = "m68020";
- mmu = " m68851 MMU";
+ cpu = "MC68020";
+ mmu = " MC68851 MMU";
}
cpu_setmodel("%s (%s CPU%s%sFPU)", mach, cpu, mmu, fpu);
printf("%s\n", cpu_getmodel());
