Attachment 5149 Details for Bug 12512 – file.diff

[patch] file.diff

file.diff (text/plain), 2.18 KB, created by Louis Mamakos on 1999-07-04 22:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Louis Mamakos

Created: 1999-07-04 22:10:00 UTC

Size: 2.18 KB

patch

obsolete

>Index: sys/i386/i386/identcpu.c
>===================================================================
>RCS file: /usr/local/FreeBSD/cvs/src/sys/i386/i386/identcpu.c,v
>retrieving revision 1.65
>diff -u -r1.65 identcpu.c
>--- identcpu.c	1999/06/24 20:08:56	1.65
>+++ identcpu.c	1999/07/04 20:51:54
>@@ -295,6 +295,9 @@
> 		case 0x580:
> 			strcat(cpu_model, "K6-2");
> 			break;
>+		case 0x590:
>+			strcat(cpu_model, "K6-III");
>+			break;
> 		default:
> 			strcat(cpu_model, "Unknown");
> 			break;
>@@ -866,11 +869,52 @@
> static void
> print_AMD_info(void)
> {
>-	u_int regs[4];
>+	u_int regs[4], amd_maxregs;
> 	quad_t amd_whcr;
> 
> 	do_cpuid(0x80000000, regs);
>-	if (regs[0] >= 0x80000005) {
>+	amd_maxregs = regs[0];
>+
>+	if (amd_maxregs >= 0x80000001) {
>+		do_cpuid(0x80000001, regs);
>+		printf("AMD Extended Features=0x%b\n", regs[3],
>+		       "\020"		/* in hex */
>+		       "\001FPU"
>+		       "\002VME"
>+		       "\003DE"
>+		       "\004PSE"
>+		       "\005TSC"
>+		       "\006K6MSR"
>+		       "\007b6"
>+		       "\010MCE"
>+		       "\011CX8"
>+		       "\012b9"
>+		       "\013b10"
>+		       "\014SYSCALL"
>+		       "\015b12"
>+		       "\016PGE"
>+		       "\017b14"
>+		       "\020ICMOV"
>+		       "\021FCMOV"
>+		       "\022b17"
>+		       "\023b18"
>+		       "\024b19"
>+		       "\025b20"
>+		       "\026b21"
>+		       "\027b22"
>+		       "\030MMX"
>+		       "\031b24"
>+		       "\032b25"
>+		       "\033b26"
>+		       "\034b27"
>+		       "\035b28"
>+		       "\036b29"
>+		       "\037b30"
>+		       "\0403DNow!"
>+		       );
>+	}
>+
>+	if (amd_maxregs >= 0x80000005) {
> 		do_cpuid(0x80000005, regs);
> 		printf("Data TLB: %d entries", (regs[1] >> 16) & 0xff);
> 		print_AMD_assoc(regs[1] >> 24);
>@@ -884,6 +928,15 @@
> 		printf(", %d bytes/line", regs[3] & 0xff);
> 		printf(", %d lines/tag", (regs[3] >> 8) & 0xff);
> 		print_AMD_assoc((regs[3] >> 16) & 0xff);
>+
>+		/* check for K6-III on-board L2 cache */
>+		if (amd_maxregs >= 0x80000006) {
>+			do_cpuid(0x80000006, regs);
>+			printf("L2 (on-CPU) cache: %d kbytes", regs[2] >> 16);
>+			printf(", %d bytes/line", regs[2] & 0xff);
>+			printf(", %d lines/tag", (regs[2] >> 8) & 0x0f);
>+			print_AMD_assoc((regs[2] >> 12) & 0x0f);
>+		}
> 	}
> 	if (((cpu_id & 0xf00) == 0x500)
> 	    && (((cpu_id & 0x0f0) > 0x80)

Actions: View | Diff

Attachments on bug 12512: 5149