PERFORCE change 30011 for review

[Peter Wemm]

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

Change 30011 by peter at peter_overcee on 2003/04/28 16:40:25

	argh. forgot to submit. s/x86_64/amd64/

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#9 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#33 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#25 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#9 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#9 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#23 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#9 (text+ko) ====

@@ -74,7 +74,7 @@
 #include <nfsclient/nfsdiskless.h>
 
 #include <machine/md_var.h>
-#include <x86_64/isa/icu.h>
+#include <amd64/isa/icu.h>
 
 #ifdef DEV_ISA
 #include <isa/isavar.h>

==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#33 (text+ko) ====

@@ -283,7 +283,7 @@
  * XXX it should be in a stand-alone file.  It's still icu-dependent and
  * belongs in i386/isa.
  */
-#include "x86_64/isa/vector.s"
+#include "amd64/isa/vector.s"
 
 	.data
 	ALIGN_DATA
@@ -379,4 +379,4 @@
 	movq	$0,TF_ERR(%rsp)	/* XXX should be the error code */
 	jmp	alltraps_with_regs_pushed
 
-#include "x86_64/isa/icu_ipl.s"
+#include "amd64/isa/icu_ipl.s"

==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#25 (text+ko) ====

@@ -129,7 +129,7 @@
 
 ASSYM(PCB_SIZE, sizeof(struct pcb));
 
-ASSYM(COMMON_TSS_RSP0, offsetof(struct x86_64tss, tss_rsp0));
+ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0));
 
 ASSYM(TF_R15, offsetof(struct trapframe, tf_r15));
 ASSYM(TF_R14, offsetof(struct trapframe, tf_r14));

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

@@ -57,8 +57,8 @@
 #include <machine/specialreg.h>
 #include <machine/md_var.h>
 
-#include <x86_64/isa/icu.h>
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/intr_machdep.h>
 
 /* XXX - should be in header file: */
 void printcpuinfo(void);
@@ -72,7 +72,7 @@
 
 int	cpu_class;
 u_int	cpu_exthigh;		/* Highest arg to extended CPUID */
-char machine[] = "x86_64";
+char machine[] = "amd64";
 SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, 
     machine, 0, "Machine class");
 
@@ -86,7 +86,7 @@
 
 static char cpu_brand[48];
 
-static struct cpu_nameclass x86_64_cpus[] = {
+static struct cpu_nameclass amd64_cpus[] = {
 	{ "Clawhammer",		CPUCLASS_K8 },		/* CPU_CLAWHAMMER */
 	{ "Sledgehammer",	CPUCLASS_K8 },		/* CPU_SLEDGEHAMMER */
 };
@@ -97,9 +97,9 @@
 	u_int regs[4], i;
 	char *brand;
 
-	cpu_class = x86_64_cpus[cpu].cpu_class;
+	cpu_class = amd64_cpus[cpu].cpu_class;
 	printf("CPU: ");
-	strncpy(cpu_model, x86_64_cpus[cpu].cpu_name, sizeof (cpu_model));
+	strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model));
 
 	/* Check for extended CPUID information and a processor name. */
 	if (cpu_high > 0 &&

==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#9 (text+ko) ====

@@ -61,10 +61,10 @@
 
 #ifdef DEV_ISA
 #include <isa/isavar.h>
-#include <x86_64/isa/isa.h>
+#include <amd64/isa/isa.h>
 #endif
-#include <x86_64/isa/icu.h>
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/intr_machdep.h>
 #include <sys/rtprio.h>
 
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");

==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#23 (text+ko) ====

@@ -73,7 +73,7 @@
 
 #include <sys/user.h>
 
-#include <x86_64/isa/isa.h>
+#include <amd64/isa/isa.h>
 
 static void	cpu_reset_real(void);
 extern int	_ucodesel, _udatasel;