Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.67.4.4 retrieving revision 1.75 diff -u -p -r1.67.4.4 -r1.75 --- src/sys/arch/i386/i386/locore.S 2009/08/19 18:46:19 1.67.4.4 +++ src/sys/arch/i386/i386/locore.S 2008/06/01 18:37:12 1.75 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.67.4.4 2009/08/19 18:46:19 yamt Exp $ */ +/* $NetBSD: locore.S,v 1.75 2008/06/01 18:37:12 ad Exp $ */ /* * Copyright-o-rama! @@ -71,11 +71,11 @@ /*- - * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 2000, 2004, 2006, 2007 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum, and by Andrew Doran. + * by Charles M. Hannum. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -134,12 +134,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.67.4.4 2009/08/19 18:46:19 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.75 2008/06/01 18:37:12 ad Exp $"); #include "opt_compat_oldboot.h" #include "opt_ddb.h" -#include "opt_modular.h" -#include "opt_multiboot.h" #include "opt_realmem.h" #include "opt_vm86.h" #include "opt_xen.h" @@ -173,6 +171,7 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 * Xen guest identifier and loader selection */ .section __xen_guest +#ifdef XEN3 .ascii "GUEST_OS=netbsd,GUEST_VER=3.0,XEN_VER=xen-3.0" #if defined(DOM0OPS) || !defined(XEN_COMPAT_030001) .ascii ",VIRT_BASE=0xc0000000" /* KERNBASE */ @@ -189,8 +188,11 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 #ifdef PAE .ascii ",PAE=yes[extended-cr3]" #endif +#else /* !XEN3 */ + .ascii "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0" +#endif /* XEN3 */ .ascii ",LOADER=generic" -#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE) +#if (NKSYMS || defined(DDB) || defined(LKM)) && !defined(SYMTAB_SPACE) .ascii ",BSD_SYMTAB=yes" #endif .byte 0 @@ -514,7 +516,7 @@ try586: /* Use the `cpuid' instruction. /* Find end of kernel image. */ movl $RELOC(end),%edi -#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE) +#if (NKSYMS || defined(DDB) || defined(LKM)) && !defined(SYMTAB_SPACE) /* Save the symbols (if loaded). */ movl RELOC(esym),%eax testl %eax,%eax @@ -646,7 +648,7 @@ try586: /* Use the `cpuid' instruction. movl %cr0,%eax # get control word # enable paging & NPX emulation orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP),%eax - movl %eax,%cr0 # and page NOW! + movl %eax,%cr0 # and let's page NOW! pushl $begin # jump to high mem ret @@ -723,7 +725,11 @@ start: popfl cld +#ifdef XEN3 movl %esp, %ebx # save start of available space +#else + movl %esi,%ebx # save start_info pointer +#endif movl $_RELOC(tmpstk),%esp # bootstrap stack end location /* Clear BSS first so that there are no surprises... */ @@ -771,13 +777,13 @@ start: addl $4,%esp call _C_LABEL(main) -#if defined(XEN) && !defined(XEN_COMPAT_030001) +#if defined(XEN3) && !defined(XEN_COMPAT_030001) /* space for the hypercall call page */ #define HYPERCALL_PAGE_OFFSET 0x1000 .org HYPERCALL_PAGE_OFFSET ENTRY(hypercall_page) .skip 0x1000 -#endif /* defined(XEN) && !defined(XEN_COMPAT_030001) */ +#endif /* defined(XEN3) && !defined(XEN_COMPAT_030001) */ /* * void lgdt_finish(void); @@ -903,7 +909,7 @@ ENTRY(dumpsys) END(dumpsys) /* - * struct lwp *cpu_switchto(struct lwp *oldlwp, struct *newlwp, + * struct lwp *cpu_switchto(struct lwp *oldlwp, struct newlwp, * bool returning) * * 1. if (oldlwp != NULL), save its context. @@ -1001,14 +1007,15 @@ ENTRY(cpu_switchto) 2: #ifndef XEN movl $IPL_IPI,CPUVAR(ILEVEL) - movl PCB_CR0(%ebx),%ecx /* has CR0_TS clear */ + movl PCB_CR0(%ebx),%ecx movl %cr0,%edx /* * If our floating point registers are on a different CPU, * set CR0_TS so we'll trap rather than reuse bogus state. */ - cmpl CPUVAR(FPCURLWP),%edi + movl PCB_FPCPU(%ebx),%eax + cmpl CPUVAR(SELF),%eax je 3f orl $CR0_TS,%ecx @@ -1039,7 +1046,6 @@ ENTRY(cpu_switchto) .Lcopy_iobitmap: /* Copy I/O bitmap. */ - incl _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT movl $(IOMAPSIZE/4),%ecx pushl %esi pushl %edi @@ -1072,13 +1078,8 @@ END(savectx) * Old call gate entry for syscall */ IDTVEC(osyscall) -#ifndef XEN - /* XXX we are in trouble! interrupts be off here. */ - cli # must be first instruction -#endif pushfl # set eflags in trap frame popl 8(%esp) - orl $PSL_I,(%esp) # re-enable ints on return to user pushl $7 # size of instruction for restart jmp syscall1 IDTVEC_END(osyscall) @@ -1093,13 +1094,12 @@ IDTVEC(syscall) syscall1: pushl $T_ASTFLT # trap # for doing ASTs INTRENTRY - STI(%eax) #ifdef DIAGNOSTIC movl CPUVAR(ILEVEL),%ebx testl %ebx,%ebx jz 1f pushl $5f - call _C_LABEL(panic) + call _C_LABEL(printf) addl $4,%esp #ifdef DDB int $3 @@ -1150,14 +1150,14 @@ syscall1: INTRFASTEXIT 3: STI(%eax) pushl $4f - call _C_LABEL(panic) + call _C_LABEL(printf) addl $4,%esp pushl $IPL_NONE call _C_LABEL(spllower) addl $4,%esp jmp .Lsyscall_checkast -4: .asciz "SPL NOT LOWERED ON SYSCALL EXIT\n" -5: .asciz "SPL NOT ZERO ON SYSCALL ENTRY\n" +4: .asciz "WARNING: SPL NOT LOWERED ON SYSCALL EXIT\n" +5: .asciz "WARNING: SPL NOT ZERO ON SYSCALL ENTRY\n" #endif /* DIAGNOSTIC */ 9: cmpl $0, CPUVAR(WANT_PMAPLOAD) @@ -1176,39 +1176,6 @@ syscall1: jmp .Lsyscall_checkast /* re-check ASTs */ IDTVEC_END(syscall) -IDTVEC(svr4_fasttrap) - pushl $2 # size of instruction for restart - pushl $T_ASTFLT # trap # for doing ASTs - INTRENTRY - STI(%eax) - pushl $RW_READER - pushl $_C_LABEL(svr4_fasttrap_lock) - call _C_LABEL(rw_enter) - addl $8,%esp - call *_C_LABEL(svr4_fasttrap_vec) - pushl $_C_LABEL(svr4_fasttrap_lock) - call _C_LABEL(rw_exit) - addl $4,%esp -2: /* Check for ASTs on exit to user mode. */ - cli - CHECK_ASTPENDING(%eax) - je 1f - /* Always returning to user mode here. */ - CLEAR_ASTPENDING(%eax) - sti - /* Pushed T_ASTFLT into tf_trapno on entry. */ - pushl %esp - call _C_LABEL(trap) - addl $4,%esp - jmp 2b -1: CHECK_DEFERRED_SWITCH - jnz 9f - INTRFASTEXIT -9: sti - call _C_LABEL(pmap_load) - cli - jmp 2b - #if NNPX > 0 /* * Special interrupt handlers. Someday intr0-intr15 will be used to count @@ -1260,21 +1227,18 @@ END(npx586bug1) #endif /* NNPX > 0 */ /* - * void sse2_idlezero_page(void *pg) + * void sse2_zero_page(void *pg) * - * Zero a page without polluting the cache. Preemption must be - * disabled by the caller. Abort if a preemption is pending. + * Zero a page without polluting the cache. */ -ENTRY(sse2_idlezero_page) +ENTRY(sse2_zero_page) pushl %ebp movl %esp,%ebp movl 8(%esp), %edx - movl $(PAGE_SIZE/32), %ecx + movl $(PAGE_SIZE/64), %ecx xorl %eax, %eax .align 16 1: - testl $RESCHED_KPREEMPT, CPUVAR(RESCHED) - jnz 2f movnti %eax, 0(%edx) movnti %eax, 4(%edx) movnti %eax, 8(%edx) @@ -1283,15 +1247,60 @@ ENTRY(sse2_idlezero_page) movnti %eax, 20(%edx) movnti %eax, 24(%edx) movnti %eax, 28(%edx) - addl $32, %edx + movnti %eax, 32(%edx) + movnti %eax, 36(%edx) + movnti %eax, 40(%edx) + movnti %eax, 44(%edx) + movnti %eax, 48(%edx) + movnti %eax, 52(%edx) + movnti %eax, 56(%edx) + movnti %eax, 60(%edx) + addl $64, %edx decl %ecx jnz 1b sfence - incl %eax pop %ebp ret -2: +END(sse2_zero_page) + +/* + * void sse2_copy_page(void *src, void *dst) + * + * Copy a page without polluting the cache. + */ +ENTRY(sse2_copy_page) + pushl %ebp + pushl %ebx + pushl %esi + pushl %edi + movl 20(%esp), %esi + movl 24(%esp), %edi + xorl %ebp, %ebp + .align 16 +1: + movl 0(%esi,%ebp), %eax + movl 4(%esi,%ebp), %ebx + movl 8(%esi,%ebp), %ecx + movl 12(%esi,%ebp), %edx + movnti %eax, 0(%edi,%ebp) + movnti %ebx, 4(%edi,%ebp) + movnti %ecx, 8(%edi,%ebp) + movnti %edx, 12(%edi,%ebp) + movl 16(%esi,%ebp), %eax + movl 20(%esi,%ebp), %ebx + movl 24(%esi,%ebp), %ecx + movl 28(%esi,%ebp), %edx + movnti %eax, 16(%edi,%ebp) + movnti %ebx, 20(%edi,%ebp) + movnti %ecx, 24(%edi,%ebp) + movnti %edx, 28(%edi,%ebp) + addl $32, %ebp + cmpl $PAGE_SIZE, %ebp + jne 1b sfence + popl %edi + popl %esi + popl %ebx popl %ebp ret -END(sse2_idlezero_page) +END(sse2_copy_page)