From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 22:37:15 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D8DB37B404; Tue,  8 Apr 2003 22:37:15 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 12BE937B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 22:37:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B32C243F3F
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 22:37:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h395bE0U045170
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 22:37:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h395bEZV045167
	for perforce@freebsd.org; Tue, 8 Apr 2003 22:37:14 -0700 (PDT)
Date: Tue, 8 Apr 2003 22:37:14 -0700 (PDT)
Message-Id: <200304090537.h395bEZV045167@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28616 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Apr 2003 05:37:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=28616

Change 28616 by peter@peter_daintree on 2003/04/08 22:36:45

	move identify_cpu from locore to here.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#4 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#4 (text+ko) ====

@@ -62,7 +62,7 @@
 
 /* XXX - should be in header file: */
 void printcpuinfo(void);
-void finishidentcpu(void);
+void identify_cpu(void);
 void earlysetcpuclass(void);
 void panicifcpuunsupported(void);
 
@@ -280,8 +280,21 @@
  * Final stage of CPU identification. -- Should I check TI?
  */
 void
-finishidentcpu(void)
+identify_cpu(void)
 {
+	u_int regs[4];
+
+	do_cpuid(0, regs);
+	cpu_high = regs[0];
+	((u_int *)&cpu_vendor)[0] = regs[1];
+	((u_int *)&cpu_vendor)[1] = regs[2];
+	((u_int *)&cpu_vendor)[2] = regs[3];
+	cpu_vendor[12] = '\0';
+
+	do_cpuid(1, regs);
+	cpu_id = regs[0];
+	cpu_procinfo = regs[1];
+	cpu_feature = regs[3];
 }
 
 static void