BSD 4_4 release

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

diff --git a/usr/src/sys/luna68k/include/pmap.h b/usr/src/sys/luna68k/include/pmap.h
index 91be3c7..27ec50e 100644 (file)
--- a/usr/src/sys/luna68k/include/pmap.h
+++ b/usr/src/sys/luna68k/include/pmap.h
@@ -1,25 +1,55 @@
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
  * Copyright (c) 1992 OMRON Corporation.
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
  * Copyright (c) 1992 OMRON Corporation.

- * Copyright (c) 1991, 1992 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 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.
+ *
+ * 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/include/pmap.h  7.11 (Berkeley) 12/27/92
  *
  *
  * from: hp300/include/pmap.h  7.11 (Berkeley) 12/27/92
  *

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

  */
 
 #ifndef        _PMAP_MACHINE_
 #define        _PMAP_MACHINE_
 
 #define LUNA_PAGE_SIZE NBPG
  */
 
 #ifndef        _PMAP_MACHINE_
 #define        _PMAP_MACHINE_
 
 #define LUNA_PAGE_SIZE NBPG

+#if defined(LUNA2)
+#define LUNA_SEG_SIZE  (mmutype == MMU_68040 ? 0x40000 : NBSEG)
+#else

 #define LUNA_SEG_SIZE  NBSEG
 #define LUNA_SEG_SIZE  NBSEG

+#endif

 
 #define luna_trunc_seg(x)      (((unsigned)(x)) & ~(LUNA_SEG_SIZE-1))
 #define luna_round_seg(x)      luna_trunc_seg((unsigned)(x) + LUNA_SEG_SIZE-1)
 
 #define luna_trunc_seg(x)      (((unsigned)(x)) & ~(LUNA_SEG_SIZE-1))
 #define luna_round_seg(x)      luna_trunc_seg((unsigned)(x) + LUNA_SEG_SIZE-1)


@@ -100,6 +130,7 @@ pv_entry_t  pv_table;               /* array of entries, one per page */
 #define pa_to_pvh(pa)          (&pv_table[pa_index(pa)])
 
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
 #define pa_to_pvh(pa)          (&pv_table[pa_index(pa)])
 
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)

+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)

 
 extern struct pte *Sysmap;
 extern char *vmmap;                    /* map for mem, dumps, etc. */
 
 extern struct pte *Sysmap;
 extern char *vmmap;                    /* map for mem, dumps, etc. */