Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86_64 Rename the x86_64 port to amd64, as this is ...



details:   https://anonhg.NetBSD.org/src/rev/39684980ed91
branches:  trunk
changeset: 546347:39684980ed91
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sat Apr 26 18:40:00 2003 +0000

description:
Rename the x86_64 port to amd64, as this is the actual name used for
the processor family now. x86_64 is kept as the MACHINE_ARCH value,
since it's already widely used (by e.g. the toolchain, etc), and
by other operating systems.

diffstat:

 sys/arch/x86_64/include/cpuvar.h           |     3 -
 sys/arch/x86_64/include/db_machdep.h       |   139 -
 sys/arch/x86_64/include/disklabel.h        |    62 -
 sys/arch/x86_64/include/elf_machdep.h      |    37 -
 sys/arch/x86_64/include/endian.h           |     3 -
 sys/arch/x86_64/include/endian_machdep.h   |    14 -
 sys/arch/x86_64/include/float.h            |     3 -
 sys/arch/x86_64/include/fpu.h              |   103 -
 sys/arch/x86_64/include/frame.h            |   181 -
 sys/arch/x86_64/include/frameasm.h         |    94 -
 sys/arch/x86_64/include/gdt.h              |    61 -
 sys/arch/x86_64/include/i82093reg.h        |     6 -
 sys/arch/x86_64/include/i82093var.h        |     3 -
 sys/arch/x86_64/include/i82489reg.h        |     3 -
 sys/arch/x86_64/include/i82489var.h        |     3 -
 sys/arch/x86_64/include/i8259.h            |     3 -
 sys/arch/x86_64/include/ieee.h             |     3 -
 sys/arch/x86_64/include/ieeefp.h           |     3 -
 sys/arch/x86_64/include/int_const.h        |    63 -
 sys/arch/x86_64/include/int_fmtio.h        |   219 -
 sys/arch/x86_64/include/int_limits.h       |   144 -
 sys/arch/x86_64/include/int_mwgwtypes.h    |    72 -
 sys/arch/x86_64/include/int_types.h        |    63 -
 sys/arch/x86_64/include/intr.h             |     3 -
 sys/arch/x86_64/include/intrdefs.h         |     3 -
 sys/arch/x86_64/include/isa_machdep.h      |     3 -
 sys/arch/x86_64/include/kcore.h            |    49 -
 sys/arch/x86_64/include/limits.h           |    97 -
 sys/arch/x86_64/include/loadfile_machdep.h |    81 -
 sys/arch/x86_64/include/lock.h             |     3 -
 sys/arch/x86_64/include/math.h             |     3 -
 sys/arch/x86_64/include/mcontext.h         |   107 -
 sys/arch/x86_64/include/mpbiosreg.h        |     3 -
 sys/arch/x86_64/include/mpbiosvar.h        |     3 -
 sys/arch/x86_64/include/mpconfig.h         |     3 -
 sys/arch/x86_64/include/mtrr.h             |     3 -
 sys/arch/x86_64/include/netbsd32_machdep.h |   127 -
 sys/arch/x86_64/include/param.h            |   152 -
 sys/arch/x86_64/include/pcb.h              |   130 -
 sys/arch/x86_64/include/pci_machdep.h      |     3 -
 sys/arch/x86_64/include/pic.h              |     3 -
 sys/arch/x86_64/include/pio.h              |     3 -
 sys/arch/x86_64/include/pmap.h             |   597 ----
 sys/arch/x86_64/include/pmc.h              |    43 -
 sys/arch/x86_64/include/proc.h             |    66 -
 sys/arch/x86_64/include/profile.h          |    65 -
 sys/arch/x86_64/include/psl.h              |     3 -
 sys/arch/x86_64/include/pte.h              |   135 -
 sys/arch/x86_64/include/ptrace.h           |    40 -
 sys/arch/x86_64/include/reg.h              |   100 -
 sys/arch/x86_64/include/segments.h         |   304 --
 sys/arch/x86_64/include/setjmp.h           |    20 -
 sys/arch/x86_64/include/signal.h           |    89 -
 sys/arch/x86_64/include/specialreg.h       |    22 -
 sys/arch/x86_64/include/stdarg.h           |    65 -
 sys/arch/x86_64/include/sysarch.h          |   119 -
 sys/arch/x86_64/include/trap.h             |     3 -
 sys/arch/x86_64/include/tss.h              |    61 -
 sys/arch/x86_64/include/types.h            |    73 -
 sys/arch/x86_64/include/userret.h          |   103 -
 sys/arch/x86_64/include/varargs.h          |    56 -
 sys/arch/x86_64/include/vmparam.h          |   138 -
 sys/arch/x86_64/isa/clock.c                |   894 ------
 sys/arch/x86_64/pci/aapic.c                |    71 -
 sys/arch/x86_64/pci/amd8131reg.h           |    12 -
 sys/arch/x86_64/pci/pchb.c                 |   136 -
 sys/arch/x86_64/pci/pchbvar.h              |    60 -
 sys/arch/x86_64/pci/pcib.c                 |   220 -
 sys/arch/x86_64/pci/pciide_machdep.c       |    72 -
 sys/arch/x86_64/x86_64/autoconf.c          |   495 ---
 sys/arch/x86_64/x86_64/bios32.c            |   177 -
 sys/arch/x86_64/x86_64/copy.S              |   438 ---
 sys/arch/x86_64/x86_64/cpu.c               |   699 -----
 sys/arch/x86_64/x86_64/db_disasm.c         |    58 -
 sys/arch/x86_64/x86_64/db_interface.c      |   307 --
 sys/arch/x86_64/x86_64/db_memrw.c          |   215 -
 sys/arch/x86_64/x86_64/db_trace.c          |   405 --
 sys/arch/x86_64/x86_64/disksubr.c          |   519 ---
 sys/arch/x86_64/x86_64/fpu.c               |   300 --
 sys/arch/x86_64/x86_64/gdt.c               |   373 --
 sys/arch/x86_64/x86_64/genassym.cf         |   243 -
 sys/arch/x86_64/x86_64/identcpu.c          |   105 -
 sys/arch/x86_64/x86_64/ipifuncs.c          |   126 -
 sys/arch/x86_64/x86_64/locore.S            |  1321 ---------
 sys/arch/x86_64/x86_64/machdep.c           |  1885 -------------
 sys/arch/x86_64/x86_64/mainbus.c           |   193 -
 sys/arch/x86_64/x86_64/mem.c               |   192 -
 sys/arch/x86_64/x86_64/microtime.S         |   110 -
 sys/arch/x86_64/x86_64/mptramp.S           |   225 -
 sys/arch/x86_64/x86_64/netbsd32_machdep.c  |   529 ---
 sys/arch/x86_64/x86_64/netbsd32_sigcode.S  |    26 -
 sys/arch/x86_64/x86_64/netbsd32_syscall.c  |   283 --
 sys/arch/x86_64/x86_64/pmap.c              |  3835 ----------------------------
 sys/arch/x86_64/x86_64/process_machdep.c   |   205 -
 sys/arch/x86_64/x86_64/procfs_machdep.c    |    20 -
 sys/arch/x86_64/x86_64/spl.S               |   188 -
 sys/arch/x86_64/x86_64/sys_machdep.c       |   482 ---
 sys/arch/x86_64/x86_64/syscall.c           |   327 --
 sys/arch/x86_64/x86_64/trap.c              |   594 ----
 sys/arch/x86_64/x86_64/vector.S            |   709 -----
 sys/arch/x86_64/x86_64/vm_machdep.c        |   435 ---
 101 files changed, 0 insertions(+), 21650 deletions(-)

