Module Name: src
Committed By: isaki
Date: Thu Apr 4 04:31:01 UTC 2019
Modified Files:
src/sys/arch/x68k/x68k: machdep.c
Log Message:
Remove cpuspeed info for 68060.
- On 68060, it's not accurate so worthless.
- I don't have 68040 so I leave it untouched.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 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.
Modified files:
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.199 src/sys/arch/x68k/x68k/machdep.c:1.200
--- src/sys/arch/x68k/x68k/machdep.c:1.199 Thu Apr 4 03:36:15 2019
+++ src/sys/arch/x68k/x68k/machdep.c Thu Apr 4 04:31:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.199 2019/04/04 03:36:15 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.200 2019/04/04 04:31:01 isaki Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.199 2019/04/04 03:36:15 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.200 2019/04/04 04:31:01 isaki Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -327,7 +327,7 @@ identifycpu(void)
{
/* there's alot of XXX in here... */
const char *cpu_type, *mach, *mmu, *fpu;
- char clock[16];
+ char clock[20];
char emubuf[20];
char cpubuf[16];
uint32_t pcr;
@@ -362,11 +362,10 @@ identifycpu(void)
break;
}
+ clock[0] = '\0';
emubuf[0] = '\0';
check_emulator(emubuf, sizeof(emubuf));
- cpuspeed = 2048 / delay_divisor;
- snprintf(clock, sizeof(clock), "%dMHz", cpuspeed);
switch (cputype) {
case CPU_68060:
/* from amiga */
@@ -376,22 +375,30 @@ identifycpu(void)
(pcr & 0x10000) ? "LC/EC" : "", (pcr >> 8) & 0xff);
cpu_type = cpubuf;
mmu = "/MMU";
- cpuspeed = 128 / delay_divisor;
- snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
+ /*
+ * This delay_divisor method cannot get accurate cpuspeed
+ * for 68060.
+ */
+ clock[0] = '\0';
break;
case CPU_68040:
cpu_type = "m68040";
mmu = "/MMU";
cpuspeed = 759 / delay_divisor;
- snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
+ snprintf(clock, sizeof(clock), ", %d/%dMHz clock",
+ cpuspeed*2, cpuspeed);
break;
case CPU_68030:
cpu_type = "m68030";
mmu = "/MMU";
+ cpuspeed = 2048 / delay_divisor;
+ snprintf(clock, sizeof(clock), ", %dMHz clock", cpuspeed);
break;
case CPU_68020:
cpu_type = "m68020";
mmu = ", m68851 MMU";
+ cpuspeed = 2048 / delay_divisor;
+ snprintf(clock, sizeof(clock), ", %dMHz clock", cpuspeed);
break;
default:
cpu_type = "unknown";
@@ -402,7 +409,7 @@ identifycpu(void)
fpu = fpu_descr[fputype];
else
fpu = ", unknown FPU";
- cpu_setmodel("X68%s (%s CPU%s%s, %s clock)%s%s",
+ cpu_setmodel("X68%s (%s CPU%s%s%s)%s%s",
mach, cpu_type, mmu, fpu, clock,
emubuf[0] ? " on " : "", emubuf);
printf("%s\n", cpu_getmodel());
