[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.36.4.1 and 1.37

version 1.36.4.1, 2006/09/09 02:40:07 version 1.37, 2006/02/03 11:08:24
Line 83 
Line 83 
   
 #include "npx.h"  #include "npx.h"
 #include "assym.h"  #include "assym.h"
   #include "apm.h"
 #include "lapic.h"  #include "lapic.h"
 #include "ioapic.h"  #include "ioapic.h"
 #include "ksyms.h"  #include "ksyms.h"
Line 94 
Line 95 
 #include <machine/segments.h>  #include <machine/segments.h>
 #include <machine/specialreg.h>  #include <machine/specialreg.h>
 #include <machine/trap.h>  #include <machine/trap.h>
   #include <machine/bootinfo.h>
   
 #if NLAPIC > 0  #if NLAPIC > 0
 #include <machine/i82489reg.h>  #include <machine/i82489reg.h>
Line 156 
Line 158 
         .data          .data
   
         .globl  _C_LABEL(cpu)          .globl  _C_LABEL(cpu)
         .globl  _C_LABEL(esym)          .globl  _C_LABEL(esym),_C_LABEL(boothowto)
         .globl  _C_LABEL(atdevbase)          .globl  _C_LABEL(bootinfo),_C_LABEL(atdevbase)
         .globl  _C_LABEL(proc0uarea),_C_LABEL(PDPpaddr)  #ifdef COMPAT_OLDBOOT
           .globl  _C_LABEL(bootdev)
   #endif
           .globl  _C_LABEL(proc0paddr),_C_LABEL(PDPpaddr)
           .globl  _C_LABEL(biosbasemem),_C_LABEL(biosextmem)
         .globl  _C_LABEL(gdt)          .globl  _C_LABEL(gdt)
 #ifdef I586_CPU  #ifdef I586_CPU
         .globl  _C_LABEL(idt)          .globl  _C_LABEL(idt)
Line 191  _C_LABEL(lapic_tpr):
Line 197  _C_LABEL(lapic_tpr):
   
 _C_LABEL(cpu):          .long   0       # are we 386, 386sx, or 486,  _C_LABEL(cpu):          .long   0       # are we 386, 386sx, or 486,
                                         #   or Pentium, or..                                          #   or Pentium, or..
   _C_LABEL(esym):         .long   0       # ptr to end of syms
 _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(proc0uarea):   .long   0  _C_LABEL(proc0paddr):   .long   0
 _C_LABEL(PDPpaddr):     .long   0       # paddr of PDP, for libkvm  _C_LABEL(PDPpaddr):     .long   0       # paddr of PDP, for libkvm
   #ifndef REALBASEMEM
   _C_LABEL(biosbasemem):  .long   0       # base memory reported by BIOS
   #else
   _C_LABEL(biosbasemem):  .long   REALBASEMEM
   #endif
   #ifndef REALEXTMEM
   _C_LABEL(biosextmem):   .long   0       # extended memory reported by BIOS
   #else
   _C_LABEL(biosextmem):   .long   REALEXTMEM
   #endif
   
         .space 512          .space 512
 tmpstk:  tmpstk:
Line 232  _C_LABEL(Multiboot_Header):
Line 249  _C_LABEL(Multiboot_Header):
         cmpl    $MULTIBOOT_INFO_MAGIC,%eax          cmpl    $MULTIBOOT_INFO_MAGIC,%eax
         jne     1f          jne     1f
   
         /*          /* Indeed, a multiboot-compliat boot loader executed us.  We copy
          * Indeed, a multiboot-compliant boot loader executed us.  We copy  
          * the received Multiboot information structure into kernel's data           * the received Multiboot information structure into kernel's data
          * space to process it later -- after we are relocated.  It will           * space to process it later -- after we are relocated.  It will
          * be safer to run complex C code than doing it at this point.           * be safer to run complex C code than doing it at this point. */
          */  
         pushl   %ebx            # Address of Multiboot information          pushl   %ebx            # Address of Multiboot information
         call    _C_LABEL(multiboot_pre_reloc)          call    _C_LABEL(multiboot_pre_reloc)
         addl    $4,%esp          addl    $4,%esp
         jmp     2f          jmp     3f
 #endif  #endif
   
 1:  1:
         /*          /*
          * At this point, we know that a NetBSD-specific boot loader           * Load parameters from stack
          * booted this kernel.  The stack carries the following parameters:           * (howto, [bootdev], bootinfo, esym, basemem, extmem).
          * (boothowto, [bootdev], bootinfo, esym, biosextmem, biosbasemem),  
          * 4 bytes each.  
          */           */
         addl    $4,%esp         # Discard return address to boot loader          movl    4(%esp),%eax
         call    _C_LABEL(native_loader)          movl    %eax,RELOC(boothowto)
         addl    $24,%esp  #ifdef COMPAT_OLDBOOT
           movl    8(%esp),%eax
           movl    %eax,RELOC(bootdev)
   #endif
           movl    12(%esp),%eax
   
           testl   %eax, %eax
           jz      1f
           movl    (%eax), %ebx            /* number of entries */
           movl    $RELOC(bootinfo), %edi
           movl    %ebx, (%edi)
           addl    $4, %edi
 2:  2:
           testl   %ebx, %ebx
           jz      1f
           addl    $4, %eax
           movl    (%eax), %ecx            /* address of entry */
           pushl   %eax
           pushl   (%ecx)                  /* len */
           pushl   %ecx
           pushl   %edi
           addl    (%ecx), %edi            /* update dest pointer */
           cmpl    $_RELOC(_C_LABEL(bootinfo) + BOOTINFO_MAXSIZE), %edi
           jg      2f
           call    _C_LABEL(memcpy)
           addl    $12, %esp
           popl    %eax
           subl    $1, %ebx
           jmp     2b
   2:      /* cleanup for overflow case */
           addl    $16, %esp
           movl    $RELOC(bootinfo), %edi
           subl    %ebx, (%edi)            /* correct number of entries */
   1:
   
           movl    16(%esp),%eax
           testl   %eax,%eax
           jz      1f
           addl    $KERNBASE,%eax
   1:      movl    %eax,RELOC(esym)
   
           movl    RELOC(biosextmem),%eax
           testl   %eax,%eax
           jnz     1f
           movl    20(%esp),%eax
           movl    %eax,RELOC(biosextmem)
   1:
           movl    RELOC(biosbasemem),%eax
           testl   %eax,%eax
           jnz     1f
           movl    24(%esp),%eax
           movl    %eax,RELOC(biosbasemem)
   1:
   
   3:
         /* First, reset the PSL. */          /* First, reset the PSL. */
         pushl   $PSL_MBO          pushl   $PSL_MBO
         popfl          popfl
Line 600  begin:
Line 665  begin:
   
         /* Set up bootstrap stack. */          /* Set up bootstrap stack. */
         leal    (PROC0STACK+KERNBASE)(%esi),%eax          leal    (PROC0STACK+KERNBASE)(%esi),%eax
         movl    %eax,_C_LABEL(proc0uarea)          movl    %eax,_C_LABEL(proc0paddr)
         leal    (KSTACK_SIZE-FRAMESIZE)(%eax),%esp          leal    (USPACE-FRAMESIZE)(%eax),%esp
         movl    %esi,(KSTACK_SIZE+PCB_CR3)(%eax)        # pcb->pcb_cr3          movl    %esi,PCB_CR3(%eax)      # pcb->pcb_cr3
         xorl    %ebp,%ebp               # mark end of frames          xorl    %ebp,%ebp               # mark end of frames
   
 #if defined(MULTIBOOT)  #if defined(MULTIBOOT)
Line 774  NENTRY(switch_error)
Line 839  NENTRY(switch_error)
   
 /*  /*
  * void cpu_switch(struct lwp *)   * void cpu_switch(struct lwp *)
  * Find a runnable lwp and switch to it.  Wait if necessary.  If the new   * Find a runnable process and switch to it.  Wait if necessary.  If the new
  * lwp is the same as the old one, we short-circuit the context save and   * process is the same as the old one, we short-circuit the context save and
  * restore.   * restore.
  *   *
  * Note that the stack frame layout is known to "struct switchframe"   * Note that the stack frame layout is known to "struct switchframe"

Legend:
Removed from v.1.36.4.1  
changed lines
  Added in v.1.37

CVSweb <webmaster@jp.NetBSD.org>