diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-28 19:37:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-02-28 19:37:56 +0000 |
| commit | a945a0af7a7afb2ac4c4e19de32112844f18fa00 (patch) | |
| tree | 30bc3f595f7aa24e73930c386a7298f64b1bdd40 /sys | |
| parent | b80939a6a54508c70db18e11b4bfaf93a3c3b735 (diff) | |
do not bother printing 5 lines of cpu information which is always, on
every machine, exactly the same. only print the most interesting bits
ok miod, tested martin
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sh/sh/cache.c | 25 | ||||
| -rw-r--r-- | sys/arch/sh/sh/mmu.c | 6 |
2 files changed, 17 insertions, 14 deletions
diff --git a/sys/arch/sh/sh/cache.c b/sys/arch/sh/sh/cache.c index 53939b37376..003b045e46d 100644 --- a/sys/arch/sh/sh/cache.c +++ b/sys/arch/sh/sh/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.1 2006/10/06 21:02:55 miod Exp $ */ +/* $OpenBSD: cache.c,v 1.2 2007/02/28 19:37:55 deraadt Exp $ */ /* $NetBSD: cache.c,v 1.11 2006/01/02 23:37:34 uwe Exp $ */ /*- @@ -102,44 +102,45 @@ sh_cache_information() printf("cpu0: %dKB/%dB", sh_cache_size_icache >> 10, sh_cache_line_size); if (sh_cache_ways > 1) - printf(" %d-way set-associative", sh_cache_ways); + printf(" %d-way associative", sh_cache_ways); else - printf(" direct-mapped"); + printf(" direct"); if (sh_cache_unified) - printf(" I/D-unified"); + printf(" I/D-"); else - printf(" Instruction"); - printf(" cache."); + printf(" I-"); + printf("cache"); if (!sh_cache_enable_icache) printf(" DISABLED"); if (sh_cache_unified && sh_cache_ram_mode) printf(" RAM-mode"); if (sh_cache_index_mode_icache) printf(" INDEX-mode"); - printf("\n"); /* D-cache */ if (!sh_cache_unified) { - printf("cpu0: %dKB/%dB", sh_cache_size_dcache >> 10, + printf(", %dKB/%dB", sh_cache_size_dcache >> 10, sh_cache_line_size); if (sh_cache_ways > 1) - printf(" %d-way set-associative", sh_cache_ways); + printf(" %d-way associative", sh_cache_ways); else - printf(" direct-mapped"); - printf(" Data cache."); + printf(" direct"); + printf(" D-cache"); if (!sh_cache_enable_dcache) printf(" DISABLED"); if (sh_cache_ram_mode) printf(" RAM-mode"); if (sh_cache_index_mode_dcache) printf(" INDEX-mode"); - printf("\n"); } + printf("\n"); +#ifdef CACHE_DEBUG /* Write-through/back */ printf("cpu0: P0, U0, P3 write-%s; P1 write-%s\n", sh_cache_write_through_p0_u0_p3 ? "through" : "back", sh_cache_write_through_p1 ? "through" : "back"); +#endif } /* diff --git a/sys/arch/sh/sh/mmu.c b/sys/arch/sh/sh/mmu.c index cd093d9b73c..caed7c25906 100644 --- a/sys/arch/sh/sh/mmu.c +++ b/sys/arch/sh/sh/mmu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mmu.c,v 1.1 2006/10/06 21:02:55 miod Exp $ */ +/* $OpenBSD: mmu.c,v 1.2 2007/02/28 19:37:55 deraadt Exp $ */ /* $NetBSD: mmu.c,v 1.15 2006/02/12 02:30:55 uwe Exp $ */ /*- @@ -80,6 +80,7 @@ sh_mmu_init(void) void sh_mmu_information(void) { +#ifdef DEBUG uint32_t r; #ifdef SH3 if (CPU_IS_SH3) { @@ -92,7 +93,7 @@ sh_mmu_information(void) #endif #ifdef SH4 if (CPU_IS_SH4) { - printf("cpu0: full-associative 4 ITLB, 64 UTLB entries\n"); + printf("cpu0: fully-associative 4 ITLB, 64 UTLB entries\n"); r = _reg_read_4(SH4_MMUCR); printf("cpu0: %s virtual storage mode, SQ access: kernel%s, ", r & SH3_MMUCR_SV ? "single" : "multiple", @@ -101,6 +102,7 @@ sh_mmu_information(void) (r & SH4_MMUCR_URB_MASK) >> SH4_MMUCR_URB_SHIFT); } #endif +#endif /* DEBUG */ } void |