diffs (truncated from 22054 to 300 lines):

diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/cpuvar.h
--- a/sys/arch/x86_64/include/cpuvar.h  Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: cpuvar.h,v 1.1 2003/03/05 23:56:01 fvdl Exp $ */
-
-#include <x86/cpuvar.h>
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/db_machdep.h
--- a/sys/arch/x86_64/include/db_machdep.h      Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*     $NetBSD: db_machdep.h,v 1.1 2002/11/29 22:17:14 fvdl Exp $      */
-
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef        _I386_DB_MACHDEP_H_
-#define        _I386_DB_MACHDEP_H_
-
-/*
- * Machine-dependent defines for new kernel debugger.
- */
-
-#include <sys/param.h>
-#include <uvm/uvm_extern.h>
-#include <machine/trap.h>
-
-typedef        vaddr_t         db_addr_t;      /* address - unsigned */
-typedef        long            db_expr_t;      /* expression - signed */
-
-typedef struct trapframe db_regs_t;
-#ifndef MULTIPROCESSOR
-extern db_regs_t ddb_regs;     /* register state */
-#define        DDB_REGS        (&ddb_regs)
-#else
-extern db_regs_t *ddb_regp;
-#define DDB_REGS       (ddb_regp)
-#define ddb_regs       (*ddb_regp)
-#endif
-
-#if defined(lint)
-#define        PC_REGS(regs)   ((regs)->tf_rip)
-#else
-#define        PC_REGS(regs)   ((db_addr_t)(regs)->tf_rip)
-#endif
-
-#define        BKPT_INST       0xcc            /* breakpoint instruction */
-#define        BKPT_SIZE       (1)             /* size of breakpoint inst */
-#define        BKPT_SET(inst)  (BKPT_INST)
-
-#define        FIXUP_PC_AFTER_BREAK(regs)      ((regs)->tf_rip -= BKPT_SIZE)
-
-#define        db_clear_single_step(regs)      ((regs)->tf_rflags &= ~PSL_T)
-#define        db_set_single_step(regs)        ((regs)->tf_rflags |=  PSL_T)
-
-#define        IS_BREAKPOINT_TRAP(type, code)  ((type) == T_BPTFLT)
-#define IS_WATCHPOINT_TRAP(type, code) ((type) == T_TRCTRAP && (code) & 15)
-
-#define        I_CALL          0xe8
-#define        I_CALLI         0xff
-#define        I_RET           0xc3
-#define        I_IRET          0xcf
-
-#define        inst_trap_return(ins)   (((ins)&0xff) == I_IRET)
-#define        inst_return(ins)        (((ins)&0xff) == I_RET)
-#define        inst_call(ins)          (((ins)&0xff) == I_CALL || \
-                                (((ins)&0xff) == I_CALLI && \
-                                 ((ins)&0x3800) == 0x1000))
-#define inst_load(ins)         0
-#define inst_store(ins)                0
-
-/* access capability and access macros */
-
-#define DB_ACCESS_LEVEL                2       /* access any space */
-#define DB_CHECK_ACCESS(addr,size,task)                                \
-       db_check_access(addr,size,task)
-#define DB_PHYS_EQ(task1,addr1,task2,addr2)                    \
-       db_phys_eq(task1,addr1,task2,addr2)
-#define DB_VALID_KERN_ADDR(addr)                               \
-       ((addr) >= VM_MIN_KERNEL_ADDRESS &&                     \
-        (addr) < VM_MAX_KERNEL_ADDRESS)
-#define DB_VALID_ADDRESS(addr,user)                            \
-       ((!(user) && DB_VALID_KERN_ADDR(addr)) ||               \
-        ((user) && (addr) < VM_MAX_ADDRESS))
-
-#if 0
-boolean_t      db_check_access __P((vaddr_t, int, task_t));
-boolean_t      db_phys_eq __P((task_t, vaddr_t, task_t, vaddr_t));
-#endif
-
-/* macros for printing OS server dependent task name */
-
-#define DB_TASK_NAME(task)     db_task_name(task)
-#define DB_TASK_NAME_TITLE     "COMMAND                "
-#define DB_TASK_NAME_LEN       23
-#define DB_NULL_TASK_NAME      "?                      "
-
-/*
- * Constants for KGDB.
- */
-typedef        long            kgdb_reg_t;
-#define        KGDB_NUMREGS    16
-#define        KGDB_BUFLEN     512
-
-#if 0
-void           db_task_name(/* task_t */);
-#endif
-
-/* macro for checking if a thread has used floating-point */
-
-#define db_thread_fp_used(thread)      ((thread)->pcb->ims.ifps != 0)
-
-int kdb_trap __P((int, int, db_regs_t *));
-
-/*
- * We define some of our own commands
- */
-#define DB_MACHINE_COMMANDS
-
-#define        DB_ELF_SYMBOLS
-#define        DB_ELFSIZE      64
-
-extern void db_machine_init __P((void));
-
-extern void cpu_debug_dump __P((void));
-
-#endif /* _I386_DB_MACHDEP_H_ */
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/disklabel.h
--- a/sys/arch/x86_64/include/disklabel.h       Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*     $NetBSD: disklabel.h,v 1.1 2001/06/19 00:20:10 fvdl Exp $       */
-
-/*
- * Copyright (c) 1994 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
-
-#define        LABELSECTOR             1       /* sector containing label */
-#define        LABELOFFSET             0       /* offset of label in sector */
-#define        MAXPARTITIONS           16      /* number of partitions */
-#define        RAW_PART                3       /* raw partition: XX?d (XXX) */
-
-/*
- * We use the highest bit of the minor number for the partition number.
- * This maintains backward compatibility with device nodes created before
- * MAXPARTITIONS was increased.
- */
-/* Pull in MBR partition definitions. */
-#include <sys/disklabel_mbr.h>
-
-#ifndef __ASSEMBLER__
-#include <sys/dkbad.h>
-struct cpu_disklabel {
-       struct mbr_partition dosparts[NMBRPART];
-       struct dkbad bad;
-};
-#endif
-
-#ifdef _KERNEL
-struct disklabel;
-int    bounds_check_with_label __P((struct buf *, struct disklabel *, int));
-#endif
-
-#endif /* _MACHINE_DISKLABEL_H_ */
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/elf_machdep.h
--- a/sys/arch/x86_64/include/elf_machdep.h     Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*     $NetBSD: elf_machdep.h,v 1.4 2001/12/28 06:35:19 thorpej Exp $  */
-
-#define        ELF32_MACHDEP_ENDIANNESS        ELFDATA2LSB
-#define        ELF32_MACHDEP_ID_CASES                                          \
-               case EM_386:                                            \
-                       break;
-
-#define        ELF64_MACHDEP_ENDIANNESS        ELFDATA2LSB
-#define        ELF64_MACHDEP_ID_CASES                                          \
-               case EM_X86_64:                                         \
-                       break;
-
-#define        ELF32_MACHDEP_ID        EM_386
-#define        ELF64_MACHDEP_ID        EM_X86_64
-
-#define ARCH_ELFSIZE           64      /* MD native binary size */
-
-/* x86-64 relocations */
-
-#define R_X86_64_NONE          0
-#define R_X86_64_64            1
-#define R_X86_64_PC32          2
-#define R_X86_64_GOT32         3
-#define R_X86_64_PLT32         4
-#define R_X86_64_COPY          5
-#define R_X86_64_GLOB_DAT      6
-#define R_X86_64_JUMP_SLOT     7
-#define R_X86_64_RELATIVE      8
-#define R_X86_64_GOTPCREL      9
-#define R_X86_64_32            10
-#define R_X86_64_32S           11
-#define R_X86_64_16            12
-#define R_X86_64_PC16          13
-#define R_X86_64_8             14
-#define R_X86_64_PC8           15
-
-#define        R_TYPE(name)    __CONCAT(R_X86_64_,name)
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/endian.h
--- a/sys/arch/x86_64/include/endian.h  Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: endian.h,v 1.1 2001/06/19 00:20:10 fvdl Exp $  */
-
-#include <sys/endian.h>
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/endian_machdep.h
--- a/sys/arch/x86_64/include/endian_machdep.h  Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-/*     $NetBSD: endian_machdep.h,v 1.1 2001/06/19 00:20:10 fvdl Exp $  */
-
-#define _BYTE_ORDER _LITTLE_ENDIAN
-
-#ifdef __GNUC__
-
-#include <machine/byte_swap.h>
-
-#define        ntohl(x)        ((in_addr_t)__byte_swap_long((in_addr_t)(x)))
-#define        ntohs(x)        ((in_port_t)__byte_swap_word((in_port_t)(x)))
-#define        htonl(x)        ((in_addr_t)__byte_swap_long((in_addr_t)(x)))
-#define        htons(x)        ((in_port_t)__byte_swap_word((in_port_t)(x)))
-
-#endif
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/float.h
--- a/sys/arch/x86_64/include/float.h   Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: float.h,v 1.2 2003/02/26 21:29:35 fvdl Exp $   */
-
-#include <x86/float.h>
diff -r bcf1bd1ea049 -r 39684980ed91 sys/arch/x86_64/include/fpu.h
--- a/sys/arch/x86_64/include/fpu.h     Sat Apr 26 18:39:59 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*     $NetBSD: fpu.h,v 1.8 2003/03/16 20:35:28 fvdl Exp $     */
-
-#ifndef        _X86_64_FPU_H_
-#define        _X86_64_FPU_H_
-
-/*
- * NetBSD/x86_64 only uses the extended save/restore format used



Home | Main Index | Thread Index | Old Index