[BACK]Return to cpu.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / i386 / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/i386/include/cpu.h between version 1.59 and 1.59.2.5

version 1.59, 2000/01/26 18:48:00 version 1.59.2.5, 2000/04/22 16:05:20
Line 41 
Line 41 
 #ifndef _I386_CPU_H_  #ifndef _I386_CPU_H_
 #define _I386_CPU_H_  #define _I386_CPU_H_
   
   #if defined(_KERNEL) && !defined(_LKM)
   #include "opt_multiprocessor.h"
   #endif
   
 /*  /*
  * Definitions unique to i386 cpu support.   * Definitions unique to i386 cpu support.
  */   */
Line 48 
Line 52 
 #include <machine/frame.h>  #include <machine/frame.h>
 #include <machine/segments.h>  #include <machine/segments.h>
   
   #ifdef MULTIPROCESSOR
   
   #include <machine/i82489reg.h>
   #include <machine/i82489var.h>
   #endif
   
   #include <sys/device.h>
   #include <sys/lock.h>                   /* will also get LOCKDEBUG */
   
   /*
    * a bunch of this belongs in cpuvar.h; move it later..
    */
   
   struct cpu_info {
           struct device ci_dev;           /* pointer to our device */
   
           /*
            * Public members.
            */
           struct proc *ci_curproc;        /* current owner of the processor */
           struct simplelock ci_slock;     /* lock on this data structure */
           cpuid_t ci_cpuid;               /* our CPU ID */
   #if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
           u_long ci_spin_locks;           /* # of spin locks held */
           u_long ci_simple_locks;         /* # of simple locks held */
   #endif
   
           /*
            * Private members.
            */
           struct proc *ci_fpcurproc;      /* current owner of the FPU */
   
           struct pcb *ci_curpcb;          /* VA of current HW PCB */
           struct pcb *ci_idle_pcb;        /* VA of current PCB */
   
           paddr_t ci_idle_pcb_paddr;      /* PA of idle PCB */
           u_long ci_flags;                /* flags; see below */
           u_int32_t ci_ipis;              /* interprocessor interrupts pending */
           int sc_apic_version;            /* local APIC version */
   
           u_int32_t       ci_level;
           u_int32_t       ci_vendor[4];
           u_int32_t       ci_signature;           /* X86 cpuid type */
           u_int32_t       ci_feature_flags;       /* X86 CPUID feature bits */
           u_int32_t       cpu_class;       /* CPU class */
   
           struct cpu_functions *ci_func;  /* start/stop functions */
           void (*cpu_setup) __P((void));  /* proc-dependant init */
   
           int             ci_want_resched;
           int             ci_astpending;
   };
   
   #define CPUF_BSP        0x0001          /* CPU is the BSP */
   #define CPUF_AP         0x0002          /* CPU is an AP */
   #define CPUF_SP         0x0004          /* CPU is only processor */
   
   #define CPUF_APIC_CD    0x0008          /* CPU has apic configured */
   
   #define CPUF_PRESENT    0x1000          /* CPU is present */
   #define CPUF_RUNNING    0x2000          /* CPU is running */
   
   #ifdef MULTIPROCESSOR
   
   #define I386_MAXPROCS           0x10
   
   #define CPU_STARTUP(_ci)        ((_ci)->ci_func->start(_ci))
   #define CPU_STOP(_ci)           ((_ci)->ci_func->stop(_ci))
   
   #define cpu_number()    (i82489_readreg(LAPIC_ID)>>LAPIC_ID_SHIFT)
   #define curcpu()        (cpu_info[cpu_number()])
   #define curpcb          curcpu()->ci_curpcb
   
   extern  struct cpu_info *cpu_info[I386_MAXPROCS];
   extern  u_long cpus_running;
   
   extern void cpu_boot_secondary_processors __P((void));
   
   #define fpcurproc       curcpu()->ci_fpcurproc
   
   #define want_resched (curcpu()->ci_want_resched)
   #define astpending (curcpu()->ci_astpending)
   
   /*
    * Preempt the current process if in interrupt from user mode,
    * or after the current trap/syscall if in system mode.
    */
   extern void need_resched __P((void));
   
   #else /* !MULTIPROCESSOR */
   
 /*  /*
  * definitions of cpu-dependent requirements   * definitions of cpu-dependent requirements
  * referenced in generic code   * referenced in generic code
  */   */
 #define cpu_swapin(p)                   /* nothing */  
 #define cpu_number()                    0  #define cpu_number()                    0
   int want_resched;
   /*
    * Preempt the current process if in interrupt from user mode,
    * or after the current trap/syscall if in system mode.
    */
   #define need_resched()          (want_resched = 1, setsoftast())
   
   #endif
   
   #define cpu_swapin(p)                   /* nothing */
   
 /*  /*
  * Arguments to hardclock, softclock and statclock   * Arguments to hardclock, softclock and statclock
Line 69 
Line 173 
 #define CLKF_PC(frame)          ((frame)->if_eip)  #define CLKF_PC(frame)          ((frame)->if_eip)
 #define CLKF_INTR(frame)        (0)     /* XXX should have an interrupt stack */  #define CLKF_INTR(frame)        (0)     /* XXX should have an interrupt stack */
   
 /*  
  * Preempt the current process if in interrupt from user mode,  
  * or after the current trap/syscall if in system mode.  
  */  
 int     want_resched;           /* resched() was called */  
 #define need_resched()          (want_resched = 1, setsoftast())  
   
 /*  /*
  * Give a profiling tick to the current process when the user profiling   * Give a profiling tick to the current process when the user profiling
Line 92  int want_resched;  /* resched() was call
Line 190  int want_resched;  /* resched() was call
 /*  /*
  * We need a machine-independent name for this.   * We need a machine-independent name for this.
  */   */
 #define DELAY(x)                delay(x)  extern void (*delay_func) __P((int));
 void    delay __P((int));  struct timeval;
   extern void (*microtime_func) __P((struct timeval *));
   
   #define DELAY(x)                (*delay_func)(x)
   #define delay(x)                (*delay_func)(x)
   #define microtime(tv)           (*microtime_func)(tv)
   
 /*  /*
  * pull in #defines for kinds of processors   * pull in #defines for kinds of processors
Line 121  struct cpu_cpuid_nameclass {
Line 224  struct cpu_cpuid_nameclass {
 };  };
   
 #ifdef _KERNEL  #ifdef _KERNEL
   extern int biosbasemem;
   extern int biosextmem;
 extern int cpu;  extern int cpu;
 extern int cpu_class;  extern int cpu_class;
 extern int cpu_feature;  extern int cpu_feature;
   extern int cpu_id;
   extern char cpu_vendor[];
 extern int cpuid_level;  extern int cpuid_level;
 extern struct cpu_nocpuid_nameclass i386_nocpuid_cpus[];  extern struct cpu_nocpuid_nameclass i386_nocpuid_cpus[];
 extern struct cpu_cpuid_nameclass i386_cpuid_cpus[];  extern struct cpu_cpuid_nameclass i386_cpuid_cpus[];
   
 /* machdep.c */  /* machdep.c */
 void    delay __P((int));  
 void    dumpconf __P((void));  void    dumpconf __P((void));
 void    cpu_reset __P((void));  void    cpu_reset __P((void));
   void    i386_init_pcb_tss_ldt __P((struct pcb *));
 void    i386_proc0_tss_ldt_init __P((void));  void    i386_proc0_tss_ldt_init __P((void));
 void    i386_bufinit __P((void));  void    i386_bufinit __P((void));
   
Line 148  void proc_trampoline __P((void));
Line 255  void proc_trampoline __P((void));
 /* clock.c */  /* clock.c */
 void    initrtclock __P((void));  void    initrtclock __P((void));
 void    startrtclock __P((void));  void    startrtclock __P((void));
   void    i8254_delay __P((int));
   void    i8254_microtime __P((struct timeval *));
   void    i8254_initclocks __P((void));
   
 /* npx.c */  /* npx.c */
 void    npxdrop __P((void));  void    npxdrop __P((void));
Line 190  void vm86_gpfault __P((struct proc *, in
Line 300  void vm86_gpfault __P((struct proc *, in
 void    child_return __P((void *));  void    child_return __P((void *));
   
 /* consinit.c */  /* consinit.c */
 void consinit __P((void));  
 void kgdb_port_init __P((void));  void kgdb_port_init __P((void));
   
 /* bus_machdep.c */  /* bus_machdep.c */
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.59.2.5
CVSweb <webmaster@jp.NetBSD.org>