changes to pass clock frame by reference rather than value;

[unix-history] / usr / src / sys / hp300 / include / param.h

diff --git a/usr/src/sys/hp300/include/param.h b/usr/src/sys/hp300/include/param.h
index d090756..8f71e79 100644 (file)
--- a/usr/src/sys/hp300/include/param.h
+++ b/usr/src/sys/hp300/include/param.h
@@ -9,9 +9,9 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- * from: Utah $Hdr: machparam.h 1.11 89/08/14$
+ * from: Utah $Hdr: machparam.h 1.12 91/01/18$

  *
  *

- *     @(#)param.h     7.6 (Berkeley) %G%
+ *     @(#)param.h     7.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -19,12 +19,20 @@
  */
 #define        MACHINE "hp300"
 
  */
 #define        MACHINE "hp300"
 

+/*
+ * Round p (pointer or byte index) up to a correctly-aligned value for all
+ * data types (int, long, ...).   The result is u_int and must be cast to
+ * any desired pointer type.
+ */
+#define        ALIGNBYTES      3
+#define        ALIGN(p)        (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
+

 #define        NBPG            4096            /* bytes/page */
 #define        PGOFSET         (NBPG-1)        /* byte offset into page */
 #define        PGSHIFT         12              /* LOG2(NBPG) */
 #define        NPTEPG          (NBPG/(sizeof (struct pte)))
 
 #define        NBPG            4096            /* bytes/page */
 #define        PGOFSET         (NBPG-1)        /* byte offset into page */
 #define        PGSHIFT         12              /* LOG2(NBPG) */
 #define        NPTEPG          (NBPG/(sizeof (struct pte)))
 

-#define NBSEG          (1024*NBPG)     /* bytes/segment */
+#define NBSEG          0x400000        /* bytes/segment */

 #define        SEGOFSET        (NBSEG-1)       /* byte offset into segment */
 #define        SEGSHIFT        22              /* LOG2(NBSEG) */
 
 #define        SEGOFSET        (NBSEG-1)       /* byte offset into segment */
 #define        SEGSHIFT        22              /* LOG2(NBSEG) */
 


@@ -68,7 +76,7 @@
  * Size of kernel malloc arena in CLBYTES-sized logical pages
  */ 
 #ifndef NKMEMCLUSTERS
  * Size of kernel malloc arena in CLBYTES-sized logical pages
  */ 
 #ifndef NKMEMCLUSTERS

-#define        NKMEMCLUSTERS   (512*1024/CLBYTES)
+#define        NKMEMCLUSTERS   (2048*1024/CLBYTES)

 #endif
 
 /* pages ("clicks") (4096 bytes) to disk blocks */
 #endif
 
 /* pages ("clicks") (4096 bytes) to disk blocks */


@@ -98,12 +106,8 @@
 /*
  * Mach derived conversion macros
  */
 /*
  * Mach derived conversion macros
  */

-#define hp300_round_seg(x)     ((((unsigned)(x)) + NBSEG - 1) & ~(NBSEG-1))
-#define hp300_trunc_seg(x)     ((unsigned)(x) & ~(NBSEG-1))

 #define hp300_round_page(x)    ((((unsigned)(x)) + NBPG - 1) & ~(NBPG-1))
 #define hp300_trunc_page(x)    ((unsigned)(x) & ~(NBPG-1))
 #define hp300_round_page(x)    ((((unsigned)(x)) + NBPG - 1) & ~(NBPG-1))
 #define hp300_trunc_page(x)    ((unsigned)(x) & ~(NBPG-1))

-#define hp300_btos(x)          ((unsigned)(x) >> SEGSHIFT)
-#define hp300_stob(x)          ((unsigned)(x) << SEGSHIFT)

 #define hp300_btop(x)          ((unsigned)(x) >> PGSHIFT)
 #define hp300_ptob(x)          ((unsigned)(x) << PGSHIFT)
 
 #define hp300_btop(x)          ((unsigned)(x) >> PGSHIFT)
 #define hp300_ptob(x)          ((unsigned)(x) << PGSHIFT)
 


@@ -130,15 +134,16 @@
 #define spl6()  _spl(PSL_S|PSL_IPL6)
 #define spl7()  _spl(PSL_S|PSL_IPL7)
 
 #define spl6()  _spl(PSL_S|PSL_IPL6)
 #define spl7()  _spl(PSL_S|PSL_IPL7)
 

-#define splsoftclock()  spl1()
-#define splnet()        spl1()
-#define splbio()        spl5()
-#define splimp()        spl5()
-#define spltty()        spl5()
-#define splclock()      spl6()
-#define splvm()         spl6()
-#define splhigh()       spl7()
-#define splsched()      spl7()
+#define splsoftclock() spl1()
+#define splnet()       spl1()
+#define splbio()       spl5()
+#define splimp()       spl5()
+#define spltty()       spl5()
+#define splclock()     spl6()
+#define splstatclock() spl6()
+#define splvm()                spl6()
+#define splhigh()      spl7()
+#define splsched()     spl7()

 
 /* watch out for side effects */
 #define splx(s)         (s & PSL_IPL ? _spl(s) : spl0())
 
 /* watch out for side effects */
 #define splx(s)         (s & PSL_IPL ? _spl(s) : spl0())


@@ -148,7 +153,6 @@
 int    cpuspeed;
 #define        DELAY(n)        { register int N = cpuspeed * (n); while (--N > 0); }
 #endif
 int    cpuspeed;
 #define        DELAY(n)        { register int N = cpuspeed * (n); while (--N > 0); }
 #endif

-

 #else
 #define        DELAY(n)        { register int N = (n); while (--N > 0); }
 #endif
 #else
 #define        DELAY(n)        { register int N = (n); while (--N > 0); }
 #endif


@@ -157,9 +161,13 @@ int        cpuspeed;
 /*
  * Constants/macros for HPUX multiple mapping of user address space.
  * Pages in the first 256Mb are mapped in at every 256Mb segment.
 /*
  * Constants/macros for HPUX multiple mapping of user address space.
  * Pages in the first 256Mb are mapped in at every 256Mb segment.

+ *
+ * XXX broken in new VM XXX

  */
 #define HPMMMASK       0xF0000000
  */
 #define HPMMMASK       0xF0000000

-#define ISHPMMADDR(v)  \
-    ((curproc->p_addr->u_pcb.pcb_flags&PCB_HPUXMMAP) && ((unsigned)(v)&HPMMMASK) != HPMMMASK)
-#define HPMMBASEADDR(v)        ((unsigned)(v) & ~HPMMMASK)
+#define ISHPMMADDR(v) \
+       ((curproc->p_addr->u_pcb.pcb_flags & PCB_HPUXMMAP) && \
+        ((unsigned)(v) & HPMMMASK) != HPMMMASK)
+#define HPMMBASEADDR(v) \
+       ((unsigned)(v) & ~HPMMMASK)

 #endif
 #endif