diff options
29 files changed, 82 insertions, 37 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 03534625e341..d0331ae85d7b 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -35,9 +35,10 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.5 1996/09/06 23:07:02 phk Exp $ + * $Id: identcpu.c,v 1.6 1996/10/09 18:30:08 bde Exp $ */ +#include "opt_cpu.h" #include "opt_temporary.h" /* for I586_OPTIMIZED_B* */ #include <sys/param.h> diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index bcf8155a9a88..07cad144f61e 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.73 1996/07/12 06:48:55 bde Exp $ + * $Id: locore.s,v 1.74 1996/10/05 10:43:58 jkh Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -44,6 +44,7 @@ */ #include "apm.h" +#include "opt_cpu.h" #include "opt_ddb.h" #include "opt_userconfig.h" diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index bcf8155a9a88..07cad144f61e 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.73 1996/07/12 06:48:55 bde Exp $ + * $Id: locore.s,v 1.74 1996/10/05 10:43:58 jkh Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -44,6 +44,7 @@ */ #include "apm.h" +#include "opt_cpu.h" #include "opt_ddb.h" #include "opt_userconfig.h" diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 10c12e204b50..1e7c4bb47275 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.121 1996/09/28 15:28:40 bde Exp $ + * $Id: pmap.c,v 1.122 1996/09/28 22:37:38 dyson Exp $ */ /* @@ -68,6 +68,8 @@ * and to when physical maps must be made correct. */ +#include "opt_cpu.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 8a4d66e76bf1..b624623f389f 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -30,9 +30,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.39 1996/09/20 16:52:09 bde Exp $ + * $Id: support.s,v 1.40 1996/10/09 18:16:17 bde Exp $ */ +#include "opt_cpu.h" #include "opt_temporary.h" /* for I586_*_B* */ #include <machine/asmacros.h> diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s index 8a4d66e76bf1..b624623f389f 100644 --- a/sys/amd64/amd64/support.s +++ b/sys/amd64/amd64/support.s @@ -30,9 +30,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.39 1996/09/20 16:52:09 bde Exp $ + * $Id: support.s,v 1.40 1996/10/09 18:16:17 bde Exp $ */ +#include "opt_cpu.h" #include "opt_temporary.h" /* for I586_*_B* */ #include <machine/asmacros.h> diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 54a83d0580cc..17e8732d4faf 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.68 1996/09/14 04:27:39 bde Exp $ + * $Id: clock.c,v 1.69 1996/09/14 10:53:34 bde Exp $ */ /* @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index f50da08c9905..d9a19937d7b0 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/include/clock.h @@ -3,12 +3,14 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id: clock.h,v 1.15 1996/07/30 19:26:55 bde Exp $ + * $Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ +#include "opt_cpu.h" + #if defined(I586_CPU) || defined(I686_CPU) /* diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 54a83d0580cc..17e8732d4faf 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.68 1996/09/14 04:27:39 bde Exp $ + * $Id: clock.c,v 1.69 1996/09/14 10:53:34 bde Exp $ */ /* @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 023028583b82..3d3a3f700fdc 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.21 1996/10/05 10:43:55 jkh Exp $ +# $Id: options.i386,v 1.22 1996/10/09 18:36:44 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -30,6 +30,11 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h CLK_USE_I586_CALIBRATION opt_clock.h +I386_CPU opt_cpu.h +I486_CPU opt_cpu.h +I586_CPU opt_cpu.h +I686_CPU opt_cpu.h + I586_FAST_BCOPY opt_temporary.h I586_OPTIMIZED_BCOPY opt_temporary.h I586_OPTIMIZED_BZERO opt_temporary.h diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 023028583b82..3d3a3f700fdc 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.21 1996/10/05 10:43:55 jkh Exp $ +# $Id: options.i386,v 1.22 1996/10/09 18:36:44 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -30,6 +30,11 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h CLK_USE_I586_CALIBRATION opt_clock.h +I386_CPU opt_cpu.h +I486_CPU opt_cpu.h +I586_CPU opt_cpu.h +I686_CPU opt_cpu.h + I586_FAST_BCOPY opt_temporary.h I586_OPTIMIZED_BCOPY opt_temporary.h I586_OPTIMIZED_BZERO opt_temporary.h diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 03534625e341..d0331ae85d7b 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -35,9 +35,10 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $Id: identcpu.c,v 1.5 1996/09/06 23:07:02 phk Exp $ + * $Id: identcpu.c,v 1.6 1996/10/09 18:30:08 bde Exp $ */ +#include "opt_cpu.h" #include "opt_temporary.h" /* for I586_OPTIMIZED_B* */ #include <sys/param.h> diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index bcf8155a9a88..07cad144f61e 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.73 1996/07/12 06:48:55 bde Exp $ + * $Id: locore.s,v 1.74 1996/10/05 10:43:58 jkh Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -44,6 +44,7 @@ */ #include "apm.h" +#include "opt_cpu.h" #include "opt_ddb.h" #include "opt_userconfig.h" diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s index 1089fac9fd7d..89f3cf3f9009 100644 --- a/sys/i386/i386/microtime.s +++ b/sys/i386/i386/microtime.s @@ -32,9 +32,11 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.15 1996/07/17 11:25:53 bde Exp $ + * $Id: microtime.s,v 1.16 1996/08/02 20:17:50 bde Exp $ */ +#include "opt_cpu.h" + #include <machine/asmacros.h> #include <machine/clock.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 10c12e204b50..1e7c4bb47275 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.121 1996/09/28 15:28:40 bde Exp $ + * $Id: pmap.c,v 1.122 1996/09/28 22:37:38 dyson Exp $ */ /* @@ -68,6 +68,8 @@ * and to when physical maps must be made correct. */ +#include "opt_cpu.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index 8a4d66e76bf1..b624623f389f 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -30,9 +30,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.39 1996/09/20 16:52:09 bde Exp $ + * $Id: support.s,v 1.40 1996/10/09 18:16:17 bde Exp $ */ +#include "opt_cpu.h" #include "opt_temporary.h" /* for I586_*_B* */ #include <machine/asmacros.h> diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 54a83d0580cc..17e8732d4faf 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.68 1996/09/14 04:27:39 bde Exp $ + * $Id: clock.c,v 1.69 1996/09/14 10:53:34 bde Exp $ */ /* @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index f50da08c9905..d9a19937d7b0 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -3,12 +3,14 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id: clock.h,v 1.15 1996/07/30 19:26:55 bde Exp $ + * $Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ +#include "opt_cpu.h" + #if defined(I586_CPU) || defined(I686_CPU) /* diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 54a83d0580cc..17e8732d4faf 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.68 1996/09/14 04:27:39 bde Exp $ + * $Id: clock.c,v 1.69 1996/09/14 10:53:34 bde Exp $ */ /* @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c index 31b456316afc..227b70758d7e 100644 --- a/sys/i386/isa/random_machdep.c +++ b/sys/i386/isa/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.10 1996/08/02 21:16:27 bde Exp $ + * $Id: random_machdep.c,v 1.11 1996/09/27 13:25:13 peter Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -39,7 +39,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define MAX_BLKDEV 4 +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> @@ -52,9 +52,10 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> #include <i386/isa/timerreg.h> +#define MAX_BLKDEV 4 + /* * The pool is stirred with a primitive polynomial of degree 128 * over GF(2), namely x^128 + x^99 + x^59 + x^31 + x^9 + x^7 + 1. diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 54a83d0580cc..17e8732d4faf 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.68 1996/09/14 04:27:39 bde Exp $ + * $Id: clock.c,v 1.69 1996/09/14 10:53:34 bde Exp $ */ /* @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c index 31b456316afc..227b70758d7e 100644 --- a/sys/kern/kern_random.c +++ b/sys/kern/kern_random.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.10 1996/08/02 21:16:27 bde Exp $ + * $Id: random_machdep.c,v 1.11 1996/09/27 13:25:13 peter Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -39,7 +39,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define MAX_BLKDEV 4 +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> @@ -52,9 +52,10 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> #include <i386/isa/timerreg.h> +#define MAX_BLKDEV 4 + /* * The pool is stirred with a primitive polynomial of degree 128 * over GF(2), namely x^128 + x^99 + x^59 + x^31 + x^9 + x^7 + 1. diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index e0f9221c1faa..6ca472a8b376 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -46,7 +46,7 @@ /* * modified for PC98 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -54,6 +54,7 @@ */ #include "opt_ddb.h" #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index e0f9221c1faa..6ca472a8b376 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -46,7 +46,7 @@ /* * modified for PC98 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -54,6 +54,7 @@ */ #include "opt_ddb.h" #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/pc98/i386/locore.s b/sys/pc98/i386/locore.s index 90526a8bd510..c2c1eddcd29c 100644 --- a/sys/pc98/i386/locore.s +++ b/sys/pc98/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.1.1.1 1996/06/14 10:04:41 asami Exp $ + * $Id: locore.s,v 1.2 1996/07/23 07:45:53 asami Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -44,6 +44,7 @@ */ #include "apm.h" +#include "opt_cpu.h" #include "opt_ddb.h" #include <sys/errno.h> diff --git a/sys/pc98/i386/microtime.s b/sys/pc98/i386/microtime.s index 012c3c6367ad..8cd7f44f8891 100644 --- a/sys/pc98/i386/microtime.s +++ b/sys/pc98/i386/microtime.s @@ -32,9 +32,11 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.16 1996/08/02 20:17:50 bde Exp $ + * $Id: microtime.s,v 1.4 1996/09/07 02:13:34 asami Exp $ */ +#include "opt_cpu.h" + #include <machine/asmacros.h> #include <machine/clock.h> diff --git a/sys/pc98/i386/pmap.c b/sys/pc98/i386/pmap.c index ca72bb1ecac4..3d5254da8d1c 100644 --- a/sys/pc98/i386/pmap.c +++ b/sys/pc98/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.2 1996/07/23 07:45:56 asami Exp $ + * $Id: pmap.c,v 1.3 1996/09/12 11:09:34 asami Exp $ */ /* @@ -68,6 +68,8 @@ * and to when physical maps must be made correct. */ +#include "opt_cpu.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index e0f9221c1faa..6ca472a8b376 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -46,7 +46,7 @@ /* * modified for PC98 - * $Id: clock.c,v 1.4 1996/09/03 10:23:24 asami Exp $ + * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $ */ /* @@ -54,6 +54,7 @@ */ #include "opt_ddb.h" #include "opt_clock.h" +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/pc98/pc98/random_machdep.c b/sys/pc98/pc98/random_machdep.c index 4662b9a0c24b..202ce185b5e4 100644 --- a/sys/pc98/pc98/random_machdep.c +++ b/sys/pc98/pc98/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.4 1996/09/03 10:23:53 asami Exp $ + * $Id: random_machdep.c,v 1.5 1996/09/07 02:14:17 asami Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -43,7 +43,7 @@ * modified for PC-9801 by KATO T. of Nagoya University */ -#define MAX_BLKDEV 4 +#include "opt_cpu.h" #include <sys/param.h> #include <sys/systm.h> @@ -63,6 +63,8 @@ #include <i386/isa/timerreg.h> #endif +#define MAX_BLKDEV 4 + /* * The pool is stirred with a primitive polynomial of degree 128 * over GF(2), namely x^128 + x^99 + x^59 + x^31 + x^9 + x^7 + 1. |