[BACK]Return to locore.S CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / i386 / i386

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/i386/locore.S between version 1.99 and 1.100

version 1.99, 2012/04/19 18:07:05 version 1.100, 2012/06/16 17:30:19
Line 196  __KERNEL_RCSID(0, "$NetBSD$");
Line 196  __KERNEL_RCSID(0, "$NetBSD$");
  */   */
         .data          .data
   
         .globl  _C_LABEL(cpu)          .globl  _C_LABEL(cputype)
         .globl  _C_LABEL(cpuid_level)          .globl  _C_LABEL(cpuid_level)
         .globl  _C_LABEL(esym)          .globl  _C_LABEL(esym)
         .globl  _C_LABEL(eblob)          .globl  _C_LABEL(eblob)
Line 229  _C_LABEL(lapic_tpr):
Line 229  _C_LABEL(lapic_tpr):
         .long 0          .long 0
 #endif  #endif
   
 _C_LABEL(cpu):          .long   0       # are we 80486, Pentium, or..  _C_LABEL(cputype):      .long   0       # are we 80486, Pentium, or..
 _C_LABEL(cpuid_level):  .long   0  _C_LABEL(cpuid_level):  .long   0
 _C_LABEL(atdevbase):    .long   0       # location of start of iomem in virtual  _C_LABEL(atdevbase):    .long   0       # location of start of iomem in virtual
 _C_LABEL(lwp0uarea):    .long   0  _C_LABEL(lwp0uarea):    .long   0
Line 346  isnx586:
Line 346  isnx586:
          * Don't try cpuid, as Nx586s reportedly don't support the           * Don't try cpuid, as Nx586s reportedly don't support the
          * PSL_ID bit.           * PSL_ID bit.
          */           */
         movl    $CPU_NX586,RELOC(cpu)          movl    $CPU_NX586,RELOC(cputype)
         jmp     2f          jmp     2f
   
 is386:  is386:
         movl    $CPU_386,RELOC(cpu)          movl    $CPU_386,RELOC(cputype)
         jmp     2f          jmp     2f
   
 try486: /* Try to toggle identification flag; does not exist on early 486s. */  try486: /* Try to toggle identification flag; does not exist on early 486s. */
Line 369  try486: /* Try to toggle identification 
Line 369  try486: /* Try to toggle identification 
   
         testl   %eax,%eax          testl   %eax,%eax
         jnz     try586          jnz     try586
 is486:  movl    $CPU_486,RELOC(cpu)  is486:  movl    $CPU_486,RELOC(cputype)
         /*          /*
          * Check Cyrix CPU           * Check Cyrix CPU
          * Cyrix CPUs do not change the undefined flags following           * Cyrix CPUs do not change the undefined flags following
Line 387  is486: movl $CPU_486,RELOC(cpu)
Line 387  is486: movl $CPU_486,RELOC(cpu)
         popfl          popfl
         jmp 2f          jmp 2f
 trycyrix486:  trycyrix486:
         movl    $CPU_6x86,RELOC(cpu)    # set CPU type          movl    $CPU_6x86,RELOC(cputype)        # set CPU type
         /*          /*
          * Check for Cyrix 486 CPU by seeing if the flags change during a           * Check for Cyrix 486 CPU by seeing if the flags change during a
          * divide. This is documented in the Cx486SLC/e SMM Programmer's           * divide. This is documented in the Cx486SLC/e SMM Programmer's
Line 405  trycyrix486:
Line 405  trycyrix486:
         xorl    %ecx,%eax               # are the flags different?          xorl    %ecx,%eax               # are the flags different?
         testl   $0x8d5,%eax             # only check C|PF|AF|Z|N|V          testl   $0x8d5,%eax             # only check C|PF|AF|Z|N|V
         jne     2f                      # yes; must be Cyrix 6x86 CPU          jne     2f                      # yes; must be Cyrix 6x86 CPU
         movl    $CPU_486DLC,RELOC(cpu)  # set CPU type          movl    $CPU_486DLC,RELOC(cputype)      # set CPU type
   
 #ifndef CYRIX_CACHE_WORKS  #ifndef CYRIX_CACHE_WORKS
         /* Disable caching of the ISA hole only. */          /* Disable caching of the ISA hole only. */

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.100

CVSweb <webmaster@jp.NetBSD.org>