making the "#ifndef _MACHINE_FILE_H_" more complete and consistent.

This commit is contained in:
phil 1993-10-25 06:11:58 +00:00
parent 899963d591
commit 493236e982
22 changed files with 84 additions and 41 deletions

View File

@ -31,11 +31,11 @@
* SUCH DAMAGE.
*
* from: @(#)ansi.h 7.1 (Berkeley) 3/9/91
* $Id: ansi.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* ansi.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _ANSI_H_
#define _ANSI_H_
#ifndef _MACHINE_ANSI_H_
#define _MACHINE_ANSI_H_
/*
* Types which are fundamental to the implementation and may appear in

View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: aout_machdep.h,v 1.2 1993/10/18 09:47:34 pk Exp $
* exec.h,v 1.2 1993/10/18 09:47:34 pk Exp
*/
#ifndef _PC532_EXEC_H_

View File

@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*
* $Id: asm.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* asm.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
/*
@ -35,8 +35,8 @@
* Helsinki University of Technology 1992.
*/
#ifndef _NS532_ASM_H_
#define _NS532_ASM_H_
#ifndef _MACHINE_ASM_H_
#define _MACHINE_ASM_H_
#define S_ARG0 4(sp)
#define S_ARG1 8(sp)
@ -84,4 +84,4 @@
#define Entry(x) .globl EX(x); LEX(x)
#define DATA(x) .globl EX(x); .align ALIGN; LEX(x)
#endif /* _NS532_ASM_H_ */
#endif

View File

@ -38,6 +38,8 @@
* cpu.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_CPU_H_
#define _MACHINE_CPU_H_
/*
* Definitions unique to ns532 cpu support.
*
@ -107,3 +109,4 @@ typedef struct intrframe clockframe;
int astpending; /* need to trap before returning to user mode */
int want_resched; /* resched() was called */
#endif

View File

@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*
* $Id: db_machdep.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* db_machdep.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
/*
* HISTORY
@ -43,8 +43,8 @@
*
*/
#ifndef _NS532_DB_MACHDEP_H_
#define _NS532_DB_MACHDEP_H_
#ifndef _MACHINE_DB_MACHDEP_H_
#define _MACHINE_DB_MACHDEP_H_
/* #include <mach/ns532/vm_types.h> */
/* #include <mach/ns532/vm_param.h> */
@ -56,8 +56,7 @@
/* #include <ns532/thread.h> /* for thread_status */
#include <machine/frame.h> /* For struct trapframe */
/* #include <ns532/psl.h> */
/* #include <ns532/trap.h> */
#include <machine/psl.h>
#include <machine/trap.h>
typedef vm_offset_t db_addr_t; /* address - unsigned */
@ -129,4 +128,4 @@ void db_task_name(/* task_t */);
#define db_thread_fp_used(thread) ((thread)->pcb->fps && (thread)->pcb->fps->valid)
#endif /* _NS532_DB_MACHDEP_H_ */
#endif

View File

@ -35,6 +35,9 @@
* endian.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_ENDIAN_H_
#define _MACHINE_ENDIAN_H_
/*
* Definitions for byte order, according to byte significance from low
* address to high.
@ -75,3 +78,5 @@ __END_DECLS
#define HTONL(x) (x) = htonl((u_long)x)
#define HTONS(x) (x) = htons((u_short)x)
#endif
#endif

View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: exec.h,v 1.2 1993/10/18 09:47:34 pk Exp $
* exec.h,v 1.2 1993/10/18 09:47:34 pk Exp
*/
#ifndef _PC532_EXEC_H_

View File

@ -32,9 +32,12 @@
*
* @(#)float.h 7.2 (Berkeley) 6/28/90
*
* $Id: float.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* float.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_FLOAT_H_
#define _MACHINE_FLOAT_H_
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
@ -67,3 +70,5 @@
#define LDBL_MAX_EXP DBL_MAX_EXP
#define LDBL_MAX DBL_MAX
#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
#endif

View File

@ -31,9 +31,12 @@
*
* machine/setjmp.h : for support of the library routines.
*
* $Id: jmpbuf.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp $
* jmpbuf.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
*/
#ifndef _MACHINE_JMPBUF_H_
#define _MACHINE_JMPBUF_H_
/* These are byte offsets into the jmp buffer. */
#define JMP_BUF_R3 0
@ -45,4 +48,6 @@
#define JMP_BUF_SP 24
#define JMP_BUF_FP 28
#define JMP_BUF_SB 32
#define JMP_BUF_SIGMASK 36
#define JMP_BUF_SIGMASK 36
#endif

View File

@ -32,9 +32,12 @@
*
* @(#)limits.h 7.2 (Berkeley) 6/28/90
*
* $Id: limits.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* limits.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_LIMITS_H_
#define _MACHINE_LIMITS_H_
#define CHAR_BIT 8 /* number of bits in a char */
#define MB_LEN_MAX 1 /* no multibyte characters */
@ -56,3 +59,9 @@
#define ULONG_MAX 0xffffffff /* max value for an unsigned long */
#define LONG_MAX 0x7fffffff /* max value for a long */
#define LONG_MIN 0x80000000 /* min value for a long */
#define UQUAD_MAX 0xffffffffffffffffLL /* max value, unsigned quad */
#define QUAD_MAX 0x7fffffffffffffffLL /* max value, quad */
#define QUAD_MIN 0x8000000000000000LL /* min value, quad */
#endif

View File

@ -1,4 +1,4 @@
/* Another empty file! Phil Nelson.
*
* $Id: mtpr.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* mtpr.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/

View File

@ -35,7 +35,7 @@
*
* @(#)param.h 5.8 (Berkeley) 6/28/91
*
* $Id: param.h,v 1.3 1993/09/12 06:26:13 phil Exp $
* param.h,v 1.3 1993/09/12 06:26:13 phil Exp
*/
/*

View File

@ -35,9 +35,12 @@
*
* @(#)pcb.h 5.10 (Berkeley) 5/12/91
*
* $Id: pcb.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* pcb.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_PCB_H_
#define _MACHINE_PCB_H_
/*
* PC 532 process control block
*
@ -81,3 +84,5 @@ struct pcb {
#ifdef KERNEL
struct pcb *curpcb; /* our current running pcb */
#endif
#endif

View File

@ -36,7 +36,7 @@
*
* @(#)pmap.h 7.4 (Berkeley) 5/12/91
*
* $Id: pmap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* pmap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
/*
@ -49,8 +49,8 @@
* from hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
*/
#ifndef _PMAP_MACHINE_
#define _PMAP_MACHINE_ 1
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
/*
* 532 page table entry and page table directory
@ -240,4 +240,4 @@ pv_entry_t pv_table; /* array of entries, one per page */
#endif KERNEL
#endif _PMAP_MACHINE_
#endif

View File

@ -32,9 +32,12 @@
*
* @(#)proc.h 7.1 (Berkeley) 5/15/91
*
* $Id: proc.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* proc.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHINE_PROC_H_
#define _MACHINE_PROC_H_
/*
* Machine-dependent part of the proc structure for hp300.
* (Included for the ns532 just in case... PAN )
@ -45,3 +48,5 @@ struct mdproc {
/* md_flags */
#define MDP_AST 0x0001 /* async trap pending */
#endif

View File

@ -38,6 +38,9 @@
* psl.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
*/
#ifndef _MACHINE_PSL_H_
#define _MACHINE_PSL_H_
/*
* 32532 processor status longword.
*/
@ -62,4 +65,5 @@
/* The PSR versions ... */
#define PSR_USR PSL_USER
#endif

View File

@ -35,7 +35,7 @@
*
* @(#)reg.h 5.5 (Berkeley) 1/18/91
*
* $Id: reg.h,v 1.2 1993/09/13 07:25:44 phil Exp $
* reg.h,v 1.2 1993/09/13 07:25:44 phil Exp
*/
/* Modified for the pc532... 2/1/93 by Phil Nelson

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)signal.h 7.16 (Berkeley) 3/17/91
* $Id: signal.h,v 1.1 1993/10/01 23:01:25 phil Exp $
* signal.h,v 1.1 1993/10/01 23:01:25 phil Exp
*/
#ifndef _MACHINE_SIGNAL_H_

View File

@ -35,15 +35,15 @@
*
* machine/stdarg.h:
*
* $Id: stdarg.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* stdarg.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#include <sys/types.h> /* to make sure _VA_LIST_ gets defined if it
needs to. */
#ifndef _STDARG_H
#define _STDARG_H
#ifndef _MACHINE_STDARG_H_
#define _MACHINE_STDARG_H_
/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. */
#ifdef _VA_LIST_

View File

@ -31,11 +31,11 @@
* Modified for NetBSD by Phil Nelson
* Hardware trap vectors for ns532.
*
* $Id: trap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* trap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _NS532_TRAP_H_
#define _NS532_TRAP_H_
#ifndef _MACHINE_TRAP_H_
#define _MACHINE_TRAP_H_
#define T_NVI 0 /* non-vectored interrupt */
#define T_NMI 1 /* non-maskable interrupt */
@ -88,4 +88,4 @@
#define TEX_PTE2 0x02 /* Second level PTE invalid */
#define TEX_PROT 0x03 /* Protection violation */
#endif _NS532_TRAP_H_
#endif

View File

@ -32,11 +32,11 @@
*
* @(#)types.h 7.5 (Berkeley) 3/9/91
*
* $Id: types.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp $
* types.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
*/
#ifndef _MACHTYPES_H_
#define _MACHTYPES_H_
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
typedef struct _physadr {
int r[1];

View File

@ -35,9 +35,11 @@
*
* @(#)vmparam.h 5.9 (Berkeley) 5/12/91
*
* $Id: vmparam.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp $
* vmparam.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
*/
#ifndef _MACHINE_VMPARAM_H_
#define _MACHINE_VMPARAM_H_
/*
* Machine dependent constants for 532.
@ -223,3 +225,4 @@
/* pcb base */
#define pcbb(p) ((u_int)(p)->p_addr)
#endif