/*
* Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
vm_offset_t dst_offset,
vm_size_t len)
{
- pmap_paddr_t src, dst;
-
+ vm_offset_t src, dst;
assert(psrc != vm_page_fictitious_addr);
assert(pdst != vm_page_fictitious_addr);
-
- src = i386_ptob(psrc);
- dst = i386_ptob(pdst);
-
- assert((((uint32_t)dst & PAGE_MASK) + dst_offset + len) <= PAGE_SIZE);
- assert((((uint32_t)src & PAGE_MASK) + src_offset + len) <= PAGE_SIZE);
-
+ src = (vm_offset_t)i386_ptob(psrc);
+ dst = (vm_offset_t)i386_ptob(pdst);
+ assert(((dst & PAGE_MASK) + dst_offset + len) <= PAGE_SIZE);
+ assert(((src & PAGE_MASK) + src_offset + len) <= PAGE_SIZE);
bcopy_phys((addr64_t)src + (src_offset & INTEL_OFFMASK),
(addr64_t)dst + (dst_offset & INTEL_OFFMASK),
len);
vm_offset_t dst_offset,
vm_size_t len)
{
- mapwindow_t *map;
+ pt_entry_t *ptep;
+ thread_t thr_act = current_thread();
assert(pdst != vm_page_fictitious_addr);
- assert((dst_offset + len) <= PAGE_SIZE);
-
- mp_disable_preemption();
-
- map = pmap_get_mapwindow(INTEL_PTE_VALID | INTEL_PTE_RW | (i386_ptob(pdst) & PG_FRAME) |
- INTEL_PTE_REF | INTEL_PTE_MOD);
- if (map == 0) {
- panic("pmap_copy_part_lpage");
- }
- invlpg((uintptr_t)map->prv_CADDR);
-
- memcpy((void *) (map->prv_CADDR + (dst_offset & INTEL_OFFMASK)), (void *) src, len);
- *map->prv_CMAP = 0;
-
- mp_enable_preemption();
+ ptep = pmap_pte(thr_act->map->pmap, i386_ptob(pdst));
+ if (0 == ptep)
+ panic("pmap_copy_part_lpage ptep");
+ assert(((pdst & PAGE_MASK) + dst_offset + len) <= PAGE_SIZE);
+ if (*(pt_entry_t *) CM2)
+ panic("pmap_copy_part_lpage");
+ *(int *) CM2 = INTEL_PTE_VALID | INTEL_PTE_RW | (*ptep & PG_FRAME) |
+ INTEL_PTE_REF | INTEL_PTE_MOD;
+ invlpg((unsigned int) CA2);
+ memcpy((void *) (CA2 + (dst_offset & INTEL_OFFMASK)), (void *) src, len);
+ *(pt_entry_t *) CM2 = 0;
}
/*
vm_offset_t dst,
vm_size_t len)
{
- mapwindow_t *map;
+ pt_entry_t *ptep;
+ thread_t thr_act = current_thread();
assert(psrc != vm_page_fictitious_addr);
- assert((src_offset + len) <= PAGE_SIZE);
-
- mp_disable_preemption();
-
- map = pmap_get_mapwindow(INTEL_PTE_VALID | INTEL_PTE_RW | (i386_ptob(psrc) & PG_FRAME) |
- INTEL_PTE_REF);
- if (map == 0) {
- panic("pmap_copy_part_rpage");
- }
- invlpg((uintptr_t) map->prv_CADDR);
-
- memcpy((void *) dst, (void *) (map->prv_CADDR + (src_offset & INTEL_OFFMASK)), len);
- *map->prv_CMAP = 0;
-
- mp_enable_preemption();
+ ptep = pmap_pte(thr_act->map->pmap, i386_ptob(psrc));
+ if (0 == ptep)
+ panic("pmap_copy_part_rpage ptep");
+ assert(((psrc & PAGE_MASK) + src_offset + len) <= PAGE_SIZE);
+ if (*(pt_entry_t *) CM2)
+ panic("pmap_copy_part_rpage");
+ *(pt_entry_t *) CM2 = INTEL_PTE_VALID | INTEL_PTE_RW | (*ptep & PG_FRAME) |
+ INTEL_PTE_REF;
+ invlpg((unsigned int) CA2);
+ memcpy((void *) dst, (void *) (CA2 + (src_offset & INTEL_OFFMASK)), len);
+ *(pt_entry_t *) CM2 = 0;
}
/*
*
* Convert a kernel virtual address to a physical address
*/
-addr64_t
+vm_offset_t
kvtophys(
vm_offset_t addr)
{
pt_entry_t *ptep;
pmap_paddr_t pa;
-
- mp_disable_preemption();
- if ((ptep = pmap_pte(kernel_pmap, (vm_map_offset_t)addr)) == PT_ENTRY_NULL) {
- pa = 0;
+
+ if ((ptep = pmap_pte(kernel_pmap, addr)) == PT_ENTRY_NULL) {
+ pa = 0;
} else {
- pa = pte_to_pa(*ptep) | (addr & INTEL_OFFMASK);
+ pa = pte_to_pa(*ptep) | (addr & INTEL_OFFMASK);
}
- mp_enable_preemption_no_check();
- return ((addr64_t)pa);
+ if (0 == pa)
+ kprintf("kvtophys ret 0!\n");
+ return (pa);
}
-
projects / apple / xnu.git / blobdiff