69c69
< * $Id: vm_fault.c,v 1.37 1995/11/20 12:19:53 phk Exp $
---
> * $Id: vm_fault.c,v 1.38 1995/12/07 12:48:10 davidg Exp $
132c132
< vm_offset_t first_offset;
---
> vm_pindex_t first_pindex;
135c135
< register vm_offset_t offset;
---
> register vm_pindex_t pindex;
195c195
< &first_offset, &prot, &wired, &su)) != KERN_SUCCESS) {
---
> &first_pindex, &prot, &wired, &su)) != KERN_SUCCESS) {
251c251
< offset = first_offset;
---
> pindex = first_pindex;
258c258
< m = vm_page_lookup(object, offset);
---
> m = vm_page_lookup(object, pindex);
300c300
< if (offset >= object->size) {
---
> if (pindex >= object->size) {
308c308
< m = vm_page_alloc(object, offset,
---
> m = vm_page_alloc(object, pindex,
360c360
< m = vm_page_lookup(object, offset);
---
> m = vm_page_lookup(object, pindex);
419c419
< offset += object->backing_object_offset;
---
> pindex += OFF_TO_IDX(object->backing_object_offset);
430c430
< offset = first_offset;
---
> pindex = first_pindex;
524c524
< offset = first_offset;
---
> pindex = first_pindex;
548c548
< vm_offset_t retry_offset;
---
> vm_pindex_t retry_pindex;
565c565
< &entry, &retry_object, &retry_offset, &retry_prot, &wired, &su);
---
> &entry, &retry_object, &retry_pindex, &retry_prot, &wired, &su);
581c581
< (retry_offset != first_offset)) {
---
> (retry_pindex != first_pindex)) {
658c658
< printf("page not busy: %d\n", m->offset);
---
> printf("page not busy: %d\n", m->pindex);
776,777c776,777
< vm_offset_t dst_offset;
< vm_offset_t src_offset;
---
> vm_ooffset_t dst_offset;
> vm_ooffset_t src_offset;
795c795
< (vm_size_t) (dst_entry->end - dst_entry->start));
---
> (vm_size_t) OFF_TO_IDX(dst_entry->end - dst_entry->start));
815c815,816
< dst_m = vm_page_alloc(dst_object, dst_offset, VM_ALLOC_NORMAL);
---
> dst_m = vm_page_alloc(dst_object,
> OFF_TO_IDX(dst_offset), VM_ALLOC_NORMAL);
826c827,828
< src_m = vm_page_lookup(src_object, dst_offset + src_offset);
---
> src_m = vm_page_lookup(src_object,
> OFF_TO_IDX(dst_offset + src_offset));
874c876,877
< vm_offset_t offset, startoffset, endoffset, toffset, size;
---
> vm_pindex_t pindex, startpindex, endpindex, tpindex;
> vm_offset_t size;
880c883
< offset = m->offset;
---
> pindex = m->pindex;
887c890
< object->paging_offset + offset, &cbehind, &cahead))
---
> OFF_TO_IDX(object->paging_offset) + pindex, &cbehind, &cahead))
919,926c922,929
< toffset = offset - PAGE_SIZE;
< if (toffset < offset) {
< if (rbehind * PAGE_SIZE > offset)
< rbehind = offset / PAGE_SIZE;
< startoffset = offset - rbehind * PAGE_SIZE;
< while (toffset >= startoffset) {
< if (vm_page_lookup( object, toffset)) {
< startoffset = toffset + PAGE_SIZE;
---
> tpindex = pindex - 1;
> if (tpindex < pindex) {
> if (rbehind > pindex)
> rbehind = pindex;
> startpindex = pindex - rbehind;
> while (tpindex >= startpindex) {
> if (vm_page_lookup( object, tpindex)) {
> startpindex = tpindex + 1;
929c932
< if (toffset == 0)
---
> if (tpindex == 0)
931c934
< toffset -= PAGE_SIZE;
---
> tpindex -= 1;
934c937
< startoffset = offset;
---
> startpindex = pindex;
941,946c944,949
< toffset = offset + PAGE_SIZE;
< endoffset = offset + (rahead + 1) * PAGE_SIZE;
< if (endoffset > object->size)
< endoffset = object->size;
< while (toffset < endoffset) {
< if ( vm_page_lookup(object, toffset)) {
---
> tpindex = pindex + 1;
> endpindex = pindex + (rahead + 1);
> if (endpindex > object->size)
> endpindex = object->size;
> while (tpindex < endpindex) {
> if ( vm_page_lookup(object, tpindex)) {
949c952
< toffset += PAGE_SIZE;
---
> tpindex += 1;
951c954
< endoffset = toffset;
---
> endpindex = tpindex;
954c957
< size = (endoffset - startoffset) / PAGE_SIZE;
---
> size = endpindex - startpindex;
957c960
< treqpage = (offset - startoffset) / PAGE_SIZE;
---
> treqpage = pindex - startpindex;
968c971
< startoffset + i * PAGE_SIZE,
---
> startpindex + i,