diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-06 23:07:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-06 23:07:51 +0000 |
| commit | a169a8038adc6a9370b0bda0ea2874fc81a46ea0 (patch) | |
| tree | 548c3924bcf2fcda00aed089060bf159b40ee463 /sys/arch/pica/include | |
| parent | 8deec08b168c50735caa13ad7734d751564a5154 (diff) | |
MachEmptyWriteBuffer -> wbflush(), remove all MACH_* components from
names, use asm.h/cpu.h instead of mach*.h, add $OpenBSD$ some places,
use kern/exec_elf.c
Diffstat (limited to 'sys/arch/pica/include')
42 files changed, 327 insertions, 528 deletions
diff --git a/sys/arch/pica/include/ansi.h b/sys/arch/pica/include/ansi.h index 1b329b0d39c..59add98be6e 100644 --- a/sys/arch/pica/include/ansi.h +++ b/sys/arch/pica/include/ansi.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ansi.h,v 1.2 1996/06/06 23:06:29 deraadt Exp $ */ /* $NetBSD: ansi.h,v 1.5 1994/10/26 21:09:33 cgd Exp $ */ /*- diff --git a/sys/arch/pica/include/asm.h b/sys/arch/pica/include/asm.h index f1dbf9e7b93..5b3683f86b1 100644 --- a/sys/arch/pica/include/asm.h +++ b/sys/arch/pica/include/asm.h @@ -1,3 +1,5 @@ +/* $OpenBSD: asm.h,v 1.2 1996/06/06 23:06:30 deraadt Exp $ */ + /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -33,15 +35,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)machAsmDefs.h 8.1 (Berkeley) 6/10/93 - * $Id: asm.h,v 1.1 1996/05/02 08:18:33 pefo Exp $ - */ - -/* - * machAsmDefs.h -- - * - * Macros used when writing assembler programs. - * * Copyright (C) 1989 Digital Equipment Corporation. * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, @@ -49,10 +42,6 @@ * Digital Equipment Corporation makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. - * - * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsmDefs.h, - * v 1.2 89/08/15 18:28:24 rab Exp SPRITE (DECWRL) - * $Id: asm.h,v 1.1 1996/05/02 08:18:33 pefo Exp $ */ #ifndef _MACHASMDEFS diff --git a/sys/arch/pica/include/autoconf.h b/sys/arch/pica/include/autoconf.h index 42538ef9c36..a65e08cc8e6 100644 --- a/sys/arch/pica/include/autoconf.h +++ b/sys/arch/pica/include/autoconf.h @@ -1,3 +1,4 @@ +/* $OpenBSD: autoconf.h,v 1.2 1996/06/06 23:06:31 deraadt Exp $ */ /* $NetBSD: autoconf.h,v 1.1 1995/02/13 23:07:31 cgd Exp $ */ /* diff --git a/sys/arch/pica/include/bsd-aout.h b/sys/arch/pica/include/bsd-aout.h index 5d496ff1d09..df9ab03dcb4 100644 --- a/sys/arch/pica/include/bsd-aout.h +++ b/sys/arch/pica/include/bsd-aout.h @@ -1,3 +1,5 @@ +/* $OpenBSD: bsd-aout.h,v 1.2 1996/06/06 23:06:32 deraadt Exp $ */ + /* bsd-aout.h 4.4bsd a.out format, for backwards compatibility... */ diff --git a/sys/arch/pica/include/bus.h b/sys/arch/pica/include/bus.h index e6a5f66e126..21a3d42b122 100644 --- a/sys/arch/pica/include/bus.h +++ b/sys/arch/pica/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.1 1996/05/02 08:18:34 pefo Exp $ */ +/* $OpenBSD: bus.h,v 1.2 1996/06/06 23:06:33 deraadt Exp $ */ /* $NetBSD: bus.h,v 1.2 1996/04/05 23:59:37 thorpej Exp $ */ /* @@ -31,8 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _PICA_BUS_H_ +#define _PICA_BUS_H_ #include <machine/pio.h> @@ -123,4 +123,4 @@ void bus_mem_unmap __P((bus_chipset_tag_t t, bus_mem_handle_t memh, #define bus_from_host_4(t, v) (v) #define bus_from_host_8(t, v) (v) -#endif /* _I386_BUS_H_ */ +#endif /* _PICA_BUS_H_ */ diff --git a/sys/arch/pica/include/cdefs.h b/sys/arch/pica/include/cdefs.h index 1b4a6cc51ee..335a97be479 100644 --- a/sys/arch/pica/include/cdefs.h +++ b/sys/arch/pica/include/cdefs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cdefs.h,v 1.2 1996/06/06 23:06:34 deraadt Exp $ */ /* $NetBSD: cdefs.h,v 1.3 1995/05/03 06:04:54 mellon Exp $ */ /* diff --git a/sys/arch/pica/include/cpu.h b/sys/arch/pica/include/cpu.h index 6f46be6068b..8675e596585 100644 --- a/sys/arch/pica/include/cpu.h +++ b/sys/arch/pica/include/cpu.h @@ -1,3 +1,5 @@ +/* $OpenBSD: cpu.h,v 1.2 1996/06/06 23:06:35 deraadt Exp $ */ + /*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -33,14 +35,244 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * Copyright (C) 1989 Digital Equipment Corporation. + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appears in all copies. + * Digital Equipment Corporation makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * * from: @(#)cpu.h 8.4 (Berkeley) 1/4/94 - * $Id: cpu.h,v 1.1 1995/10/18 10:39:11 deraadt Exp $ */ #ifndef _CPU_H_ #define _CPU_H_ -#include <machine/machConst.h> +#ifdef _KERNEL + +#define KUSEG_ADDR 0x0 +#define CACHED_MEMORY_ADDR 0x80000000 +#define UNCACHED_MEMORY_ADDR 0xa0000000 +#define KSEG2_ADDR 0xc0000000 +#define MAX_MEM_ADDR 0xbe000000 +#define RESERVED_ADDR 0xbfc80000 + +#define CACHED_TO_PHYS(x) ((unsigned)(x) & 0x1fffffff) +#define PHYS_TO_CACHED(x) ((unsigned)(x) | CACHED_MEMORY_ADDR) +#define UNCACHED_TO_PHYS(x) ((unsigned)(x) & 0x1fffffff) +#define PHYS_TO_UNCACHED(x) ((unsigned)(x) | UNCACHED_MEMORY_ADDR) +#define VA_TO_CINDEX(x) ((unsigned)(x) & 0xffffff | CACHED_MEMORY_ADDR) + +#define CODE_START 0x80080000 + +/* + * The bits in the cause register. + * + * CR_BR_DELAY Exception happened in branch delay slot. + * CR_COP_ERR Coprocessor error. + * CR_IP Interrupt pending bits defined below. + * CR_EXC_CODE The exception type (see exception codes below). + */ +#define CR_BR_DELAY 0x80000000 +#define CR_COP_ERR 0x30000000 +#define CR_EXC_CODE 0x0000007C +#define CR_IP 0x0000FF00 +#define CR_EXC_CODE_SHIFT 2 + +/* + * The bits in the status register. All bits are active when set to 1. + */ +#define SR_COP_USABILITY 0xf0000000 +#define SR_COP_0_BIT 0x10000000 +#define SR_COP_1_BIT 0x20000000 +#define SR_RP 0x08000000 +#define SR_FR_32 0x04000000 +#define SR_RE 0x02000000 +#define SR_BOOT_EXC_VEC 0x00400000 +#define SR_TLB_SHUTDOWN 0x00200000 +#define SR_SOFT_RESET 0x00100000 +#define SR_DIAG_CH 0x00040000 +#define SR_DIAG_CE 0x00020000 +#define SR_DIAG_PE 0x00010000 +#define SR_KX 0x00000080 +#define SR_SX 0x00000040 +#define SR_UX 0x00000020 +#define SR_KSU_MASK 0x00000018 +#define SR_KSU_USER 0x00000010 +#define SR_KSU_SUPER 0x00000008 +#define SR_KSU_KERNEL 0x00000000 +#define SR_ERL 0x00000004 +#define SR_EXL 0x00000002 +#define SR_INT_ENAB 0x00000001 +/*#define SR_INT_MASK 0x0000ff00*/ + +/* + * The interrupt masks. + * If a bit in the mask is 1 then the interrupt is enabled (or pending). + */ +#define INT_MASK 0x7f00 +#define INT_MASK_5 0x8000 /* Not used (on chip timer) */ +#define INT_MASK_4 0x4000 +#define INT_MASK_3 0x2000 +#define INT_MASK_2 0x1000 +#define INT_MASK_1 0x0800 +#define INT_MASK_0 0x0400 +#define HARD_INT_MASK 0x7c00 +#define SOFT_INT_MASK_1 0x0200 +#define SOFT_INT_MASK_0 0x0100 + +/* + * The bits in the context register. + */ +#define CNTXT_PTE_BASE 0xFF800000 +#define CNTXT_BAD_VPN2 0x007FFFF0 + +/* + * Location of exception vectors. + */ +#define RESET_EXC_VEC 0xBFC00000 +#define TLB_MISS_EXC_VEC 0x80000000 +#define XTLB_MISS_EXC_VEC 0x80000080 +#define CACHE_ERR_EXC_VEC 0x80000100 +#define GEN_EXC_VEC 0x80000180 + +/* + * Coprocessor 0 registers: + */ +#define COP_0_TLB_INDEX $0 +#define COP_0_TLB_RANDOM $1 +#define COP_0_TLB_LO0 $2 +#define COP_0_TLB_LO1 $3 +#define COP_0_TLB_CONTEXT $4 +#define COP_0_TLB_PG_MASK $5 +#define COP_0_TLB_WIRED $6 +#define COP_0_BAD_VADDR $8 +#define COP_0_TLB_HI $10 +#define COP_0_STATUS_REG $12 +#define COP_0_CAUSE_REG $13 +#define COP_0_EXC_PC $14 +#define COP_0_PRID $15 +#define COP_0_CONFIG $16 +#define COP_0_LLADDR $17 +#define COP_0_WATCH_LO $18 +#define COP_0_WATCH_HI $19 +#define COP_0_TLB_XCONTEXT $20 +#define COP_0_ECC $26 +#define COP_0_CACHE_ERR $27 +#define COP_0_TAG_LO $28 +#define COP_0_TAG_HI $29 +#define COP_0_ERROR_PC $30 + +/* + * Values for the code field in a break instruction. + */ +#define BREAK_INSTR 0x0000000d +#define BREAK_VAL_MASK 0x03ff0000 +#define BREAK_VAL_SHIFT 16 +#define BREAK_KDB_VAL 512 +#define BREAK_SSTEP_VAL 513 +#define BREAK_BRKPT_VAL 514 +#define BREAK_SOVER_VAL 515 +#define BREAK_KDB (BREAK_INSTR | (BREAK_KDB_VAL << BREAK_VAL_SHIFT)) +#define BREAK_SSTEP (BREAK_INSTR | (BREAK_SSTEP_VAL << BREAK_VAL_SHIFT)) +#define BREAK_BRKPT (BREAK_INSTR | (BREAK_BRKPT_VAL << BREAK_VAL_SHIFT)) +#define BREAK_SOVER (BREAK_INSTR | (BREAK_SOVER_VAL << BREAK_VAL_SHIFT)) + +/* + * Mininum and maximum cache sizes. + */ +#define MIN_CACHE_SIZE (16 * 1024) +#define MAX_CACHE_SIZE (256 * 1024) + +/* + * The floating point version and status registers. + */ +#define FPC_ID $0 +#define FPC_CSR $31 + +/* + * The floating point coprocessor status register bits. + */ +#define FPC_ROUNDING_BITS 0x00000003 +#define FPC_ROUND_RN 0x00000000 +#define FPC_ROUND_RZ 0x00000001 +#define FPC_ROUND_RP 0x00000002 +#define FPC_ROUND_RM 0x00000003 +#define FPC_STICKY_BITS 0x0000007c +#define FPC_STICKY_INEXACT 0x00000004 +#define FPC_STICKY_UNDERFLOW 0x00000008 +#define FPC_STICKY_OVERFLOW 0x00000010 +#define FPC_STICKY_DIV0 0x00000020 +#define FPC_STICKY_INVALID 0x00000040 +#define FPC_ENABLE_BITS 0x00000f80 +#define FPC_ENABLE_INEXACT 0x00000080 +#define FPC_ENABLE_UNDERFLOW 0x00000100 +#define FPC_ENABLE_OVERFLOW 0x00000200 +#define FPC_ENABLE_DIV0 0x00000400 +#define FPC_ENABLE_INVALID 0x00000800 +#define FPC_EXCEPTION_BITS 0x0003f000 +#define FPC_EXCEPTION_INEXACT 0x00001000 +#define FPC_EXCEPTION_UNDERFLOW 0x00002000 +#define FPC_EXCEPTION_OVERFLOW 0x00004000 +#define FPC_EXCEPTION_DIV0 0x00008000 +#define FPC_EXCEPTION_INVALID 0x00010000 +#define FPC_EXCEPTION_UNIMPL 0x00020000 +#define FPC_COND_BIT 0x00800000 +#define FPC_FLUSH_BIT 0x01000000 +#define FPC_MBZ_BITS 0xfe7c0000 + +/* + * Constants to determine if have a floating point instruction. + */ +#define OPCODE_SHIFT 26 +#define OPCODE_C1 0x11 + +/* + * The low part of the TLB entry. + */ +#define VMTLB_PF_NUM 0x3fffffc0 +#define VMTLB_ATTR_MASK 0x00000038 +#define VMTLB_MOD_BIT 0x00000004 +#define VMTLB_VALID_BIT 0x00000002 +#define VMTLB_GLOBAL_BIT 0x00000001 + +#define VMTLB_PHYS_PAGE_SHIFT 6 + +/* + * The high part of the TLB entry. + */ +#define VMTLB_VIRT_PAGE_NUM 0xffffe000 +#define VMTLB_PID 0x000000ff +#define VMTLB_PID_SHIFT 0 +#define VMTLB_VIRT_PAGE_SHIFT 12 + +/* + * The number of TLB entries and the first one that write random hits. + */ +#define VMNUM_TLB_ENTRIES 48 +#define VMWIRED_ENTRIES 8 + +/* + * The number of process id entries. + */ +#define VMNUM_PIDS 256 + +/* + * TLB probe return codes. + */ +#define VMTLB_NOT_FOUND 0 +#define VMTLB_FOUND 1 +#define VMTLB_FOUND_WITH_PATCH 2 +#define VMTLB_PROBE_ERROR 3 + +/* + * Kernel virtual address for user page table entries + * (i.e., the address for the context register). + */ +#define VMPTE_BASE 0xFF800000 + +#endif /* _KERNEL */ /* * Exported definitions unique to pica/mips cpu support. @@ -56,6 +288,7 @@ #define cpu_set_init_frame(p, fp) /* nothing */ #define cpu_swapout(p) panic("cpu_swapout: can't get here"); +#ifndef _LOCORE /* * Arguments to hardclock and gatherstats encapsulate the previous * machine state in an opaque clockframe. @@ -65,9 +298,8 @@ struct clockframe { int sr; /* status register at time of interrupt */ }; -#define CLKF_USERMODE(framep) ((framep)->sr & MACH_SR_KSU_USER) -#define CLKF_BASEPRI(framep) \ - ((~(framep)->sr & (MACH_INT_MASK | MACH_SR_INT_ENAB)) == 0) +#define CLKF_USERMODE(framep) ((framep)->sr & SR_KSU_USER) +#define CLKF_BASEPRI(framep) ((~(framep)->sr & (INT_MASK|SR_INT_ENAB)) == 0) #define CLKF_PC(framep) ((framep)->pc) #define CLKF_INTR(framep) (0) @@ -126,6 +358,8 @@ union cpuprid { { "console_device", CTLTYPE_STRUCT }, \ } +#endif /* !_LOCORE */ + /* * MIPS CPU types (cp_imp). */ @@ -165,7 +399,7 @@ union cpuprid { #define MIPS_R3TOSH 0x22 /* Toshiba R3000 based FPU ISA I */ #define MIPS_R3NKK 0x23 /* NKK R3000 based FPU ISA I */ -#ifdef _KERNEL +#if defined(_KERNEL) && !defined(_LOCORE) union cpuprid cpu_id; union cpuprid fpu_id; u_int machPrimaryDataCacheSize; diff --git a/sys/arch/pica/include/disklabel.h b/sys/arch/pica/include/disklabel.h index f84cf756a1c..40e913434b4 100644 --- a/sys/arch/pica/include/disklabel.h +++ b/sys/arch/pica/include/disklabel.h @@ -1,3 +1,4 @@ +/* $OpenBSD: disklabel.h,v 1.2 1996/06/06 23:06:36 deraadt Exp $ */ /* $NetBSD: disklabel.h,v 1.2 1995/01/18 06:37:55 mellon Exp $ */ /* diff --git a/sys/arch/pica/include/display.h b/sys/arch/pica/include/display.h index 60406dce661..06ab0512ed2 100644 --- a/sys/arch/pica/include/display.h +++ b/sys/arch/pica/include/display.h @@ -1,7 +1,8 @@ +/* $OpenBSD: display.h,v 1.2 1996/06/06 23:06:36 deraadt Exp $ */ + /* * IBM PC display definitions * - * $Id: display.h,v 1.1 1995/10/18 10:39:15 deraadt Exp $ */ /* Color attributes for foreground text */ diff --git a/sys/arch/pica/include/elf.h b/sys/arch/pica/include/elf.h index 5cb8b03421d..acdbbed98b4 100644 --- a/sys/arch/pica/include/elf.h +++ b/sys/arch/pica/include/elf.h @@ -1,3 +1,4 @@ +/* $OpenBSD: elf.h,v 1.2 1996/06/06 23:06:38 deraadt Exp $ */ /* $NetBSD: elf.h,v 1.2 1995/03/28 18:19:14 jtc Exp $ */ /* diff --git a/sys/arch/pica/include/endian.h b/sys/arch/pica/include/endian.h index 82c1194223c..25566c74236 100644 --- a/sys/arch/pica/include/endian.h +++ b/sys/arch/pica/include/endian.h @@ -1,3 +1,4 @@ +/* $OpenBSD: endian.h,v 1.3 1996/06/06 23:06:38 deraadt Exp $ */ /* $NetBSD: endian.h,v 1.4 1994/10/26 21:09:38 cgd Exp $ */ /* diff --git a/sys/arch/pica/include/exec.h b/sys/arch/pica/include/exec.h index d7ec6218317..88cb0cf451d 100644 --- a/sys/arch/pica/include/exec.h +++ b/sys/arch/pica/include/exec.h @@ -1,3 +1,4 @@ +/* $OpenBSD: exec.h,v 1.4 1996/06/06 23:06:39 deraadt Exp $ */ /* $NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $ */ /*- diff --git a/sys/arch/pica/include/float.h b/sys/arch/pica/include/float.h index 2c172c75763..2381312497d 100644 --- a/sys/arch/pica/include/float.h +++ b/sys/arch/pica/include/float.h @@ -1,3 +1,4 @@ +/* $OpenBSD: float.h,v 1.2 1996/06/06 23:06:40 deraadt Exp $ */ /* $NetBSD: float.h,v 1.7 1995/06/20 20:45:50 jtc Exp $ */ /* diff --git a/sys/arch/pica/include/ieeefp.h b/sys/arch/pica/include/ieeefp.h index 65ea3fed16c..d33b628596e 100644 --- a/sys/arch/pica/include/ieeefp.h +++ b/sys/arch/pica/include/ieeefp.h @@ -1,3 +1,5 @@ +/* $OpenBSD: ieeefp.h,v 1.2 1996/06/06 23:06:41 deraadt Exp $ */ + /* * Written by J.T. Conklin, Apr 11, 1995 * Public domain. diff --git a/sys/arch/pica/include/kbdreg.h b/sys/arch/pica/include/kbdreg.h index 10d0795352d..6c890fefbdd 100644 --- a/sys/arch/pica/include/kbdreg.h +++ b/sys/arch/pica/include/kbdreg.h @@ -1,7 +1,8 @@ +/* $OpenBSD: kbdreg.h,v 1.2 1996/06/06 23:06:42 deraadt Exp $ */ + /* * Keyboard definitions * - * $Id: kbdreg.h,v 1.1 1995/10/18 10:39:15 deraadt Exp $ */ #define KBSTATP (PICA_SYS_KBD + 0x61) /* controller status port (I) */ diff --git a/sys/arch/pica/include/kdbparam.h b/sys/arch/pica/include/kdbparam.h index 9104c87aa3c..b77f9b96af7 100644 --- a/sys/arch/pica/include/kdbparam.h +++ b/sys/arch/pica/include/kdbparam.h @@ -1,3 +1,4 @@ +/* $OpenBSD: kdbparam.h,v 1.2 1996/06/06 23:06:44 deraadt Exp $ */ /* $NetBSD: kdbparam.h,v 1.4 1994/10/26 21:09:42 cgd Exp $ */ /*- @@ -52,13 +53,13 @@ #define LPRMODE "%R" #define OFFMODE "+%R" -#define SETBP(ins) MACH_BREAK_BRKPT +#define SETBP(ins) BREAK_BRKPT /* return the program counter value modified if we are in a delay slot */ #define kdbgetpc(pcb) (kdbvar[kdbvarchk('t')] < 0 ? \ (pcb).pcb_regs[34] + 4 : (pcb).pcb_regs[34]) #define kdbishiddenreg(p) ((p) >= &kdbreglist[33]) -#define kdbisbreak(type) (((type) & MACH_CR_EXC_CODE) == 0x24) +#define kdbisbreak(type) (((type) & CR_EXC_CODE) == 0x24) /* check for address wrap around */ #define kdbaddrwrap(addr,newaddr) (((addr)^(newaddr)) >> 31) diff --git a/sys/arch/pica/include/limits.h b/sys/arch/pica/include/limits.h index b692e2885c6..4bad604ea0c 100644 --- a/sys/arch/pica/include/limits.h +++ b/sys/arch/pica/include/limits.h @@ -1,3 +1,4 @@ +/* $OpenBSD: limits.h,v 1.2 1996/06/06 23:06:45 deraadt Exp $ */ /* $NetBSD: limits.h,v 1.8 1995/03/28 18:19:16 jtc Exp $ */ /* diff --git a/sys/arch/pica/include/machAsmDefs.h b/sys/arch/pica/include/machAsmDefs.h deleted file mode 100644 index dfc42fcff23..00000000000 --- a/sys/arch/pica/include/machAsmDefs.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. - * - * from: @(#)machAsmDefs.h 8.1 (Berkeley) 6/10/93 - * $Id: machAsmDefs.h,v 1.1 1995/10/18 10:39:12 deraadt Exp $ - */ - -/* - * machAsmDefs.h -- - * - * Macros used when writing assembler programs. - * - * Copyright (C) 1989 Digital Equipment Corporation. - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appears in all copies. - * Digital Equipment Corporation makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsmDefs.h, - * v 1.2 89/08/15 18:28:24 rab Exp SPRITE (DECWRL) - * $Id: machAsmDefs.h,v 1.1 1995/10/18 10:39:12 deraadt Exp $ - */ - -#ifndef _MACHASMDEFS -#define _MACHASMDEFS - -#include <machine/regdef.h> - -/* - * Define -pg profile entry code. - */ -#if defined(GPROF) || defined(PROF) -#define MCOUNT .set noreorder; \ - .set noat; \ - move $1,$31; \ - jal _mcount; \ - subu sp,sp,8; \ - .set reorder; \ - .set at; -#else -#define MCOUNT -#endif - -/* - * LEAF(x) - * - * Declare a leaf routine. - */ -#define LEAF(x) \ - .globl x; \ - .ent x, 0; \ -x: ; \ - .frame sp, 0, ra; \ - MCOUNT - -/* - * NLEAF(x) - * - * Declare a non-profiled leaf routine. - */ -#define NLEAF(x) \ - .globl x; \ - .ent x, 0; \ -x: ; \ - .frame sp, 0, ra - -/* - * ALEAF -- declare alternate entry to a leaf routine. - */ -#define ALEAF(x) \ - .globl x; \ -x: - -/* - * NON_LEAF(x) - * - * Declare a non-leaf routine (a routine that makes other C calls). - */ -#define NON_LEAF(x, fsize, retpc) \ - .globl x; \ - .ent x, 0; \ -x: ; \ - .frame sp, fsize, retpc; \ - MCOUNT - -/* - * NNON_LEAF(x) - * - * Declare a non-profiled non-leaf routine - * (a routine that makes other C calls). - */ -#define NNON_LEAF(x, fsize, retpc) \ - .globl x; \ - .ent x, 0; \ -x: ; \ - .frame sp, fsize, retpc - -/* - * END(x) - * - * Mark end of a procedure. - */ -#define END(x) \ - .end x - -#define STAND_FRAME_SIZE 24 -#define STAND_RA_OFFSET 20 - -/* - * Macros to panic and printf from assembly language. - */ -#define PANIC(msg) \ - la a0, 9f; \ - jal panic; \ - MSG(msg) - -#define PRINTF(msg) \ - la a0, 9f; \ - jal printf; \ - MSG(msg) - -#define MSG(msg) \ - .rdata; \ -9: .asciiz msg; \ - .text - -#define ASMSTR(str) \ - .asciiz str; \ - .align 3 - -#endif /* _MACHASMDEFS */ diff --git a/sys/arch/pica/include/machConst.h b/sys/arch/pica/include/machConst.h deleted file mode 100644 index bdbeb576662..00000000000 --- a/sys/arch/pica/include/machConst.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell and Rick Macklem. - * - * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. - * - * from: @(#)machConst.h 8.1 (Berkeley) 6/10/93 - * $Id: machConst.h,v 1.1 1995/10/18 10:39:12 deraadt Exp $ - * - * machConst.h -- - * - * Machine dependent constants. - * - * Copyright (C) 1989 Digital Equipment Corporation. - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appears in all copies. - * Digital Equipment Corporation makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machConst.h, - * v 9.2 89/10/21 15:55:22 jhh Exp SPRITE (DECWRL) - * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAddrs.h, - * v 1.2 89/08/15 18:28:21 rab Exp SPRITE (DECWRL) - * from: Header: /sprite/src/kernel/vm/ds3100.md/RCS/vmPmaxConst.h, - * v 9.1 89/09/18 17:33:00 shirriff Exp SPRITE (DECWRL) - * $Id: machConst.h,v 1.1 1995/10/18 10:39:12 deraadt Exp $ - */ - -#ifndef _MACHCONST -#define _MACHCONST - -#define MACH_KUSEG_ADDR 0x0 -#define MACH_CACHED_MEMORY_ADDR 0x80000000 -#define MACH_UNCACHED_MEMORY_ADDR 0xa0000000 -#define MACH_KSEG2_ADDR 0xc0000000 -#define MACH_MAX_MEM_ADDR 0xbe000000 -#define MACH_RESERVED_ADDR 0xbfc80000 - -#define MACH_CACHED_TO_PHYS(x) ((unsigned)(x) & 0x1fffffff) -#define MACH_PHYS_TO_CACHED(x) ((unsigned)(x) | MACH_CACHED_MEMORY_ADDR) -#define MACH_UNCACHED_TO_PHYS(x) ((unsigned)(x) & 0x1fffffff) -#define MACH_PHYS_TO_UNCACHED(x) ((unsigned)(x) | MACH_UNCACHED_MEMORY_ADDR) -#define MACH_VA_TO_CINDEX(x) \ - ((unsigned)(x) & 0xffffff | MACH_CACHED_MEMORY_ADDR) - -#define MACH_CODE_START 0x80080000 - -/* - * The bits in the cause register. - * - * MACH_CR_BR_DELAY Exception happened in branch delay slot. - * MACH_CR_COP_ERR Coprocessor error. - * MACH_CR_IP Interrupt pending bits defined below. - * MACH_CR_EXC_CODE The exception type (see exception codes below). - */ -#define MACH_CR_BR_DELAY 0x80000000 -#define MACH_CR_COP_ERR 0x30000000 -#define MACH_CR_EXC_CODE 0x0000007C -#define MACH_CR_IP 0x0000FF00 -#define MACH_CR_EXC_CODE_SHIFT 2 - -/* - * The bits in the status register. All bits are active when set to 1. - */ -#define MACH_SR_COP_USABILITY 0xf0000000 -#define MACH_SR_COP_0_BIT 0x10000000 -#define MACH_SR_COP_1_BIT 0x20000000 -#define MACH_SR_RP 0x08000000 -#define MACH_SR_FR_32 0x04000000 -#define MACH_SR_RE 0x02000000 -#define MACH_SR_BOOT_EXC_VEC 0x00400000 -#define MACH_SR_TLB_SHUTDOWN 0x00200000 -#define MACH_SR_SOFT_RESET 0x00100000 -#define MACH_SR_DIAG_CH 0x00040000 -#define MACH_SR_DIAG_CE 0x00020000 -#define MACH_SR_DIAG_PE 0x00010000 -#define MACH_SR_KX 0x00000080 -#define MACH_SR_SX 0x00000040 -#define MACH_SR_UX 0x00000020 -#define MACH_SR_KSU_MASK 0x00000018 -#define MACH_SR_KSU_USER 0x00000010 -#define MACH_SR_KSU_SUPER 0x00000008 -#define MACH_SR_KSU_KERNEL 0x00000000 -#define MACH_SR_ERL 0x00000004 -#define MACH_SR_EXL 0x00000002 -#define MACH_SR_INT_ENAB 0x00000001 -/*#define MACH_SR_INT_MASK 0x0000ff00*/ - -/* - * The interrupt masks. - * If a bit in the mask is 1 then the interrupt is enabled (or pending). - */ -#define MACH_INT_MASK 0x7f00 -#define MACH_INT_MASK_5 0x8000 /* Not used (on chip timer) */ -#define MACH_INT_MASK_4 0x4000 -#define MACH_INT_MASK_3 0x2000 -#define MACH_INT_MASK_2 0x1000 -#define MACH_INT_MASK_1 0x0800 -#define MACH_INT_MASK_0 0x0400 -#define MACH_HARD_INT_MASK 0x7c00 -#define MACH_SOFT_INT_MASK_1 0x0200 -#define MACH_SOFT_INT_MASK_0 0x0100 - -/* - * The bits in the context register. - */ -#define MACH_CNTXT_PTE_BASE 0xFF800000 -#define MACH_CNTXT_BAD_VPN2 0x007FFFF0 - -/* - * Location of exception vectors. - */ -#define MACH_RESET_EXC_VEC 0xBFC00000 -#define MACH_TLB_MISS_EXC_VEC 0x80000000 -#define MACH_XTLB_MISS_EXC_VEC 0x80000080 -#define MACH_CACHE_ERR_EXC_VEC 0x80000100 -#define MACH_GEN_EXC_VEC 0x80000180 - -/* - * Coprocessor 0 registers: - */ -#define MACH_COP_0_TLB_INDEX $0 -#define MACH_COP_0_TLB_RANDOM $1 -#define MACH_COP_0_TLB_LO0 $2 -#define MACH_COP_0_TLB_LO1 $3 -#define MACH_COP_0_TLB_CONTEXT $4 -#define MACH_COP_0_TLB_PG_MASK $5 -#define MACH_COP_0_TLB_WIRED $6 -#define MACH_COP_0_BAD_VADDR $8 -#define MACH_COP_0_TLB_HI $10 -#define MACH_COP_0_STATUS_REG $12 -#define MACH_COP_0_CAUSE_REG $13 -#define MACH_COP_0_EXC_PC $14 -#define MACH_COP_0_PRID $15 -#define MACH_COP_0_CONFIG $16 -#define MACH_COP_0_LLADDR $17 -#define MACH_COP_0_WATCH_LO $18 -#define MACH_COP_0_WATCH_HI $19 -#define MACH_COP_0_TLB_XCONTEXT $20 -#define MACH_COP_0_ECC $26 -#define MACH_COP_0_CACHE_ERR $27 -#define MACH_COP_0_TAG_LO $28 -#define MACH_COP_0_TAG_HI $29 -#define MACH_COP_0_ERROR_PC $30 - -/* - * Values for the code field in a break instruction. - */ -#define MACH_BREAK_INSTR 0x0000000d -#define MACH_BREAK_VAL_MASK 0x03ff0000 -#define MACH_BREAK_VAL_SHIFT 16 -#define MACH_BREAK_KDB_VAL 512 -#define MACH_BREAK_SSTEP_VAL 513 -#define MACH_BREAK_BRKPT_VAL 514 -#define MACH_BREAK_SOVER_VAL 515 -#define MACH_BREAK_KDB (MACH_BREAK_INSTR | \ - (MACH_BREAK_KDB_VAL << MACH_BREAK_VAL_SHIFT)) -#define MACH_BREAK_SSTEP (MACH_BREAK_INSTR | \ - (MACH_BREAK_SSTEP_VAL << MACH_BREAK_VAL_SHIFT)) -#define MACH_BREAK_BRKPT (MACH_BREAK_INSTR | \ - (MACH_BREAK_BRKPT_VAL << MACH_BREAK_VAL_SHIFT)) -#define MACH_BREAK_SOVER (MACH_BREAK_INSTR | \ - (MACH_BREAK_SOVER_VAL << MACH_BREAK_VAL_SHIFT)) - -/* - * Mininum and maximum cache sizes. - */ -#define MACH_MIN_CACHE_SIZE (16 * 1024) -#define MACH_MAX_CACHE_SIZE (256 * 1024) - -/* - * The floating point version and status registers. - */ -#define MACH_FPC_ID $0 -#define MACH_FPC_CSR $31 - -/* - * The floating point coprocessor status register bits. - */ -#define MACH_FPC_ROUNDING_BITS 0x00000003 -#define MACH_FPC_ROUND_RN 0x00000000 -#define MACH_FPC_ROUND_RZ 0x00000001 -#define MACH_FPC_ROUND_RP 0x00000002 -#define MACH_FPC_ROUND_RM 0x00000003 -#define MACH_FPC_STICKY_BITS 0x0000007c -#define MACH_FPC_STICKY_INEXACT 0x00000004 -#define MACH_FPC_STICKY_UNDERFLOW 0x00000008 -#define MACH_FPC_STICKY_OVERFLOW 0x00000010 -#define MACH_FPC_STICKY_DIV0 0x00000020 -#define MACH_FPC_STICKY_INVALID 0x00000040 -#define MACH_FPC_ENABLE_BITS 0x00000f80 -#define MACH_FPC_ENABLE_INEXACT 0x00000080 -#define MACH_FPC_ENABLE_UNDERFLOW 0x00000100 -#define MACH_FPC_ENABLE_OVERFLOW 0x00000200 -#define MACH_FPC_ENABLE_DIV0 0x00000400 -#define MACH_FPC_ENABLE_INVALID 0x00000800 -#define MACH_FPC_EXCEPTION_BITS 0x0003f000 -#define MACH_FPC_EXCEPTION_INEXACT 0x00001000 -#define MACH_FPC_EXCEPTION_UNDERFLOW 0x00002000 -#define MACH_FPC_EXCEPTION_OVERFLOW 0x00004000 -#define MACH_FPC_EXCEPTION_DIV0 0x00008000 -#define MACH_FPC_EXCEPTION_INVALID 0x00010000 -#define MACH_FPC_EXCEPTION_UNIMPL 0x00020000 -#define MACH_FPC_COND_BIT 0x00800000 -#define MACH_FPC_FLUSH_BIT 0x01000000 -#define MACH_FPC_MBZ_BITS 0xfe7c0000 - -/* - * Constants to determine if have a floating point instruction. - */ -#define MACH_OPCODE_SHIFT 26 -#define MACH_OPCODE_C1 0x11 - -/* - * The low part of the TLB entry. - */ -#define VMMACH_TLB_PF_NUM 0x3fffffc0 -#define VMMACH_TLB_ATTR_MASK 0x00000038 -#define VMMACH_TLB_MOD_BIT 0x00000004 -#define VMMACH_TLB_VALID_BIT 0x00000002 -#define VMMACH_TLB_GLOBAL_BIT 0x00000001 - -#define VMMACH_TLB_PHYS_PAGE_SHIFT 6 - -/* - * The high part of the TLB entry. - */ -#define VMMACH_TLB_VIRT_PAGE_NUM 0xffffe000 -#define VMMACH_TLB_PID 0x000000ff -#define VMMACH_TLB_PID_SHIFT 0 -#define VMMACH_TLB_VIRT_PAGE_SHIFT 12 - -/* - * The number of TLB entries and the first one that write random hits. - */ -#define VMMACH_NUM_TLB_ENTRIES 48 -#define VMMACH_WIRED_ENTRIES 8 - -/* - * The number of process id entries. - */ -#define VMMACH_NUM_PIDS 256 - -/* - * TLB probe return codes. - */ -#define VMMACH_TLB_NOT_FOUND 0 -#define VMMACH_TLB_FOUND 1 -#define VMMACH_TLB_FOUND_WITH_PATCH 2 -#define VMMACH_TLB_PROBE_ERROR 3 - -/* - * Kernel virtual address for user page table entries - * (i.e., the address for the context register). - */ -#define VMMACH_PTE_BASE 0xFF800000 - -#endif /* _MACHCONST */ diff --git a/sys/arch/pica/include/mips_opcode.h b/sys/arch/pica/include/mips_opcode.h index 7301b3d6548..4ff925bba08 100644 --- a/sys/arch/pica/include/mips_opcode.h +++ b/sys/arch/pica/include/mips_opcode.h @@ -1,3 +1,5 @@ +/* $OpenBSD: mips_opcode.h,v 1.2 1996/06/06 23:06:50 deraadt Exp $ */ + /*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -34,7 +36,6 @@ * SUCH DAMAGE. * * from: @(#)mips_opcode.h 8.1 (Berkeley) 6/10/93 - * $Id: mips_opcode.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $ */ /* diff --git a/sys/arch/pica/include/mouse.h b/sys/arch/pica/include/mouse.h index 9c26917d77e..366cb5ee690 100644 --- a/sys/arch/pica/include/mouse.h +++ b/sys/arch/pica/include/mouse.h @@ -1,3 +1,4 @@ +/* $OpenBSD: mouse.h,v 1.2 1996/06/06 23:06:52 deraadt Exp $ */ /* $NetBSD: mouse.h,v 1.4 1994/10/27 04:16:10 cgd Exp $ */ /*- diff --git a/sys/arch/pica/include/param.h b/sys/arch/pica/include/param.h index 10f068449c1..23cc08d97f4 100644 --- a/sys/arch/pica/include/param.h +++ b/sys/arch/pica/include/param.h @@ -1,3 +1,5 @@ +/* $OpenBSD: param.h,v 1.4 1996/06/06 23:06:53 deraadt Exp $ */ + /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -35,11 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: machparam.h 1.11 89/08/14 - * - * + * from: Utah Hdr: machparam.h 1.11 89/08/14 * from: @(#)param.h 8.1 (Berkeley) 6/10/93 - * $Id: param.h,v 1.3 1996/05/02 07:59:39 pefo Exp $ */ /* diff --git a/sys/arch/pica/include/pcb.h b/sys/arch/pica/include/pcb.h index 200a8d5a57e..717ed8682e8 100644 --- a/sys/arch/pica/include/pcb.h +++ b/sys/arch/pica/include/pcb.h @@ -1,3 +1,5 @@ +/* $OpenBSD: pcb.h,v 1.2 1996/06/06 23:06:55 deraadt Exp $ */ + /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -35,10 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: pcb.h 1.13 89/04/23 - * + * from: Utah Hdr: pcb.h 1.13 89/04/23 * from: @(#)pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: pcb.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $ */ /* diff --git a/sys/arch/pica/include/pccons.h b/sys/arch/pica/include/pccons.h index bd8899fa60b..ab377b9a71b 100644 --- a/sys/arch/pica/include/pccons.h +++ b/sys/arch/pica/include/pccons.h @@ -1,7 +1,8 @@ +/* $OpenBSD: pccons.h,v 1.3 1996/06/06 23:06:56 deraadt Exp $ */ + /* * pccons.h -- pccons ioctl definitions * - * $Id: pccons.h,v 1.2 1996/05/01 18:23:41 pefo Exp $ */ #ifndef _PCCONS_H_ diff --git a/sys/arch/pica/include/pio.h b/sys/arch/pica/include/pio.h index 80981ef743c..d56e7b8be03 100644 --- a/sys/arch/pica/include/pio.h +++ b/sys/arch/pica/include/pio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pio.h,v 1.3 1996/06/06 23:06:57 deraadt Exp $ */ /* $NetBSD: pio.h,v 1.11 1995/04/22 03:59:59 mycroft Exp $ */ /* diff --git a/sys/arch/pica/include/pmap.h b/sys/arch/pica/include/pmap.h index bc06048c681..d53fa0ce14f 100644 --- a/sys/arch/pica/include/pmap.h +++ b/sys/arch/pica/include/pmap.h @@ -1,3 +1,5 @@ +/* $OpenBSD: pmap.h,v 1.3 1996/06/06 23:06:59 deraadt Exp $ */ + /* * Copyright (c) 1987 Carnegie-Mellon University * Copyright (c) 1992, 1993 @@ -35,7 +37,6 @@ * SUCH DAMAGE. * * from: @(#)pmap.h 8.1 (Berkeley) 6/10/93 - * $Id: pmap.h,v 1.2 1996/05/01 18:23:46 pefo Exp $ */ #ifndef _PMAP_MACHINE_ diff --git a/sys/arch/pica/include/proc.h b/sys/arch/pica/include/proc.h index 202d9562314..4cdb693c301 100644 --- a/sys/arch/pica/include/proc.h +++ b/sys/arch/pica/include/proc.h @@ -1,3 +1,4 @@ +/* $OpenBSD: proc.h,v 1.2 1996/06/06 23:07:00 deraadt Exp $ */ /* $NetBSD: proc.h,v 1.4 1994/10/26 21:09:52 cgd Exp $ */ /* diff --git a/sys/arch/pica/include/profile.h b/sys/arch/pica/include/profile.h index 11e2d0ef118..821922edfc1 100644 --- a/sys/arch/pica/include/profile.h +++ b/sys/arch/pica/include/profile.h @@ -1,3 +1,5 @@ +/* $OpenBSD: profile.h,v 1.4 1996/06/06 23:07:01 deraadt Exp $ */ + /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -34,7 +36,6 @@ * SUCH DAMAGE. * * from: @(#)profile.h 8.1 (Berkeley) 6/10/93 - * $Id: profile.h,v 1.3 1996/05/01 18:23:48 pefo Exp $ */ #define _MCOUNT_DECL static void ___mcount diff --git a/sys/arch/pica/include/psl.h b/sys/arch/pica/include/psl.h index 80366abca5a..8de0bebec15 100644 --- a/sys/arch/pica/include/psl.h +++ b/sys/arch/pica/include/psl.h @@ -1,3 +1,5 @@ +/* $OpenBSD: psl.h,v 1.2 1996/06/06 23:07:03 deraadt Exp $ */ + /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -34,35 +36,34 @@ * SUCH DAMAGE. * * from: @(#)psl.h 8.1 (Berkeley) 6/10/93 - * $Id: psl.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $ */ #include <machine/machConst.h> -#define PSL_LOWIPL (MACH_INT_MASK | MACH_SR_INT_ENAB) +#define PSL_LOWIPL (INT_MASK | SR_INT_ENAB) #define PSL_USERSET ( \ - MACH_SR_KSU_USER | \ - MACH_SR_INT_ENAB | \ - MACH_SR_EXL | \ - MACH_INT_MASK) + SR_KSU_USER | \ + SR_INT_ENAB | \ + SR_EXL | \ + INT_MASK) #define PSL_USERCLR ( \ - MACH_SR_COP_USABILITY | \ - MACH_SR_BOOT_EXC_VEC | \ - MACH_SR_TLB_SHUTDOWN | \ - MACH_SR_PARITY_ERR | \ - MACH_SR_CACHE_MISS | \ - MACH_SR_PARITY_ZERO | \ - MACH_SR_SWAP_CACHES | \ - MACH_SR_ISOL_CACHES | \ - MACH_SR_KU_CUR | \ - MACH_SR_INT_ENA_CUR | \ - MACH_SR_MBZ) + SR_COP_USABILITY | \ + SR_BOOT_EXC_VEC | \ + SR_TLB_SHUTDOWN | \ + SR_PARITY_ERR | \ + SR_CACHE_MISS | \ + SR_PARITY_ZERO | \ + SR_SWAP_CACHES | \ + SR_ISOL_CACHES | \ + SR_KU_CUR | \ + SR_INT_ENA_CUR | \ + SR_MBZ) /* * Macros to decode processor status word. */ -#define USERMODE(ps) (((ps) & MACH_SR_KSU_MASK) == MACH_SR_KSU_USER) -#define BASEPRI(ps) (((ps) & (MACH_INT_MASK | MACH_SR_INT_ENA_PREV)) \ - == (MACH_INT_MASK | MACH_SR_INT_ENA_PREV)) +#define USERMODE(ps) (((ps) & SR_KSU_MASK) == SR_KSU_USER) +#define BASEPRI(ps) (((ps) & (INT_MASK | SR_INT_ENA_PREV)) \ + == (INT_MASK | SR_INT_ENA_PREV)) diff --git a/sys/arch/pica/include/pte.h b/sys/arch/pica/include/pte.h index 898b653b7ec..20fc65dd7d6 100644 --- a/sys/arch/pica/include/pte.h +++ b/sys/arch/pica/include/pte.h @@ -1,3 +1,5 @@ +/* $OpenBSD: pte.h,v 1.3 1996/06/06 23:07:04 deraadt Exp $ */ + /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -35,10 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: pte.h 1.11 89/09/03 - * + * from: Utah Hdr: pte.h 1.11 89/09/03 * from: @(#)pte.h 8.1 (Berkeley) 6/10/93 - * $Id: pte.h,v 1.2 1996/05/02 07:59:40 pefo Exp $ */ /* diff --git a/sys/arch/pica/include/ptrace.h b/sys/arch/pica/include/ptrace.h index 3605d68866f..3d780346db3 100644 --- a/sys/arch/pica/include/ptrace.h +++ b/sys/arch/pica/include/ptrace.h @@ -1,3 +1,5 @@ +/* $OpenBSD: ptrace.h,v 1.3 1996/06/06 23:07:06 deraadt Exp $ */ + /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +33,6 @@ * SUCH DAMAGE. * * from: @(#)ptrace.h 8.1 (Berkeley) 6/10/93 - * $Id: ptrace.h,v 1.2 1996/05/01 18:23:50 pefo Exp $ */ /* diff --git a/sys/arch/pica/include/reg.h b/sys/arch/pica/include/reg.h index f91820dc359..3f8361d5940 100644 --- a/sys/arch/pica/include/reg.h +++ b/sys/arch/pica/include/reg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: reg.h,v 1.3 1996/06/06 23:07:07 deraadt Exp $ */ /* $NetBSD: reg.h,v 1.6 1995/12/20 02:00:27 jonathan Exp $ */ /* @@ -37,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: reg.h 1.1 90/07/09 - * + * from: Utah Hdr: reg.h 1.1 90/07/09 * @(#)reg.h 8.2 (Berkeley) 1/11/94 */ diff --git a/sys/arch/pica/include/regdef.h b/sys/arch/pica/include/regdef.h index 46216b57d00..b30530af7e2 100644 --- a/sys/arch/pica/include/regdef.h +++ b/sys/arch/pica/include/regdef.h @@ -1,3 +1,4 @@ +/* $OpenBSD: regdef.h,v 1.2 1996/06/06 23:07:09 deraadt Exp $ */ /* $NetBSD: regdef.h,v 1.4 1994/10/26 21:09:58 cgd Exp $ */ /* diff --git a/sys/arch/pica/include/regnum.h b/sys/arch/pica/include/regnum.h index 506646d3b22..903d63d4f6c 100644 --- a/sys/arch/pica/include/regnum.h +++ b/sys/arch/pica/include/regnum.h @@ -1,3 +1,4 @@ +/* $OpenBSD: regnum.h,v 1.2 1996/06/06 23:07:10 deraadt Exp $ */ /* $NetBSD: reg.h,v 1.5 1995/01/18 06:40:12 mellon Exp $ */ /* @@ -37,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: reg.h 1.1 90/07/09 - * + * from: Utah Hdr: reg.h 1.1 90/07/09 * @(#)reg.h 8.2 (Berkeley) 1/11/94 */ diff --git a/sys/arch/pica/include/reloc.h b/sys/arch/pica/include/reloc.h index 4c5c5cd3ceb..df72d1580fc 100644 --- a/sys/arch/pica/include/reloc.h +++ b/sys/arch/pica/include/reloc.h @@ -1,3 +1,5 @@ +/* $OpenBSD: reloc.h,v 1.3 1996/06/06 23:07:12 deraadt Exp $ */ + /*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -31,9 +33,7 @@ * SUCH DAMAGE. * * from: @(#)reloc.h 8.1 (Berkeley) 6/10/93 - * $Id: reloc.h,v 1.2 1996/05/01 18:23:53 pefo Exp $ - * - * from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp + * from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp */ #if 0 diff --git a/sys/arch/pica/include/setjmp.h b/sys/arch/pica/include/setjmp.h index c50d15c79b5..c8dc96433a8 100644 --- a/sys/arch/pica/include/setjmp.h +++ b/sys/arch/pica/include/setjmp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: setjmp.h,v 1.2 1996/06/06 23:07:13 deraadt Exp $ */ /* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:37:05 cgd Exp $ */ /* diff --git a/sys/arch/pica/include/signal.h b/sys/arch/pica/include/signal.h index 9fa32788dc5..3b878ef68e0 100644 --- a/sys/arch/pica/include/signal.h +++ b/sys/arch/pica/include/signal.h @@ -1,3 +1,4 @@ +/* $OpenBSD: signal.h,v 1.2 1996/06/06 23:07:15 deraadt Exp $ */ /* $NetBSD: signal.h,v 1.6 1995/01/18 06:42:01 mellon Exp $ */ /* diff --git a/sys/arch/pica/include/stdarg.h b/sys/arch/pica/include/stdarg.h index 73f3b6e0a1a..14a640553f0 100644 --- a/sys/arch/pica/include/stdarg.h +++ b/sys/arch/pica/include/stdarg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: stdarg.h,v 1.2 1996/06/06 23:07:16 deraadt Exp $ */ /* $NetBSD: stdarg.h,v 1.7 1995/03/28 18:19:28 jtc Exp $ */ /*- diff --git a/sys/arch/pica/include/trap.h b/sys/arch/pica/include/trap.h index 2b977477b88..5513663f8f9 100644 --- a/sys/arch/pica/include/trap.h +++ b/sys/arch/pica/include/trap.h @@ -1,3 +1,5 @@ +/* $OpenBSD: trap.h,v 1.2 1996/06/06 23:07:18 deraadt Exp $ */ + /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -35,10 +37,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: trap.h 1.1 90/07/09 - * + * from: Utah Hdr: trap.h 1.1 90/07/09 * from: @(#)trap.h 8.1 (Berkeley) 6/10/93 - * $Id: trap.h,v 1.1 1995/10/18 10:39:15 deraadt Exp $ */ /* diff --git a/sys/arch/pica/include/types.h b/sys/arch/pica/include/types.h index 74135094d9b..543afe4c733 100644 --- a/sys/arch/pica/include/types.h +++ b/sys/arch/pica/include/types.h @@ -1,3 +1,4 @@ +/* $OpenBSD: types.h,v 1.4 1996/06/06 23:07:19 deraadt Exp $ */ /* $NetBSD: types.h,v 1.10 1995/07/06 03:39:43 cgd Exp $ */ /*- diff --git a/sys/arch/pica/include/varargs.h b/sys/arch/pica/include/varargs.h index 8cb900dc521..4d6cc865be1 100644 --- a/sys/arch/pica/include/varargs.h +++ b/sys/arch/pica/include/varargs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: varargs.h,v 1.3 1996/06/06 23:07:21 deraadt Exp $ */ /* $NetBSD: varargs.h,v 1.8 1995/03/28 18:19:30 jtc Exp $ */ /*- diff --git a/sys/arch/pica/include/vmparam.h b/sys/arch/pica/include/vmparam.h index a8b159f6ddf..9a7b5170f5b 100644 --- a/sys/arch/pica/include/vmparam.h +++ b/sys/arch/pica/include/vmparam.h @@ -1,3 +1,4 @@ +/* $OpenBSD: vmparam.h,v 1.3 1996/06/06 23:07:23 deraadt Exp $ */ /* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */ /* @@ -37,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: vmparam.h 1.16 91/01/18 - * + * from: Utah Hdr: vmparam.h 1.16 91/01/18 * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 */ |