diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-09-29 19:25:29 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-09-29 19:25:29 +0000 |
| commit | 57db35bfc0b333147c86dec3a3ade4a2832e3a19 (patch) | |
| tree | b608e89d7c9eec32a54efc1e64fe487a0660831d /sys | |
| parent | be952808a7272c81becf51889615f79741f43539 (diff) | |
Sort cpu and fpu list, and don't bother printing those we don't run on (yet).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mips64/mips64/cpu.c | 78 |
1 files changed, 45 insertions, 33 deletions
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index f28d8bd5daf..e7b7e3a19c8 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.46 2012/09/29 19:24:31 miod Exp $ */ +/* $OpenBSD: cpu.c,v 1.47 2012/09/29 19:25:28 miod Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -125,21 +125,9 @@ cpuattach(struct device *parent, struct device *dev, void *aux) } fptype = MIPS_R4000; break; - case MIPS_R5000: - printf("MIPS R5000 CPU"); - break; - case MIPS_R10000: - printf("MIPS R10000 CPU"); - break; - case MIPS_R12000: - printf("MIPS R12000 CPU"); - break; - case MIPS_R14000: - if (vers_maj > 2) { - vers_maj -= 2; - isr16k = 1; - } - printf("R1%d000 CPU", isr16k ? 6 : 4); +#if 0 + case MIPS_R4100: + printf("NEC VR41xx CPU"); break; case MIPS_R4200: printf("NEC VR4200 CPU (ICE)"); @@ -147,15 +135,18 @@ cpuattach(struct device *parent, struct device *dev, void *aux) case MIPS_R4300: printf("NEC VR4300 CPU"); break; - case MIPS_R4100: - printf("NEC VR41xx CPU"); - break; +#endif case MIPS_R4600: printf("QED R4600 Orion CPU"); break; +#if 0 case MIPS_R4700: printf("QED R4700 Orion CPU"); break; +#endif + case MIPS_R5000: + printf("MIPS R5000 CPU"); + break; case MIPS_RM52X0: printf("PMC-Sierra RM52X0 CPU"); break; @@ -169,6 +160,19 @@ cpuattach(struct device *parent, struct device *dev, void *aux) case MIPS_RM9000: printf("PMC-Sierra RM9000 CPU"); break; + case MIPS_R10000: + printf("MIPS R10000 CPU"); + break; + case MIPS_R12000: + printf("MIPS R12000 CPU"); + break; + case MIPS_R14000: + if (vers_maj > 2) { + vers_maj -= 2; + isr16k = 1; + } + printf("R1%d000 CPU", isr16k ? 6 : 4); + break; case MIPS_LOONGSON2: switch (ch->c0prid & 0xff) { case 0x00: @@ -203,35 +207,29 @@ cpuattach(struct device *parent, struct device *dev, void *aux) vers_min = ch->c1prid & 0x0f; switch (fptype) { case MIPS_SOFT: +#ifdef FPUEMUL printf("Software FP emulation"); +#else + printf("no FPU"); +#endif displayver = 0; break; case MIPS_R4000: printf("R4010 FPC"); break; - case MIPS_R10000: - printf("R10000 FPU"); - break; - case MIPS_R12000: - printf("R12000 FPU"); - break; - case MIPS_R14000: - if (isr16k) { - if (ch->c0prid == ch->c1prid) - vers_maj -= 2; - printf("R16000 FPU"); - } else - printf("R14000 FPU"); - break; +#if 0 case MIPS_R4200: printf("VR4200 FPC (ICE)"); break; +#endif case MIPS_R4600: printf("R4600 Orion FPC"); break; +#if 0 case MIPS_R4700: printf("R4700 Orion FPC"); break; +#endif case MIPS_R5000: printf("R5000 based FPC"); break; @@ -244,6 +242,20 @@ cpuattach(struct device *parent, struct device *dev, void *aux) case MIPS_RM9000: printf("RM9000 FPC"); break; + case MIPS_R10000: + printf("R10000 FPU"); + break; + case MIPS_R12000: + printf("R12000 FPU"); + break; + case MIPS_R14000: + if (isr16k) { + if (ch->c0prid == ch->c1prid) + vers_maj -= 2; + printf("R16000 FPU"); + } else + printf("R14000 FPU"); + break; case MIPS_LOONGSON2: printf("STC Loongson2%c FPU", 'C' + vers_min); displayver = 0; |