[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.121 and 1.122

version 1.121, 2016/05/14 08:49:16 version 1.122, 2016/05/14 09:51:56
Line 555  try586: /* Use the `cpuid' instruction. 
Line 555  try586: /* Use the `cpuid' instruction. 
         cpuid          cpuid
         movl    %eax,RELOC(cpuid_level)          movl    %eax,RELOC(cpuid_level)
   
           /*
            * Retrieve the NX/XD flag. We use the 32bit version of PG_NX.
            */
           movl    $0x80000001,%eax
           cpuid
           andl    $CPUID_NOX,%edx
           jz      no_NOX
           movl    $PG_NX32,RELOC(nox_flag)
   no_NOX:
   
 2:  2:
         /*          /*
          * Finished with old stack; load new %esp now instead of later so we           * Finished with old stack; load new %esp now instead of later so we
Line 571  try586: /* Use the `cpuid' instruction. 
Line 581  try586: /* Use the `cpuid' instruction. 
          */           */
         movl    $_RELOC(tmpstk),%esp          movl    $_RELOC(tmpstk),%esp
   
         /*  
          * Retrieve the NX/XD flag. We use the 32bit version of PG_NX.  
          */  
         movl    $0x80000001,%eax  
         cpuid  
         andl    $CPUID_NOX,%edx  
         jz      no_NOX  
         movl    $PG_NX32,RELOC(nox_flag)  
 no_NOX:  
   
 /*  /*
  * There are two different layouts possible, depending on whether PAE is   * There are two different layouts possible, depending on whether PAE is
  * enabled or not.   * enabled or not.

Legend:
Removed from v.1.121  
changed lines
  Added in v.1.122

CVSweb <webmaster@jp.NetBSD.org>