BSD 4_4 release

[unix-history] / usr / src / sys / luna68k / luna68k / pte.h

diff --git a/usr/src/sys/luna68k/luna68k/pte.h b/usr/src/sys/luna68k/luna68k/pte.h
index 26e8ba5..a94026d 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/pte.h
+++ b/usr/src/sys/luna68k/luna68k/pte.h
@@ -1,21 +1,45 @@
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992 OMRON Corporation.
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992 OMRON Corporation.

- * Copyright (c) 1982, 1986, 1990, 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1990, 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- * from: Utah $Hdr: pte.h 1.13 92/01/20$
- * OMRON: $Id: pte.h,v 1.2 92/06/14 06:22:11 moti Exp $
+ * 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: hp300/hp300/pte.h     7.1 (Berkeley) 6/4/92
+ * from: Utah $Hdr: pte.h 1.13 92/01/20$
+ * from: hp300/hp300/pte.h     7.4 (Berkeley) 6/5/92

  *
  *

- *     @(#)pte.h       7.1 (Berkeley) %G%
+ *     @(#)pte.h       8.1 (Berkeley) 6/10/93

  */
 
 /*
  */
 
 /*


@@ -30,6 +54,14 @@ struct ste {
        unsigned int    sg_v:2;         /* valid bits */
 };
 
        unsigned int    sg_v:2;         /* valid bits */
 };
 

+struct ste40 {
+       unsigned int    sg_ptaddr:24;   /* page table page addr */
+       unsigned int    :4;             /* reserved at 0 */
+       unsigned int    sg_u;           /* hardware modified (dirty) bit */
+       unsigned int    sg_prot:1;      /* write protect bit */
+       unsigned int    sg_v:2;         /* valid bits */
+};
+

 struct pte {
        unsigned int    pg_pfnum:20;    /* page frame number or 0 */
        unsigned int    :3;
 struct pte {
        unsigned int    pg_pfnum:20;    /* page frame number or 0 */
        unsigned int    :3;


@@ -54,10 +86,11 @@ typedef struct pte  pt_entry_t;     /* Mach page table entry */
 #define        SG_PROT         0x00000004      /* access protection mask */
 #define        SG_RO           0x00000004
 #define        SG_RW           0x00000000
 #define        SG_PROT         0x00000004      /* access protection mask */
 #define        SG_RO           0x00000004
 #define        SG_RW           0x00000000

+#define        SG_U            0x00000008      /* modified bit (68040) */

 #define        SG_FRAME        0xfffff000
 #define        SG_IMASK        0xffc00000
 #define        SG_FRAME        0xfffff000
 #define        SG_IMASK        0xffc00000

-#define        SG_PMASK        0x003ff000

 #define        SG_ISHIFT       22
 #define        SG_ISHIFT       22

+#define        SG_PMASK        0x003ff000

 #define        SG_PSHIFT       12
 
 /* 68040 additions */
 #define        SG_PSHIFT       12
 
 /* 68040 additions */