BSD 4_4 release

[unix-history] / usr / src / sys / sparc / sparc / genassym.c

diff --git a/usr/src/sys/sparc/sparc/genassym.c b/usr/src/sys/sparc/sparc/genassym.c
index ee26e1b..192b0a0 100644 (file)
--- a/usr/src/sys/sparc/sparc/genassym.c
+++ b/usr/src/sys/sparc/sparc/genassym.c
@@ -1,6 +1,6 @@
 /*
 /*

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

  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and


@@ -9,42 +9,65 @@
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *     This product includes software developed by the University of
  * 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, Lawrence Berkeley Laboratories.
+ *     California, Lawrence Berkeley Laboratory.

  *
  *

- * %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.

  *
  *

- *     @(#)genassym.c  7.2 (Berkeley) %G%
+ *     @(#)genassym.c  8.1 (Berkeley) 6/11/93

  *
  *

- * from: $Header: genassym.c,v 1.12 92/06/28 10:13:01 mccanne $ (LBL)
+ * from: $Header: genassym.c,v 1.15 93/04/21 06:09:30 torek Exp $ (LBL)

  */
 
  */
 

-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/proc.h"
-#include "sys/map.h"
-#include "sys/proc.h"
-#include "sys/mbuf.h"
-#include "sys/msgbuf.h"
-#include "sys/syscall.h"
-#include "sys/user.h"
-#include "machine/pmap.h"
-#include "machine/psl.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/syscall.h>
+#include <sys/user.h>
+
+#include <machine/pmap.h>
+#include <machine/psl.h>

 
 #ifdef notyet
 
 #ifdef notyet

-#include "../dev/zsreg.h"
-#include "../dev/zsvar.h"
+#include <sparc/dev/zsreg.h>
+#include <sparc/dev/zsvar.h>

 #endif
 #endif

-#include "../dev/bsd_audioreg.h"
-#include "../dev/bsd_audiovar.h"
+#include <sparc/dev/bsd_audioreg.h>
+#include <sparc/dev/bsd_audiovar.h>

 
 

-#include "intreg.h"
+#include <sparc/sparc/intreg.h>

 
 #include <stdio.h>
 
 #include <stdio.h>

-/*nclude <stddef.h>*/
-
-#ifndef offsetof
-#define        offsetof(str, mem) ((size_t)&((str *)0)->mem)
-#endif
+#include <stddef.h>

 
 #define        off(what, str, mem) def(what, (int)offsetof(str, mem))
 
 
 #define        off(what, str, mem) def(what, (int)offsetof(str, mem))