BSD 4_4 release

[unix-history] / usr / src / sys / hp300 / hp300 / mem.c

diff --git a/usr/src/sys/hp300/hp300/mem.c b/usr/src/sys/hp300/hp300/mem.c
index dd0d146..7229106 100644 (file)
--- a/usr/src/sys/hp300/hp300/mem.c
+++ b/usr/src/sys/hp300/hp300/mem.c
@@ -1,37 +1,61 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1990, 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: mem.c 1.13 89/10/08$
+ * 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.

  *
  *

- *     @(#)mem.c       7.2 (Berkeley) %G%
+ * from: Utah $Hdr: mem.c 1.14 90/10/12$
+ *
+ *     @(#)mem.c       8.1 (Berkeley) 6/10/93

  */
 
 /*
  * Memory special file
  */
 
  */
 
 /*
  * Memory special file
  */
 

-#include "param.h"
-#include "user.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "cmap.h"
-#include "uio.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>

 
 

-#include "cpu.h"
+#include <machine/cpu.h>

 
 

-#include "../vm/vm_param.h"
-#include "../vm/pmap.h"
-#include "../vm/vm_prot.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>

 
 /*ARGSUSED*/
 mmrw(dev, uio, flags)
 
 /*ARGSUSED*/
 mmrw(dev, uio, flags)


@@ -44,6 +68,7 @@ mmrw(dev, uio, flags)
        register struct iovec *iov;
        int error = 0;
        caddr_t zbuf = NULL;
        register struct iovec *iov;
        int error = 0;
        caddr_t zbuf = NULL;

+       int kernloc;

        extern u_int lowram;
 
        while (uio->uio_resid > 0 && error == 0) {
        extern u_int lowram;
 
        while (uio->uio_resid > 0 && error == 0) {


@@ -65,32 +90,33 @@ mmrw(dev, uio, flags)
                        if (v >= 0xFFFFFFFC || v < lowram)
                                return (EFAULT);
 #endif
                        if (v >= 0xFFFFFFFC || v < lowram)
                                return (EFAULT);
 #endif

-                       pmap_enter(pmap_kernel(), vmmap, v,
-                               uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE,
-                               TRUE);
+                       pmap_enter(kernel_pmap, (vm_offset_t)vmmap,
+                           trunc_page(v), uio->uio_rw == UIO_READ ?
+                           VM_PROT_READ : VM_PROT_WRITE, TRUE);

                        o = (int)uio->uio_offset & PGOFSET;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));
                        o = (int)uio->uio_offset & PGOFSET;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));

-                       c = MIN(c, (u_int)(NBPG - o));
-                       c = MIN(c, (u_int)iov->iov_len);
+                       c = min(c, (u_int)(NBPG - o));
+                       c = min(c, (u_int)iov->iov_len);

                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);

-                       pmap_remove(pmap_kernel(), vmmap, &vmmap[NBPG]);
+                       pmap_remove(kernel_pmap, (vm_offset_t)vmmap,
+                           (vm_offset_t)&vmmap[NBPG]);

                        continue;
 
 /* minor device 1 is kernel memory */
                case 1:
                        continue;
 
 /* minor device 1 is kernel memory */
                case 1:

-                       c = MIN(iov->iov_len, MAXPHYS);
-                       if (!kernacc((caddr_t)uio->uio_offset, c,
+                       kernloc = uio->uio_offset;
+                       c = min(iov->iov_len, MAXPHYS);
+                       if (!kernacc((caddr_t)kernloc, c,

                            uio->uio_rw == UIO_READ ? B_READ : B_WRITE))
                                return (EFAULT);
                            uio->uio_rw == UIO_READ ? B_READ : B_WRITE))
                                return (EFAULT);

-                       error = uiomove((caddr_t)uio->uio_offset, (int)c, uio);
+                       error = uiomove((caddr_t)kernloc, (int)c, uio);

                        continue;
 
 /* minor device 2 is EOF/RATHOLE */
                case 2:
                        continue;
 
 /* minor device 2 is EOF/RATHOLE */
                case 2:

-                       if (uio->uio_rw == UIO_READ)
-                               return (0);
-                       c = iov->iov_len;
-                       break;
+                       if (uio->uio_rw == UIO_WRITE)
+                               uio->uio_resid = 0;
+                       return (0);

 
 /* minor device 12 (/dev/zero) is source of nulls on read, rathole on write */
                case 12:
 
 /* minor device 12 (/dev/zero) is source of nulls on read, rathole on write */
                case 12:


@@ -103,7 +129,7 @@ mmrw(dev, uio, flags)
                                    malloc(CLBYTES, M_TEMP, M_WAITOK);
                                bzero(zbuf, CLBYTES);
                        }
                                    malloc(CLBYTES, M_TEMP, M_WAITOK);
                                bzero(zbuf, CLBYTES);
                        }

-                       c = MIN(iov->iov_len, CLBYTES);
+                       c = min(iov->iov_len, CLBYTES);

                        error = uiomove(zbuf, (int)c, uio);
                        continue;
 
                        error = uiomove(zbuf, (int)c, uio);
                        continue;