diff options
Diffstat (limited to 'sys/arch')
62 files changed, 189 insertions, 326 deletions
diff --git a/sys/arch/mvme88k/conf/OFF b/sys/arch/mvme88k/conf/OFF index bc59ae932fd..eeb43a24148 100644 --- a/sys/arch/mvme88k/conf/OFF +++ b/sys/arch/mvme88k/conf/OFF @@ -1,6 +1,4 @@ -# -# This configuration file contains all possible options -# +# $OpenBSD: OFF,v 1.2 1999/02/09 06:36:24 smurph Exp $ machine mvme88k diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k index de53cfe1f1a..22cd80f2a4a 100644 --- a/sys/arch/mvme88k/conf/files.mvme88k +++ b/sys/arch/mvme88k/conf/files.mvme88k @@ -1,3 +1,5 @@ +# $OpenBSD: files.mvme88k,v 1.3 1999/02/09 06:36:24 smurph Exp $ +# maxpartitions 16 device mainbus { [addr = -1 ] } diff --git a/sys/arch/mvme88k/conf/std.mvme88k b/sys/arch/mvme88k/conf/std.mvme88k index e7d3749bdf5..54dbef6c782 100644 --- a/sys/arch/mvme88k/conf/std.mvme88k +++ b/sys/arch/mvme88k/conf/std.mvme88k @@ -1,5 +1,5 @@ # standard amiga information -# $Id: std.mvme88k,v 1.1 1997/03/03 19:31:52 rahnds Exp $ +# $OpenBSD: std.mvme88k,v 1.2 1999/02/09 06:36:24 smurph Exp $ machine mvme88k mainbus0 at root diff --git a/sys/arch/mvme88k/ddb/db_disasm.c b/sys/arch/mvme88k/ddb/db_disasm.c index 81cf53a4103..e425f6b9b68 100644 --- a/sys/arch/mvme88k/ddb/db_disasm.c +++ b/sys/arch/mvme88k/ddb/db_disasm.c @@ -1,3 +1,4 @@ +/* $OpenBSD: db_disasm.c,v 1.4 1999/02/09 06:36:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c index 771736702e8..99483202d57 100644 --- a/sys/arch/mvme88k/ddb/db_interface.c +++ b/sys/arch/mvme88k/ddb/db_interface.c @@ -1,3 +1,4 @@ +/* $OpenBSD: db_interface.c,v 1.4 1999/02/09 06:36:24 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/ddb/db_sstep.c b/sys/arch/mvme88k/ddb/db_sstep.c index db4115b55ea..b1020bc7868 100644 --- a/sys/arch/mvme88k/ddb/db_sstep.c +++ b/sys/arch/mvme88k/ddb/db_sstep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: db_sstep.c,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c index 8bac2cca018..b493dafacb9 100644 --- a/sys/arch/mvme88k/ddb/db_trace.c +++ b/sys/arch/mvme88k/ddb/db_trace.c @@ -1,3 +1,4 @@ +/* $OpenBSD: db_trace.c,v 1.5 1999/02/09 06:36:25 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index 2bdffc0af08..d811f61dc0e 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $Id: ansi.h,v 1.6 1997/07/07 05:56:38 millert Exp $ + * $Id: ansi.h,v 1.7 1999/02/09 06:36:25 smurph Exp $ */ #ifndef _ANSI_H_ @@ -54,6 +54,10 @@ #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int +#if 0 +#define _BSD_VA_LIST_ char* /* va_list */ +#endif + #include "va-m88k.h" #define _BSD_VA_LIST_ __gnuc_va_list diff --git a/sys/arch/mvme88k/include/asm_macro.h b/sys/arch/mvme88k/include/asm_macro.h index 87aac4b3276..18c13dbc363 100644 --- a/sys/arch/mvme88k/include/asm_macro.h +++ b/sys/arch/mvme88k/include/asm_macro.h @@ -1,3 +1,4 @@ +/* $OpenBSD: asm_macro.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -27,6 +28,9 @@ /* * HISTORY * $Log: asm_macro.h,v $ + * Revision 1.4 1999/02/09 06:36:25 smurph + * Added kernel support for user debugging. Fixed file ID's + * * Revision 1.3 1997/03/03 20:20:46 rahnds * Cleanup after import. This also seems to bring up the current version. * diff --git a/sys/arch/mvme88k/include/assert.h b/sys/arch/mvme88k/include/assert.h index c9e72557e77..fcdbab19465 100644 --- a/sys/arch/mvme88k/include/assert.h +++ b/sys/arch/mvme88k/include/assert.h @@ -1,3 +1,4 @@ +/* $OpenBSD: assert.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ #define assert(x) \ ({\ if (!(x)) {\ diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h index 2888bbb9d4a..872eee08278 100644 --- a/sys/arch/mvme88k/include/autoconf.h +++ b/sys/arch/mvme88k/include/autoconf.h @@ -1,4 +1,6 @@ +/* $OpenBSD: autoconf.h,v 1.5 1999/02/09 06:36:25 smurph Exp $ */ /* + * Copyright (c) 1999, Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur * All rights reserved. * diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h index 22011cbbb99..9a49db4625b 100644 --- a/sys/arch/mvme88k/include/board.h +++ b/sys/arch/mvme88k/include/board.h @@ -1,3 +1,4 @@ +/* $OpenBSD: board.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h index b1c3686f655..fe7e392948a 100644 --- a/sys/arch/mvme88k/include/bug.h +++ b/sys/arch/mvme88k/include/bug.h @@ -1,3 +1,4 @@ +/* $OpenBSD: bug.h,v 1.4 1999/02/09 06:36:25 smurph Exp $ */ #include <machine/bugio.h> struct bugenv { diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h index 1811d98f3e3..cb8acc2b609 100644 --- a/sys/arch/mvme88k/include/bugio.h +++ b/sys/arch/mvme88k/include/bugio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: bugio.h,v 1.5 1999/02/09 06:36:25 smurph Exp $ */ #include "sys/cdefs.h" struct bugdisk_io { diff --git a/sys/arch/mvme88k/include/cdefs.h b/sys/arch/mvme88k/include/cdefs.h index 36f4990a9cc..6b6bc88ea82 100644 --- a/sys/arch/mvme88k/include/cdefs.h +++ b/sys/arch/mvme88k/include/cdefs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cdefs.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ /* $NetBSD: cdefs.h,v 1.2 1995/03/23 20:10:48 jtc Exp $ */ /* diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h index 7b33d44b803..0f89b8fd389 100644 --- a/sys/arch/mvme88k/include/cpu.h +++ b/sys/arch/mvme88k/include/cpu.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cpu.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h index 14501d90f26..7724aaff5e6 100644 --- a/sys/arch/mvme88k/include/cpus.h +++ b/sys/arch/mvme88k/include/cpus.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cpus.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h index 59020d3b57e..e1025da235b 100644 --- a/sys/arch/mvme88k/include/db_machdep.h +++ b/sys/arch/mvme88k/include/db_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: db_machdep.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h index 493f04530d2..7bb8062799f 100644 --- a/sys/arch/mvme88k/include/disklabel.h +++ b/sys/arch/mvme88k/include/disklabel.h @@ -1,3 +1,4 @@ +/* $OpenBSD: disklabel.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1995 Dale Rahn. diff --git a/sys/arch/mvme88k/include/exception_vectors.h b/sys/arch/mvme88k/include/exception_vectors.h index f2730ff78a3..33cc037c2e5 100644 --- a/sys/arch/mvme88k/include/exception_vectors.h +++ b/sys/arch/mvme88k/include/exception_vectors.h @@ -1,3 +1,4 @@ +/* $OpenBSD: exception_vectors.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991, 1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h index b6b1a457ed9..e02b2e8166b 100644 --- a/sys/arch/mvme88k/include/exec.h +++ b/sys/arch/mvme88k/include/exec.h @@ -1,3 +1,4 @@ +/* $OpenBSD: exec.h,v 1.6 1999/02/09 06:36:26 smurph Exp $ */ #ifndef _MACHINE_EXEC_H_ #define _MACHINE_EXEC_H_ diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h index 9f842896d52..61c2fb97bef 100644 --- a/sys/arch/mvme88k/include/float.h +++ b/sys/arch/mvme88k/include/float.h @@ -1,4 +1,4 @@ -/* $NetBSD: float.h,v 1.10 1995/06/20 20:45:41 jtc Exp $ */ +/* $OpenBSD: float.h,v 1.3 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1989 Regents of the University of California. diff --git a/sys/arch/mvme88k/include/frame.h b/sys/arch/mvme88k/include/frame.h index f1f3323e4bb..e9288dca770 100644 --- a/sys/arch/mvme88k/include/frame.h +++ b/sys/arch/mvme88k/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.1 1998/12/15 04:45:50 smurph Exp $ */ +/* $OpenBSD: frame.h,v 1.2 1999/02/09 06:36:26 smurph Exp $ */ /* $NetBSD: frame.h,v 1.15 1997/05/03 12:49:05 mycroft Exp $ */ /* @@ -43,265 +43,19 @@ * @(#)frame.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _M68K_FRAME_H_ -#define _M68K_FRAME_H_ +#ifndef _M88K_FRAME_H_ +#define _M88K_FRAME_H_ struct frame { struct m88100_saved_state __attribute__((packed)) F_t; - union F_u { - struct fmt2 { - u_int f_iaddr; - } F_fmt2; - - struct fmt3 { - u_int f_ea; - } F_fmt3; - - struct fmt4 { - u_int f_fa; - u_int f_fslw; - /* for 060FP type 4 FP disabled frames: */ -#define f_fea f_fa -#define f_pcfi f_fslw - } F_fmt4; - - struct fmt7 { - u_int f_ea; - u_short f_ssw; - u_short f_wb3s, f_wb2s, f_wb1s; - u_int f_fa; - u_int f_wb3a, f_wb3d; - u_int f_wb2a, f_wb2d; - u_int f_wb1a, f_wb1d; -#define f_pd0 f_wb1d - u_int f_pd1, f_pd2, f_pd3; - } F_fmt7; - - struct fmt9 { - u_int f_iaddr; - u_short f_iregs[4]; - } F_fmt9; - - struct fmtA { - u_short f_ir0; - u_short f_ssw; - u_short f_ipsc; - u_short f_ipsb; - u_int f_dcfa; - u_short f_ir1, f_ir2; - u_int f_dob; - u_short f_ir3, f_ir4; - } F_fmtA; - - struct fmtB { - u_short f_ir0; - u_short f_ssw; - u_short f_ipsc; - u_short f_ipsb; - u_int f_dcfa; - u_short f_ir1, f_ir2; - u_int f_dob; - u_short f_ir3, f_ir4; - u_short f_ir5, f_ir6; - u_int f_sba; - u_short f_ir7, f_ir8; - u_int f_dib; - u_short f_iregs[22]; - } F_fmtB; - } F_u; }; -#define f_regs F_t.tf_regs -#define f_pad F_t.tf_pad -#define f_stackadj F_t.tf_stackadj -#define f_sr F_t.tf_sr -#define f_pc F_t.tf_pc -#define f_format F_t.tf_format -#define f_vector F_t.tf_vector -#define f_fmt2 F_u.F_fmt2 -#define f_fmt3 F_u.F_fmt3 -#define f_fmt4 F_u.F_fmt4 -#define f_fmt7 F_u.F_fmt7 -#define f_fmt9 F_u.F_fmt9 -#define f_fmtA F_u.F_fmtA -#define f_fmtB F_u.F_fmtB - -#if 0 -struct switchframe { - u_int sf_pc; -}; -#endif /* common frame size */ -#define CFSIZE (sizeof(struct frame) - sizeof(union F_u)) -#define NFMTSIZE 9 - -#define FMT0 0x0 -#define FMT1 0x1 -#define FMT2 0x2 -#define FMT3 0x3 -#define FMT4 0x4 -#define FMT7 0x7 -#define FMT9 0x9 -#define FMTA 0xA -#define FMTB 0xB - -/* frame specific info sizes */ -#define FMT0SIZE 0 -#define FMT1SIZE 0 -#define FMT2SIZE sizeof(struct fmt2) -#define FMT3SIZE sizeof(struct fmt3) -#define FMT4SIZE sizeof(struct fmt4) -#define FMT7SIZE sizeof(struct fmt7) -#define FMT9SIZE sizeof(struct fmt9) -#define FMTASIZE sizeof(struct fmtA) -#define FMTBSIZE sizeof(struct fmtB) +#define CFSIZE (sizeof(struct frame)) #define V_BUSERR 0x008 #define V_ADDRERR 0x00C #define V_TRAP1 0x084 -/* 68020/68030 SSW bits */ -#define SSW_RC 0x2000 -#define SSW_RB 0x1000 -#define SSW_DF 0x0100 -#define SSW_RM 0x0080 -#define SSW_RW 0x0040 -#define SSW_FCMASK 0x0007 - -/* 68040 SSW bits */ -#define SSW4_CP 0x8000 -#define SSW4_CU 0x4000 -#define SSW4_CT 0x2000 -#define SSW4_CM 0x1000 -#define SSW4_MA 0x0800 -#define SSW4_ATC 0x0400 -#define SSW4_LK 0x0200 -#define SSW4_RW 0x0100 -#define SSW4_WBSV 0x0080 /* really in WB status, not SSW */ -#define SSW4_SZMASK 0x0060 -#define SSW4_SZLW 0x0000 -#define SSW4_SZB 0x0020 -#define SSW4_SZW 0x0040 -#define SSW4_SZLN 0x0060 -#define SSW4_TTMASK 0x0018 -#define SSW4_TTNOR 0x0000 -#define SSW4_TTM16 0x0008 -#define SSW4_TMMASK 0x0007 -#define SSW4_TMDCP 0x0000 -#define SSW4_TMUD 0x0001 -#define SSW4_TMUC 0x0002 -#define SSW4_TMKD 0x0005 -#define SSW4_TMKC 0x0006 - -/* 060 Fault Status Long Word (FPSP) */ - -#define FSLW_MA 0x08000000 -#define FSLW_LK 0x02000000 -#define FSLW_RW 0x01800000 - -#define FSLW_RW_R 0x01000000 -#define FSLW_RW_W 0x00800000 - -#define FSLW_SIZE 0x00600000 -/* - * We better define the FSLW_SIZE values here, as the table given in the - * MC68060UM/AD rev. 0/1 p. 8-23 is wrong, and was corrected in the errata - * document. - */ -#define FSLW_SIZE_LONG 0x00000000 -#define FSLW_SIZE_BYTE 0x00200000 -#define FSLW_SIZE_WORD 0x00400000 -#define FSLW_SIZE_MV16 0x00600000 - -#define FLSW_TT 0x00180000 -#define FSLW_TM 0x00070000 -#define FSLW_TM_SV 0x00040000 - - - -#define FSLW_IO 0x00008000 -#define FSLW_PBE 0x00004000 -#define FSLW_SBE 0x00002000 -#define FSLW_PTA 0x00001000 -#define FSLW_PTB 0x00000800 -#define FSLW_IL 0x00000400 -#define FSLW_PF 0x00000200 -#define FSLW_SP 0x00000100 -#define FSLW_WP 0x00000080 -#define FSLW_TWE 0x00000040 -#define FSLW_RE 0x00000020 -#define FSLW_WE 0x00000010 -#define FSLW_TTR 0x00000008 -#define FSLW_BPE 0x00000004 -#define FSLW_SEE 0x00000001 - -struct fpframe { - union FPF_u1 { - u_int FPF_null; - struct { - u_char FPF_version; - u_char FPF_fsize; - u_short FPF_res1; - } FPF_nonnull; - } FPF_u1; - union FPF_u2 { - struct fpidle { - u_short fpf_ccr; - u_short fpf_res2; - u_int fpf_iregs1[8]; - u_int fpf_xops[3]; - u_int fpf_opreg; - u_int fpf_biu; - } FPF_idle; - - struct fpbusy { - u_int fpf_iregs[53]; - } FPF_busy; - - struct fpunimp { - u_int fpf_state[10]; - } FPF_unimp; - } FPF_u2; - u_int fpf_regs[8*3]; - u_int fpf_fpcr; - u_int fpf_fpsr; - u_int fpf_fpiar; -}; - -#define fpf_null FPF_u1.FPF_null -#define fpf_version FPF_u1.FPF_nonnull.FPF_version -#define fpf_fsize FPF_u1.FPF_nonnull.FPF_fsize -#define fpf_res1 FPF_u1.FPF_nonnull.FPF_res1 -#define fpf_idle FPF_u2.FPF_idle -#define fpf_busy FPF_u2.FPF_busy -#define fpf_unimp FPF_u2.FPF_unimp - -/* - * This is incompatible with the earlier one; expecially, an earlier frame - * must not be FRESTOREd on a 060 or vv, because a frame error exception is - * not guaranteed. - */ - - -struct fpframe060 { - u_short fpf6_excp_exp; - u_char fpf6_frmfmt; -#define FPF6_FMT_NULL 0x00 -#define FPF6_FMT_IDLE 0x60 -#define FPF6_FMT_EXCP 0xe0 - - u_char fpf6_v; -#define FPF6_V_BSUN 0 -#define FPF6_V_INEX12 1 -#define FPF6_V_DZ 2 -#define FPF6_V_UNFL 3 -#define FPF6_V_OPERR 4 -#define FPF6_V_OVFL 5 -#define FPF6_V_SNAN 6 -#define FPF6_V_UNSUP 7 - - u_long fpf6_upper, fpf6_lower; -}; - -#endif /* _M68K_FRAME_H_ */ +#endif /* _M88K_FRAME_H_ */ diff --git a/sys/arch/mvme88k/include/ieee.h b/sys/arch/mvme88k/include/ieee.h index 8e9534b5ef0..8dab48a930e 100644 --- a/sys/arch/mvme88k/include/ieee.h +++ b/sys/arch/mvme88k/include/ieee.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ieee.h,v 1.2 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/arch/mvme88k/include/ieeefp.h b/sys/arch/mvme88k/include/ieeefp.h index 570e7ee5899..9d7fad08b96 100644 --- a/sys/arch/mvme88k/include/ieeefp.h +++ b/sys/arch/mvme88k/include/ieeefp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ieeefp.h,v 1.2 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. diff --git a/sys/arch/mvme88k/include/limits.h b/sys/arch/mvme88k/include/limits.h index 40be1ed4dfb..9a179180f49 100644 --- a/sys/arch/mvme88k/include/limits.h +++ b/sys/arch/mvme88k/include/limits.h @@ -1,3 +1,4 @@ +/* $OpenBSD: limits.h,v 1.7 1999/02/09 06:36:26 smurph Exp $ */ /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $Id: limits.h,v 1.6 1998/12/15 04:45:50 smurph Exp $ + * $Id: limits.h,v 1.7 1999/02/09 06:36:26 smurph Exp $ */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h index 8b673c20ecc..61ac8d131f1 100644 --- a/sys/arch/mvme88k/include/locore.h +++ b/sys/arch/mvme88k/include/locore.h @@ -1,3 +1,4 @@ +/* $OpenBSD: locore.h,v 1.5 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/m88100.h b/sys/arch/mvme88k/include/m88100.h index eb047bb08e0..c29497bab98 100644 --- a/sys/arch/mvme88k/include/m88100.h +++ b/sys/arch/mvme88k/include/m88100.h @@ -1,3 +1,4 @@ +/* $OpenBSD: m88100.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/m882xx.h b/sys/arch/mvme88k/include/m882xx.h index 4c9759db1bc..70c541ec52f 100644 --- a/sys/arch/mvme88k/include/m882xx.h +++ b/sys/arch/mvme88k/include/m882xx.h @@ -1,3 +1,4 @@ +/* $OpenBSD: m882xx.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h index b172c595e6e..5cbfd35facf 100644 --- a/sys/arch/mvme88k/include/mmu.h +++ b/sys/arch/mvme88k/include/mmu.h @@ -1,3 +1,4 @@ +/* $OpenBSD: mmu.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Ashura Project */ diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index ff24b77c0a7..34ecc00afe4 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,6 @@ +/* $OpenBSD: param.h,v 1.8 1999/02/09 06:36:27 smurph Exp $ */ /* + * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. * All rights reserved. @@ -38,14 +40,14 @@ * from: Utah $Hdr: machparam.h 1.11 89/08/14$ * * @(#)param.h 7.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.7 1998/12/15 04:45:50 smurph Exp $ + * $Id: param.h,v 1.8 1999/02/09 06:36:27 smurph Exp $ */ #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ -#define _MACHINE "mvme88k" +#define _MACHINE mvme88k #define MACHINE "mvme88k" -#define _MACHINE_ARCH "m88k" +#define _MACHINE_ARCH m88k #define MACHINE_ARCH "m88k" #define MID_MACHINE MID_M88K @@ -56,17 +58,10 @@ * aligning stack, which needs to be on a double word boundary for * 88k. */ -/*#define ALIGNBYTES (sizeof(int) - 1)*/ -#define ALIGNBYTES 15 -/* Stack alignment upon a double word boundary proves deadly */ -#define DOUBLE_ALIGN 1 -#ifdef DOUBLE_ALIGN -/*#define ALIGN(p) (((u_int)(p) + (sizeof(double) - 1)) & ~(sizeof(double) - 1))*/ +#define ALIGNBYTES 15 /* 64 bit alignment */ #define ALIGN(p) (((u_int)(p) + ALIGNBYTES) & ~ALIGNBYTES) -#else /* 16 byte alignment works */ -#define ALIGN(p) (((u_int)(p) + ((sizeof(double)*2) - 1)) & ~((sizeof(double)*2) - 1)) -#endif +#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) #ifndef NBPG #define NBPG 4096 /* bytes/page */ @@ -125,9 +120,9 @@ #define MCLOFSET (MCLBYTES - 1) #ifndef NMBCLUSTERS #ifdef GATEWAY -#define NMBCLUSTERS 512 /* map size, max cluster allocation */ +#define NMBCLUSTERS 1024 /* map size, max cluster allocation */ #else -#define NMBCLUSTERS 256 /* map size, max cluster allocation */ +#define NMBCLUSTERS 512 /* map size, max cluster allocation */ #endif #endif @@ -135,7 +130,7 @@ * Size of kernel malloc arena in CLBYTES-sized logical pages */ #ifndef NKMEMCLUSTERS -#define NKMEMCLUSTERS (3072*1024/CLBYTES) +#define NKMEMCLUSTERS (4096*1024/CLBYTES) #endif /* pages ("clicks") to disk blocks */ diff --git a/sys/arch/mvme88k/include/pcb.h b/sys/arch/mvme88k/include/pcb.h index 65437b1718a..ac9901274d6 100644 --- a/sys/arch/mvme88k/include/pcb.h +++ b/sys/arch/mvme88k/include/pcb.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pcb.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Mach Operating System diff --git a/sys/arch/mvme88k/include/pcctworeg.h b/sys/arch/mvme88k/include/pcctworeg.h index b029797bd54..f6e5a23f649 100644 --- a/sys/arch/mvme88k/include/pcctworeg.h +++ b/sys/arch/mvme88k/include/pcctworeg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pcctworeg.h,v 1.5 1999/02/09 06:36:27 smurph Exp $ */ /* * Memory map for PCC2 chip found in mvme1x7 boards. * diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 6c668937282..839727e5d8d 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.h,v 1.5 1999/02/09 06:36:27 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h index 555789144ac..074608d3e14 100644 --- a/sys/arch/mvme88k/include/pmap_table.h +++ b/sys/arch/mvme88k/include/pmap_table.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap_table.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/proc.h b/sys/arch/mvme88k/include/proc.h index a58ed3cee42..b283c4a72ff 100644 --- a/sys/arch/mvme88k/include/proc.h +++ b/sys/arch/mvme88k/include/proc.h @@ -1,3 +1,4 @@ +/* $OpenBSD: proc.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -42,7 +43,7 @@ * @(#)proc.h 8.1 (Berkeley) 6/11/93 * * from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp (LBL) - * $Id: proc.h,v 1.3 1997/03/03 20:21:10 rahnds Exp $ + * $Id: proc.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ #include <machine/pcb.h> diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h index 6e366a01a96..646f49dda03 100644 --- a/sys/arch/mvme88k/include/profile.h +++ b/sys/arch/mvme88k/include/profile.h @@ -1,3 +1,4 @@ +/* $OpenBSD: profile.h,v 1.7 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -32,7 +33,7 @@ * SUCH DAMAGE. * * from: @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.6 1997/03/25 17:07:37 rahnds Exp $ + * $Id: profile.h,v 1.7 1999/02/09 06:36:27 smurph Exp $ */ #define _MCOUNT_DECL static inline void _mcount diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h index 3847fa03eea..015c65a3c54 100644 --- a/sys/arch/mvme88k/include/prom.h +++ b/sys/arch/mvme88k/include/prom.h @@ -1,6 +1,6 @@ -/* $NetBSD$ */ - +/* $OpenBSD: prom.h,v 1.3 1999/02/09 06:36:27 smurph Exp $ */ /* + * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1995 Theo de Raadt * All rights reserved. diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h index 9205c933d00..98112abfb8f 100644 --- a/sys/arch/mvme88k/include/psl.h +++ b/sys/arch/mvme88k/include/psl.h @@ -1,3 +1,4 @@ +/* $OpenBSD: psl.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -110,16 +111,23 @@ above... /* * processor status register */ +#ifndef PSR_MODE #define PSR_MODE 0x80000000U /* supervisor/user mode */ +#endif #define PSR_BO 0x40000000U /* byte-ordering 0:big 1:little */ #define PSR_SER 0x20000000U /* serial mode */ #define PSR_C 0x10000000U /* carry */ #define PSR_SFD 0x000003F0U /* SFU disable */ #define PSR_SFD1 0x00000008U /* SFU1 (FPU) disable */ +#ifndef PSR_MXM #define PSR_MXM 0x00000004U /* misaligned access enable */ +#endif +#ifndef PSR_IND #define PSR_IND 0x00000002U /* interrupt disable */ +#endif +#ifndef PSR_SFRZ #define PSR_SFRZ 0x00000001U /* shadow freeze */ - +#endif /* * This is used in ext_int() and hard_clock(). */ diff --git a/sys/arch/mvme88k/include/pte.h b/sys/arch/mvme88k/include/pte.h index ce0896cbbc1..7757aad7f07 100644 --- a/sys/arch/mvme88k/include/pte.h +++ b/sys/arch/mvme88k/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.1 1998/12/15 04:45:50 smurph Exp $ */ +/* $OpenBSD: pte.h,v 1.2 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -49,7 +49,7 @@ * m88k hardware segment/page table entries */ -#if 0 +#if 0 /* FIXME */ struct ste { unsigned int sg_pfnum:20; /* page table frame number */ unsigned int :8; /* reserved at 0 */ @@ -78,12 +78,12 @@ struct pte { unsigned int pg_prot:1; /* write protect bit */ unsigned int pg_v:2; /* valid bit */ }; -#endif +#endif /* 0 */ -#if 0 +#if 0 /* FIXME */ typedef int st_entry_t; /* segment table entry */ typedef int pt_entry_t; /* Mach page table entry */ -#endif +#endif /* 0 */ #define PT_ENTRY_NULL ((pt_entry_t *) 0) #define ST_ENTRY_NULL ((st_entry_t *) 0) @@ -100,19 +100,6 @@ typedef int pt_entry_t; /* Mach page table entry */ #define SG_PMASK 0x003ff000 #define SG_PSHIFT 12 -/* 68040 additions */ -#define SG4_MASK1 0xfe000000 -#define SG4_SHIFT1 25 -#define SG4_MASK2 0x01fc0000 -#define SG4_SHIFT2 18 -#define SG4_MASK3 0x0003f000 -#define SG4_SHIFT3 12 -#define SG4_ADDR1 0xfffffe00 -#define SG4_ADDR2 0xffffff00 -#define SG4_LEV1SIZE 128 -#define SG4_LEV2SIZE 128 -#define SG4_LEV3SIZE 64 - #define PG_V 0x00000001 #define PG_NV 0x00000000 #define PG_PROT 0x00000004 @@ -126,31 +113,26 @@ typedef int pt_entry_t; /* Mach page table entry */ #define PG_SHIFT 12 #define PG_PFNUM(x) (((x) & PG_FRAME) >> PG_SHIFT) -/* 68040 additions */ -#define PG_CMASK 0x00000060 /* cache mode mask */ -#define PG_CWT 0x00000000 /* writethrough caching */ -#define PG_CCB 0x00000020 /* copyback caching */ -#define PG_CIS 0x00000040 /* cache inhibited serialized */ -#define PG_CIN 0x00000060 /* cache inhibited nonserialized */ -#define PG_SO 0x00000080 /* supervisor only */ - -#define M68K_STSIZE (MAXUL2SIZE*SG4_LEV2SIZE*sizeof(st_entry_t)) +#if 0 /* FIXME */ +#define M88K_STSIZE (MAXUL2SIZE*SG4_LEV2SIZE*sizeof(st_entry_t)) /* user process segment table size */ -#define M68K_MAX_PTSIZE 0x400000 /* max size of UPT */ -#define M68K_MAX_KPTSIZE 0x100000 /* max memory to allocate to KPT */ -#define M68K_PTBASE 0x10000000 /* UPT map base address */ -#define M68K_PTMAXSIZE 0x70000000 /* UPT map maximum size */ +#define M88K_MAX_PTSIZE 0x400000 /* max size of UPT */ +#define M88K_MAX_KPTSIZE 0x100000 /* max memory to allocate to KPT */ +#define M88K_PTBASE 0x10000000 /* UPT map base address */ +#define M88K_PTMAXSIZE 0x70000000 /* UPT map maximum size */ +#endif /* 0 */ /* * Kernel virtual address to page table entry and to physical address. */ -/* +#if 0 /* FIXME */ #define kvtopte(va) \ (&Sysmap[((unsigned)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT]) #define ptetokv(pt) \ ((((pt_entry_t *)(pt) - Sysmap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS) #define kvtophys(va) \ ((kvtopte(va)->pg_pfnum << PGSHIFT) | ((int)(va) & PGOFSET)) -*/ -#endif /* !_MVME68K_PTE_H_ */ +#endif /* 0 */ + +#endif /* !_MVME88K_PTE_H_ */ diff --git a/sys/arch/mvme88k/include/ptrace.h b/sys/arch/mvme88k/include/ptrace.h index ff20fff9a60..347494aaa76 100644 --- a/sys/arch/mvme88k/include/ptrace.h +++ b/sys/arch/mvme88k/include/ptrace.h @@ -1,4 +1,6 @@ +/* $OpenBSD: ptrace.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* + * Copyright (c) 1999, Steve Murphree, Jr. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -42,13 +44,15 @@ * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 * * from: Header: ptrace.h,v 1.6 92/11/26 02:04:43 torek Exp (LBL) - * $Id: ptrace.h,v 1.3 1997/03/03 20:21:13 rahnds Exp $ + * $Id: ptrace.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * m88k-dependent ptrace definitions. */ -#define PT_GETREGS (PT_FIRSTMACH + 0) -#define PT_SETREGS (PT_FIRSTMACH + 1) -#define PT_GETFPREGS (PT_FIRSTMACH + 2) -#define PT_SETFPREGS (PT_FIRSTMACH + 3) + +#define PT_STEP (PT_FIRSTMACH + 0) +#define PT_GETREGS (PT_FIRSTMACH + 1) +#define PT_SETREGS (PT_FIRSTMACH + 2) +#define PT_GETFPREGS (PT_FIRSTMACH + 3) +#define PT_SETFPREGS (PT_FIRSTMACH + 4) diff --git a/sys/arch/mvme88k/include/reg.h b/sys/arch/mvme88k/include/reg.h index 3d5034c5fda..4908226d539 100644 --- a/sys/arch/mvme88k/include/reg.h +++ b/sys/arch/mvme88k/include/reg.h @@ -1,4 +1,6 @@ +/* $OpenBSD: reg.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* + * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur * All rights reserved. * diff --git a/sys/arch/mvme88k/include/setjmp.h b/sys/arch/mvme88k/include/setjmp.h index ac2959d3b3e..156329b3b38 100644 --- a/sys/arch/mvme88k/include/setjmp.h +++ b/sys/arch/mvme88k/include/setjmp.h @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:37:10 cgd Exp $ */ +/* $OpenBSD: setjmp.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * machine/setjmp.h: machine dependent setjmp-related information. diff --git a/sys/arch/mvme88k/include/signal.h b/sys/arch/mvme88k/include/signal.h index 82152bb26b8..0f7c9f26b9c 100644 --- a/sys/arch/mvme88k/include/signal.h +++ b/sys/arch/mvme88k/include/signal.h @@ -1,3 +1,4 @@ +/* $OpenBSD: signal.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h index df565c086ce..9cf21334511 100644 --- a/sys/arch/mvme88k/include/trap.h +++ b/sys/arch/mvme88k/include/trap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: trap.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/include/vmparam.h b/sys/arch/mvme88k/include/vmparam.h index fe1809fac41..44e13ded0b4 100644 --- a/sys/arch/mvme88k/include/vmparam.h +++ b/sys/arch/mvme88k/include/vmparam.h @@ -1,3 +1,4 @@ +/* $OpenBSD: vmparam.h,v 1.5 1999/02/09 06:36:27 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c index f5ea7ec9121..0fc1eb1fd62 100644 --- a/sys/arch/mvme88k/mvme88k/conf.c +++ b/sys/arch/mvme88k/mvme88k/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.28 1995/04/19 22:37:27 mycroft Exp $ */ +/* $OpenBSD: conf.c,v 1.10 1999/02/09 06:36:28 smurph Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c index 2e860c67755..5d09855a35f 100644 --- a/sys/arch/mvme88k/mvme88k/disksubr.c +++ b/sys/arch/mvme88k/mvme88k/disksubr.c @@ -1,3 +1,4 @@ +/* $OpenBSD: disksubr.c,v 1.9 1999/02/09 06:36:28 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -96,6 +97,70 @@ dk_establish(dk, dev) * (e.g., sector size) must be filled in before calling us. * Returns null on success and an error string on failure. */ + +char * +readdisklabel(dev, strat, lp, clp, spoofonly) + dev_t dev; + void (*strat)(); + struct disklabel *lp; + struct cpu_disklabel *clp; + int spoofonly; +{ + struct buf *bp; + char *msg = NULL; + + /* minimal requirements for archetypal disk label */ + if (lp->d_secsize == 0) + lp->d_secsize = DEV_BSIZE; + if (lp->d_secperunit == 0) + lp->d_secperunit = 0x1fffffff; + lp->d_npartitions = RAW_PART + 1; + if (lp->d_partitions[RAW_PART].p_size == 0) + lp->d_partitions[RAW_PART].p_size = lp->d_secperunit; + lp->d_partitions[RAW_PART].p_offset = 0; + + /* don't read the on-disk label if we are in spoofed-only mode */ + if (spoofonly) + return (NULL); + + /* obtain buffer to probe drive with */ + bp = geteblk((int)lp->d_secsize); + + /* request no partition relocation by driver on I/O operations */ + bp->b_dev = dev; + bp->b_blkno = 0; /* contained in block 0 */ + bp->b_bcount = lp->d_secsize; + bp->b_flags = B_BUSY | B_READ; + bp->b_cylin = 0; /* contained in block 0 */ + (*strat)(bp); + + if (biowait(bp)) { + msg = "cpu_disklabel read error\n"; + } else { + bcopy(bp->b_data, clp, sizeof (struct cpu_disklabel)); + } + + bp->b_flags = B_INVAL | B_AGE | B_READ; + brelse(bp); + + if (msg) { +#if defined(CD9660) + if (iso_disklabelspoof(dev, strat, lp) == 0) + msg = NULL; +#endif + return (msg); + } + cputobsdlabel(lp, clp); +#ifdef DEBUG + if (disksubr_debug > 0) { + printlp(lp, "readdisklabel:bsd label"); + printclp(clp, "readdisklabel:cpu label"); + } +#endif + return (msg); +} + +#if 0 char * readdisklabel(dev, strat, lp, clp) dev_t dev; @@ -144,6 +209,7 @@ readdisklabel(dev, strat, lp, clp) return (msg); } +#endif /* 0 */ /* * Check new disk label for sensibility * before setting it. diff --git a/sys/arch/mvme88k/mvme88k/dkbad.c b/sys/arch/mvme88k/mvme88k/dkbad.c index c938396db16..84357e9decc 100644 --- a/sys/arch/mvme88k/mvme88k/dkbad.c +++ b/sys/arch/mvme88k/mvme88k/dkbad.c @@ -1,4 +1,4 @@ -/* $NetBSD: dkbad.c,v 1.4 1994/10/26 07:25:33 cgd Exp $ */ +/* $OpenBSD: dkbad.c,v 1.2 1999/02/09 06:36:28 smurph Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S index 687a46d6083..00da4a56d3d 100644 --- a/sys/arch/mvme88k/mvme88k/eh.S +++ b/sys/arch/mvme88k/mvme88k/eh.S @@ -1,3 +1,4 @@ +/* $OpenBSD: eh.S,v 1.6 1999/02/09 06:36:28 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/mvme88k/genassym.c b/sys/arch/mvme88k/mvme88k/genassym.c index 297b42b71de..7ef19c706b7 100644 --- a/sys/arch/mvme88k/mvme88k/genassym.c +++ b/sys/arch/mvme88k/mvme88k/genassym.c @@ -1,3 +1,4 @@ +/* $OpenBSD: genassym.c,v 1.4 1999/02/09 06:36:28 smurph Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. * All rights reserved. @@ -31,7 +32,7 @@ * SUCH DAMAGE. * * @(#)genassym.c 7.8 (Berkeley) 5/7/91 - * $Id: genassym.c,v 1.3 1997/03/03 20:21:34 rahnds Exp $ + * $Id: genassym.c,v 1.4 1999/02/09 06:36:28 smurph Exp $ */ #ifndef KERNEL diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S index 94dc074e894..e5e00519946 100644 --- a/sys/arch/mvme88k/mvme88k/locore.S +++ b/sys/arch/mvme88k/mvme88k/locore.S @@ -1,3 +1,4 @@ +/* $OpenBSD: locore.S,v 1.7 1999/02/09 06:36:28 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur diff --git a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S index 2f4d92a856e..cb7857a4178 100644 --- a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S +++ b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S @@ -1,3 +1,4 @@ +/* $OpenBSD: locore_asm_routines.S,v 1.6 1999/02/09 06:36:28 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c index 9f90844409e..37b91989349 100644 --- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c +++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c @@ -1,3 +1,4 @@ +/* $OpenBSD: locore_c_routines.c,v 1.5 1999/02/09 06:36:28 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -296,7 +297,7 @@ void vector_init( num++; /* skip 496, BUG ROM vector */ SET_VECTOR(450, to, syscall_handler); -#if 0 + while (num <= SIGSYS_MAX) SET_VECTOR(num++, to, sigsys); @@ -305,6 +306,7 @@ void vector_init( SET_VECTOR(504, to, stepbpt); SET_VECTOR(511, to, userbpt); +#if 0 vector[496].word_one = 496 * 4; vector[497].word_two = 497 * 4; #endif diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S index 20bdb27245b..54bdf2e737d 100644 --- a/sys/arch/mvme88k/mvme88k/m88100_fp.S +++ b/sys/arch/mvme88k/mvme88k/m88100_fp.S @@ -1,3 +1,4 @@ +/* $OpenBSD: m88100_fp.S,v 1.5 1999/02/09 06:36:29 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index c621af82494..9c9272ef92f 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: machdep.c,v 1.11 1999/02/09 06:36:29 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c index e177f2c8bb3..c7121fbd9c5 100644 --- a/sys/arch/mvme88k/mvme88k/mem.c +++ b/sys/arch/mvme88k/mvme88k/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.11 1995/05/29 23:57:16 pk Exp $ */ +/* $OpenBSD: mem.c,v 1.3 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1988 University of Utah. diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index 70738631e2b..bac606c48a9 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.c,v 1.6 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S index 40dfb3c4045..a58707d6c81 100644 --- a/sys/arch/mvme88k/mvme88k/process.S +++ b/sys/arch/mvme88k/mvme88k/process.S @@ -1,3 +1,4 @@ +/* $OpenBSD: process.S,v 1.5 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. diff --git a/sys/arch/mvme88k/mvme88k/process_machdep.c b/sys/arch/mvme88k/mvme88k/process_machdep.c index 8edc1ffbc7e..d58e2725390 100644 --- a/sys/arch/mvme88k/mvme88k/process_machdep.c +++ b/sys/arch/mvme88k/mvme88k/process_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: process_machdep.c,v 1.5 1994/11/20 20:54:37 deraadt Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.5 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1993 The Regents of the University of California. diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c index 02a2fc98dc5..53eab7da4b8 100644 --- a/sys/arch/mvme88k/mvme88k/trap.c +++ b/sys/arch/mvme88k/mvme88k/trap.c @@ -1,3 +1,4 @@ +/* $OpenBSD: trap.c,v 1.6 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -511,7 +512,6 @@ trap(unsigned type, struct m88100_saved_state *frame) * breakpoint debugging. When we get this trap, we just * return a signal which gets caught by the debugger. */ - frame->sfip = frame->snip; /* set up the next FIP */ frame->snip = frame->sxip; /* set up the next NIP */ sig = SIGTRAP; diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c index 7b53aefa791..0c482250d07 100644 --- a/sys/arch/mvme88k/mvme88k/vm_machdep.c +++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: vm_machdep.c,v 1.7 1999/02/09 06:36:30 smurph Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -41,7 +42,7 @@ * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$ * from: @(#)vm_machdep.c 7.10 (Berkeley) 5/7/91 * vm_machdep.c,v 1.3 1993/07/07 07:09:32 cgd Exp - * $Id: vm_machdep.c,v 1.6 1999/01/10 13:34:18 niklas Exp $ + * $Id: vm_machdep.c,v 1.7 1999/02/09 06:36:30 smurph Exp $ */ #include <sys/param.h> |