Move CPU configuration predicates to <machine/cpuconf.h>.
This commit is contained in:
thorpej
parent
011c1952fd
commit
efdd83f440
|
|
@ -0,0 +1,142 @@
|
|||
/* $NetBSD: cpuconf.h,v 1.1 2003/04/09 16:22:33 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* 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
|
||||
* contributed to Berkeley.
|
||||
*
|
||||
* 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 Laboratory.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* @(#)param.h 8.1 (Berkeley) 6/11/93
|
||||
*/
|
||||
/*
|
||||
* Sun4M support by Aaron Brown, Harvard University.
|
||||
* Changes Copyright (c) 1995 The President and Fellows of Harvard College.
|
||||
* All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _SPARC_CPUCONF_H_
|
||||
#define _SPARC_CPUCONF_H_
|
||||
|
||||
/*
|
||||
* Values for the cputyp variable.
|
||||
*/
|
||||
#define CPU_SUN4 0
|
||||
#define CPU_SUN4C 1
|
||||
#define CPU_SUN4M 2
|
||||
#define CPU_SUN4U 3
|
||||
#define CPU_SUN4D 4
|
||||
|
||||
#if defined(_KERNEL) || defined(_STANDALONE)
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_sparc_arch.h"
|
||||
#endif /* _KERNEL_OPT */
|
||||
|
||||
#ifndef _LOCORE
|
||||
extern int cputyp;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Shorthand CPU-type macros. Let the compiler optimize away code
|
||||
* conditional on constants.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Step 1: Count the number of CPU types configured into the kernel.
|
||||
*/
|
||||
#if defined(_KERNEL_OPT)
|
||||
#define CPU_NTYPES (defined(SUN4) + defined(SUN4C) + \
|
||||
defined(SUN4M) + defined(SUN4D))
|
||||
#else
|
||||
#define CPU_NTYPES 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Step 2: Define the CPU type predicates. Rules:
|
||||
*
|
||||
* * If multiple CPU types are configured in, and the CPU type
|
||||
* is not one of them, then the test is always false.
|
||||
*
|
||||
* * If exactly one CPU type is configured in, and it's this
|
||||
* one, then the test is always true.
|
||||
*
|
||||
* * Otherwise, we have to reference the cputyp variable.
|
||||
*/
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4)
|
||||
# define CPU_ISSUN4 (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4)
|
||||
# define CPU_ISSUN4 (1)
|
||||
#else
|
||||
# define CPU_ISSUN4 (cputyp == CPU_SUN4)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4C)
|
||||
# define CPU_ISSUN4C (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4C)
|
||||
# define CPU_ISSUN4C (1)
|
||||
#else
|
||||
# define CPU_ISSUN4C (cputyp == CPU_SUN4C)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4M)
|
||||
# define CPU_ISSUN4M (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4M)
|
||||
# define CPU_ISSUN4M (1)
|
||||
#else
|
||||
# define CPU_ISSUN4M (cputyp == CPU_SUN4M)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4D)
|
||||
# define CPU_ISSUN4D (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4D)
|
||||
# define CPU_ISSUN4D (1)
|
||||
#else
|
||||
# define CPU_ISSUN4D (cputyp == CPU_SUN4D)
|
||||
#endif
|
||||
|
||||
#define CPU_ISSUN4U (0)
|
||||
|
||||
/*
|
||||
* Step 3: Sun4M and Sun4D systems have an SRMMU. Define some
|
||||
* short-hand for this.
|
||||
*/
|
||||
#define CPU_HAS_SRMMU (CPU_ISSUN4M || CPU_ISSUN4D)
|
||||
|
||||
#endif /* _KERNEL || _STANDALONE */
|
||||
|
||||
#endif /* _SPARC_CPUCONF_H_ */
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: param.h,v 1.58 2003/01/18 06:44:57 thorpej Exp $ */
|
||||
/* $NetBSD: param.h,v 1.59 2003/04/09 16:22:33 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -54,10 +54,8 @@
|
|||
#define MACHINE_ARCH "sparc"
|
||||
#define MID_MACHINE MID_SPARC
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_sparc_arch.h"
|
||||
#endif
|
||||
#ifdef _KERNEL /* XXX */
|
||||
#include <machine/cpuconf.h> /* XXX */
|
||||
#ifndef _LOCORE /* XXX */
|
||||
#include <machine/cpu.h> /* XXX */
|
||||
#endif /* XXX */
|
||||
|
|
@ -161,20 +159,8 @@ extern int nbpg, pgofset, pgshift;
|
|||
*/
|
||||
#define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE / DEV_BSIZE))
|
||||
|
||||
/*
|
||||
* Values for the cputyp variable.
|
||||
*/
|
||||
#define CPU_SUN4 0
|
||||
#define CPU_SUN4C 1
|
||||
#define CPU_SUN4M 2
|
||||
#define CPU_SUN4U 3
|
||||
#define CPU_SUN4D 4
|
||||
|
||||
#if defined(_KERNEL) || defined(_STANDALONE)
|
||||
#ifndef _LOCORE
|
||||
|
||||
extern int cputyp;
|
||||
|
||||
extern void delay __P((unsigned int));
|
||||
#define DELAY(n) delay(n)
|
||||
#endif /* _LOCORE */
|
||||
|
|
@ -197,65 +183,8 @@ extern void delay __P((unsigned int));
|
|||
#endif /* MSIIEP */
|
||||
|
||||
/*
|
||||
* Shorthand CPU-type macros. Let compiler optimize away code
|
||||
* conditional on constants.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Step 1: Count the number of CPU types configured into the
|
||||
* kernel.
|
||||
*/
|
||||
#define CPU_NTYPES (defined(SUN4) + defined(SUN4C) + \
|
||||
defined(SUN4M) + defined(SUN4D))
|
||||
|
||||
/*
|
||||
* Step 2: Define the CPU type predicates. Rules:
|
||||
*
|
||||
* * If CPU types are configured in, and the CPU type
|
||||
* is not one of them, then the test is always false.
|
||||
*
|
||||
* * If exactly one CPU type is configured in, and it's
|
||||
* this one, then the test is always true.
|
||||
*
|
||||
* * Otherwise, we have to reference the cputyp variable.
|
||||
*/
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4)
|
||||
# define CPU_ISSUN4 (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4)
|
||||
# define CPU_ISSUN4 (1)
|
||||
#else
|
||||
# define CPU_ISSUN4 (cputyp == CPU_SUN4)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4C)
|
||||
# define CPU_ISSUN4C (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4C)
|
||||
# define CPU_ISSUN4C (1)
|
||||
#else
|
||||
# define CPU_ISSUN4C (cputyp == CPU_SUN4C)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4M)
|
||||
# define CPU_ISSUN4M (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4M)
|
||||
# define CPU_ISSUN4M (1)
|
||||
#else
|
||||
# define CPU_ISSUN4M (cputyp == CPU_SUN4M)
|
||||
#endif
|
||||
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4D)
|
||||
# define CPU_ISSUN4D (0)
|
||||
#elif CPU_NTYPES == 1 && defined(SUN4D)
|
||||
# define CPU_ISSUN4D (1)
|
||||
#else
|
||||
# define CPU_ISSUN4D (cputyp == CPU_SUN4D)
|
||||
#endif
|
||||
|
||||
#define CPU_ISSUN4U (0)
|
||||
|
||||
/*
|
||||
* Step 3: Sun4 machines have a page size of 8192. All other machines
|
||||
* have a page size of 4096. Short cut page size variables if we can.
|
||||
* Sun4 machines have a page size of 8192. All other machines have a page
|
||||
* size of 4096. Short cut page size variables if we can.
|
||||
*/
|
||||
#if CPU_NTYPES != 0 && !defined(SUN4)
|
||||
# define NBPG 4096
|
||||
|
|
@ -271,10 +200,4 @@ extern void delay __P((unsigned int));
|
|||
# define PGSHIFT pgshift
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Step 4: Sun4M and Sun4D systems have an SRMMU. Define some
|
||||
* short-hand for this.
|
||||
*/
|
||||
#define CPU_HAS_SRMMU (CPU_ISSUN4M || CPU_ISSUN4D)
|
||||
|
||||
#endif /* _KERNEL || _STANDALONE */
|
||||
|
|
|
|||
Loading…
Reference in New Issue