From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:40:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40BC737B404; Mon, 28 Apr 2003 16:40:53 -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 E5FB137B401 for ; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033B43FBF for ; Mon, 28 Apr 2003 16:40:52 -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 h3SNeq0U001071 for ; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNepPZ001058 for perforce@freebsd.org; Mon, 28 Apr 2003 16:40:51 -0700 (PDT) Date: Mon, 28 Apr 2003 16:40:51 -0700 (PDT) Message-Id: <200304282340.h3SNepPZ001058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2003 23:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30011 Change 30011 by peter@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 #include -#include +#include #ifdef DEV_ISA #include ==== //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 #include -#include -#include +#include +#include /* 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 -#include +#include #endif -#include -#include +#include +#include #include 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 -#include +#include static void cpu_reset_real(void); extern int _ucodesel, _udatasel;