[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 and 1.42

version 1.36, 2005/12/11 12:17:41 version 1.42, 2006/07/08 20:30:00
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 95 
Line 94 
 #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>
 #endif  #endif
   
   #include <machine/multiboot.h>
   
 /* LINTSTUB: include <sys/types.h> */  /* LINTSTUB: include <sys/types.h> */
 /* LINTSTUB: include <machine/cpu.h> */  /* LINTSTUB: include <machine/cpu.h> */
 /* LINTSTUB: include <sys/systm.h> */  /* LINTSTUB: include <sys/systm.h> */
Line 156 
Line 156 
         .data          .data
   
         .globl  _C_LABEL(cpu)          .globl  _C_LABEL(cpu)
         .globl  _C_LABEL(esym),_C_LABEL(boothowto)          .globl  _C_LABEL(esym)
         .globl  _C_LABEL(bootinfo),_C_LABEL(atdevbase)          .globl  _C_LABEL(atdevbase)
 #ifdef COMPAT_OLDBOOT          .globl  _C_LABEL(proc0uarea),_C_LABEL(PDPpaddr)
         .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 195  _C_LABEL(lapic_tpr):
Line 191  _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(proc0paddr):   .long   0  _C_LABEL(proc0uarea):   .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 224  tmpstk:
Line 209  tmpstk:
         .globl  start          .globl  start
 start:  movw    $0x1234,0x472                   # warm boot  start:  movw    $0x1234,0x472                   # warm boot
   
         /*  #if defined(MULTIBOOT)
          * Load parameters from stack          jmp     1f
          * (howto, [bootdev], bootinfo, esym, basemem, extmem).  
          */  
         movl    4(%esp),%eax  
         movl    %eax,RELOC(boothowto)  
 #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:  
         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          .align  4
         testl   %eax,%eax          .globl  Multiboot_Header
         jz      1f  _C_LABEL(Multiboot_Header):
         addl    $KERNBASE,%eax  #define MULTIBOOT_HEADER_FLAGS  (MULTIBOOT_HEADER_WANT_MEMORY | \
 1:      movl    %eax,RELOC(esym)                                   MULTIBOOT_HEADER_HAS_ADDR)
           .long   MULTIBOOT_HEADER_MAGIC
           .long   MULTIBOOT_HEADER_FLAGS
           .long   -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
           .long   RELOC(Multiboot_Header)
           .long   RELOC(start)
           .long   RELOC(_edata)
           .long   RELOC(_end) + MULTIBOOT_SYMTAB_SPACE
           .long   RELOC(start)
   
         movl    RELOC(biosextmem),%eax  
         testl   %eax,%eax  
         jnz     1f  
         movl    20(%esp),%eax  
         movl    %eax,RELOC(biosextmem)  
 1:  1:
         movl    RELOC(biosbasemem),%eax          /* Check if we are being executed by a Multiboot-compliant boot
         testl   %eax,%eax           * loader. */
         jnz     1f          cmpl    $MULTIBOOT_INFO_MAGIC,%eax
         movl    24(%esp),%eax          jne     1f
         movl    %eax,RELOC(biosbasemem)  
           /* Indeed, a multiboot-compliat boot loader executed us.  We copy
            * the received Multiboot information structure into kernel's data
            * space to process it later -- after we are relocated.  It will
            * be safer to run complex C code than doing it at this point. */
           pushl   %ebx            # Address of Multiboot information
           call    _C_LABEL(multiboot_pre_reloc)
           addl    $4,%esp
           jmp     2f
   #endif
   
 1:  1:
           /*
            * At this point, we know that a NetBSD-specific boot loader
            * booted this kernel.  The stack carries the following parameters:
            * (boothowto, [bootdev], bootinfo, esym, biosextmem, biosbasemem),
            * 4 bytes each.
            */
           addl    $4,%esp         # Discard return address to boot loader
           call    _C_LABEL(native_loader)
           addl    $24,%esp
   
   2:
         /* First, reset the PSL. */          /* First, reset the PSL. */
         pushl   $PSL_MBO          pushl   $PSL_MBO
         popfl          popfl
Line 628  begin:
Line 598  begin:
   
         /* Set up bootstrap stack. */          /* Set up bootstrap stack. */
         leal    (PROC0STACK+KERNBASE)(%esi),%eax          leal    (PROC0STACK+KERNBASE)(%esi),%eax
         movl    %eax,_C_LABEL(proc0paddr)          movl    %eax,_C_LABEL(proc0uarea)
         leal    (USPACE-FRAMESIZE)(%eax),%esp          leal    (KSTACK_SIZE-FRAMESIZE)(%eax),%esp
         movl    %esi,PCB_CR3(%eax)      # pcb->pcb_cr3          movl    %esi,(KSTACK_SIZE+PCB_CR3)(%eax)        # pcb->pcb_cr3
         xorl    %ebp,%ebp               # mark end of frames          xorl    %ebp,%ebp               # mark end of frames
   
   #if defined(MULTIBOOT)
           /* It is now safe to parse the Multiboot information structure
            * we saved before from C code.  Note that we cannot delay its
            * parsing any more because initgdt (called below) needs to make
            * use of this information. */
           call    _C_LABEL(multiboot_post_reloc)
   #endif
   
         subl    $NGDT*8, %esp           # space for temporary gdt          subl    $NGDT*8, %esp           # space for temporary gdt
         pushl   %esp          pushl   %esp
         call    _C_LABEL(initgdt)          call    _C_LABEL(initgdt)
Line 794  NENTRY(switch_error)
Line 772  NENTRY(switch_error)
   
 /*  /*
  * void cpu_switch(struct lwp *)   * void cpu_switch(struct lwp *)
  * Find a runnable process and switch to it.  Wait if necessary.  If the new   * Find a runnable lwp and switch to it.  Wait if necessary.  If the new
  * process is the same as the old one, we short-circuit the context save and   * lwp 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  
changed lines
  Added in v.1.42
CVSweb <webmaster@jp.NetBSD.org>