This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / sys / i386 / include / cpu.h

diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 583d76c..43a6bec 100644 (file)
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)cpu.h       5.4 (Berkeley) 5/9/91
+ *     from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
+ *     $Id$

  */
 
 /*
  */
 
 /*


@@ -48,16 +49,6 @@
  */
 #undef COPY_SIGCODE            /* don't copy sigcode above user stack in exec */
 
  */
 #undef COPY_SIGCODE            /* don't copy sigcode above user stack in exec */
 

-/*
- * function vs. inline configuration;
- * these are defined to get generic functions
- * rather than inline or machine-dependent implementations
- */
-#define        NEED_MINMAX             /* need {,i,l,ul}{min,max} functions */
-#define        NEED_FFS                /* need ffs function */
-#define        NEED_BCMP               /* need bcmp function */
-#define        NEED_STRLEN             /* need strlen function */
-

 #define        cpu_exec(p)     /* nothing */
 
 /*
 #define        cpu_exec(p)     /* nothing */
 
 /*


@@ -71,8 +62,6 @@ typedef struct intrframe clockframe;
 #define        CLKF_BASEPRI(framep)    ((framep)->if_ppl == 0)
 #define        CLKF_PC(framep)         ((framep)->if_eip)
 
 #define        CLKF_BASEPRI(framep)    ((framep)->if_ppl == 0)
 #define        CLKF_PC(framep)         ((framep)->if_eip)
 

-#define        resettodr()     /* no todr to set */
-

 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.


@@ -98,11 +87,17 @@ int astpending;             /* need to trap before returning to user mode */
 int    want_resched;           /* resched() was called */
 
 /*
 int    want_resched;           /* resched() was called */
 
 /*

- * Kinds of processor
+ * pull in #defines for kinds of processors

  */
  */

+#include "machine/cputypes.h"
+
+struct cpu_nameclass {
+       char *cpu_name;
+       int  cpu_class;
+};

 
 

-#define        CPU_386SX       0
-#define        CPU_386         1
-#define        CPU_486SX       2
-#define        CPU_486         3
-#define        CPU_586         4
+#ifdef KERNEL
+extern int cpu;
+extern int cpu_class;
+extern struct cpu_nameclass i386_cpus[];
+#endif