BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / pmax / pmax / vm_machdep.c

diff --git a/usr/src/sys/pmax/pmax/vm_machdep.c b/usr/src/sys/pmax/pmax/vm_machdep.c
index 183c3cd..5f4c0a1 100644 (file)
--- a/usr/src/sys/pmax/pmax/vm_machdep.c
+++ b/usr/src/sys/pmax/pmax/vm_machdep.c
@@ -7,11 +7,37 @@
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
  *
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
  *

- * %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: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
  *
  *
  * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
  *

- *     @(#)vm_machdep.c        8.1 (Berkeley) %G%
+ *     @(#)vm_machdep.c        8.3 (Berkeley) 1/4/94

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -49,10 +75,10 @@ cpu_fork(p1, p2)
        p2->p_md.md_flags = p1->p_md.md_flags & (MDP_FPUSED | MDP_ULTRIX);
 
        /*
        p2->p_md.md_flags = p1->p_md.md_flags & (MDP_FPUSED | MDP_ULTRIX);
 
        /*

-        * Convert the user struct virtual address to a physical one
-        * and cache it in the proc struct. Note: if the phyical address
-        * can change (due to memory compaction in kmem_alloc?),
-        * we will have to update things.
+        * Cache the PTEs for the user area in the machine dependent
+        * part of the proc struct so cpu_switch() can quickly map in
+        * the user struct and kernel stack. Note: if the virtual address
+        * translation changes (e.g. swapout) we have to update this.

         */
        pte = kvtopte(up);
        for (i = 0; i < UPAGES; i++) {
         */
        pte = kvtopte(up);
        for (i = 0; i < UPAGES; i++) {


@@ -93,13 +119,38 @@ cpu_fork(p1, p2)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Finish a swapin operation.
+ * We neded to update the cached PTEs for the user area in the
+ * machine dependent part of the proc structure.
+ */
+void
+cpu_swapin(p)
+       register struct proc *p;
+{
+       register struct user *up = p->p_addr;
+       register pt_entry_t *pte;
+       register int i;
+
+       /*
+        * Cache the PTEs for the user area in the machine dependent
+        * part of the proc struct so cpu_switch() can quickly map in
+        * the user struct and kernel stack.
+        */
+       pte = kvtopte(up);
+       for (i = 0; i < UPAGES; i++) {
+               p->p_md.md_upte[i] = pte->pt_entry & ~PG_G;
+               pte++;
+       }
+}
+

 /*
  * cpu_exit is called as the last action during exit.
  * We release the address space and machine-dependent resources,
  * including the memory for the user structure and kernel stack.
 /*
  * cpu_exit is called as the last action during exit.
  * We release the address space and machine-dependent resources,
  * including the memory for the user structure and kernel stack.

- * Once finished, we call swtch_exit, which switches to a temporary
+ * Once finished, we call switch_exit, which switches to a temporary

  * pcb and stack and never returns.  We block memory allocation
  * pcb and stack and never returns.  We block memory allocation

- * until swtch_exit has made things safe again.
+ * until switch_exit has made things safe again.

  */
 cpu_exit(p)
        struct proc *p;
  */
 cpu_exit(p)
        struct proc *p;


@@ -113,7 +164,7 @@ cpu_exit(p)
 
        (void) splhigh();
        kmem_free(kernel_map, (vm_offset_t)p->p_addr, ctob(UPAGES));
 
        (void) splhigh();
        kmem_free(kernel_map, (vm_offset_t)p->p_addr, ctob(UPAGES));

-       swtch_exit();
+       switch_exit();

        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }