Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PAGE_SIZE rather than NBPG.

Browse Source
This commit is contained in:
thorpej 2003-04-08 22:57:53 +00:00
parent 7a22c14e21
commit 9a8042f242
25 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/amiga/amiga/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.17 2003/01/17 22:17:05 thorpej Exp $ # $NetBSD: genassym.cf,v 1.18 2003/04/08 22:57:54 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -126,7 +126,7 @@ define UVMEXP_INTRS offsetof(struct uvmexp, intrs)
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

8
sys/arch/amiga/amiga/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.134 2003/01/17 22:17:05 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.135 2003/04/08 22:57:54 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -64,8 +64,8 @@
.text .text
GLOBAL(kernel_text) GLOBAL(kernel_text)
L_base: L_base:
.long 0x4ef80400+NBPG /* jmp jmp0.w */ .long 0x4ef80400+PAGE_SIZE /* jmp jmp0.w */
.fill NBPG/4-1,4,0/*xdeadbeef*/ .fill PAGE_SIZE/4-1,4,0/*xdeadbeef*/
#include <amiga/amiga/vectors.s> #include <amiga/amiga/vectors.s>
#include <amiga/amiga/custom.h> #include <amiga/amiga/custom.h>
@ -1583,7 +1583,7 @@ ENTRY_NOPROFILE(fpeaemu60)
#endif #endif
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
GLOBAL(mmutype) GLOBAL(mmutype)

17
sys/arch/arm/arm32/bcopy_page.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: bcopy_page.S,v 1.5 2002/08/17 16:36:33 thorpej Exp $ */ /* $NetBSD: bcopy_page.S,v 1.6 2003/04/08 22:57:53 thorpej Exp $ */
/* /*
* Copyright (c) 1995 Scott Stevens * Copyright (c) 1995 Scott Stevens
@ -38,9 +38,10 @@
* Created : 08/04/95 * Created : 08/04/95
*/ */
#include <machine/param.h>
#include <machine/asm.h> #include <machine/asm.h>
#include "assym.h"
/* #define BIG_LOOPS */ /* #define BIG_LOOPS */
/* /*
@ -53,7 +54,7 @@
* r1 - dest address * r1 - dest address
* *
* Requires: * Requires:
* number of bytes per page (NBPG) is a multiple of 512 (BIG_LOOPS), 128 * number of bytes per page (PAGE_SIZE) is a multiple of 512 (BIG_LOOPS), 128
* otherwise. * otherwise.
*/ */
@ -84,9 +85,9 @@ ENTRY(bcopy_page)
PREFETCH_FIRST_CHUNK PREFETCH_FIRST_CHUNK
SAVE_REGS SAVE_REGS
#ifdef BIG_LOOPS #ifdef BIG_LOOPS
mov r2, #(NBPG >> 9) mov r2, #(PAGE_SIZE >> 9)
#else #else
mov r2, #(NBPG >> 7) mov r2, #(PAGE_SIZE >> 7)
#endif #endif
1: 1:
@ -128,16 +129,16 @@ ENTRY(bcopy_page)
* r0 - dest address * r0 - dest address
* *
* Requires: * Requires:
* number of bytes per page (NBPG) is a multiple of 512 (BIG_LOOPS), 128 * number of bytes per page (PAGE_SIZE) is a multiple of 512 (BIG_LOOPS), 128
* otherwise * otherwise
*/ */
ENTRY(bzero_page) ENTRY(bzero_page)
stmfd sp!, {r4-r8, lr} stmfd sp!, {r4-r8, lr}
#ifdef BIG_LOOPS #ifdef BIG_LOOPS
mov r2, #(NBPG >> 9) mov r2, #(PAGE_SIZE >> 9)
#else #else
mov r2, #(NBPG >> 7) mov r2, #(PAGE_SIZE >> 7)
#endif #endif
mov r3, #0 mov r3, #0
mov r4, #0 mov r4, #0

3
sys/arch/arm/arm32/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.20 2003/01/17 22:28:49 thorpej Exp $ # $NetBSD: genassym.cf,v 1.21 2003/04/08 22:57:53 thorpej Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California. # Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved. # All rights reserved.
@ -61,6 +61,7 @@ define VM_MIN_ADDRESS VM_MIN_ADDRESS
define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS
define PTE_BASE PTE_BASE define PTE_BASE PTE_BASE
define PAGE_SIZE PAGE_SIZE
define UPAGES UPAGES define UPAGES UPAGES
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT

4
sys/arch/atari/atari/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.19 2003/01/17 22:34:23 thorpej Exp $ # $NetBSD: genassym.cf,v 1.20 2003/04/08 22:57:54 thorpej Exp $
#- #-
# Copyright (c) 1997 The NetBSD Foundation, Inc. # Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -109,7 +109,7 @@ define UVMEXP_INTRS offsetof(struct uvmexp, intrs)
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

6
sys/arch/atari/atari/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.90 2003/01/17 22:34:23 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.91 2003/04/08 22:57:54 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -74,7 +74,7 @@
/* /*
* Clear & skip page zero, it will not be mapped * Clear & skip page zero, it will not be mapped
*/ */
.fill NBPG/4,4,0 .fill PAGE_SIZE/4,4,0
#include <atari/atari/vectors.s> #include <atari/atari/vectors.s>
@ -1418,7 +1418,7 @@ ASLOCAL(zero)
Ldorebootend: Ldorebootend:
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
GLOBAL(protorp) GLOBAL(protorp)
.long 0x80000002,0 | prototype root pointer .long 0x80000002,0 | prototype root pointer

4
sys/arch/cesfic/cesfic/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.3 2003/01/17 22:40:31 thorpej Exp $ # $NetBSD: genassym.cf,v 1.4 2003/04/08 22:57:55 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -96,7 +96,7 @@ define EC_VIRT EC_VIRT
define KERNBASE KERNBASE define KERNBASE KERNBASE
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

6
sys/arch/cesfic/cesfic/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.7 2003/01/19 16:33:54 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.8 2003/04/08 22:57:55 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -67,7 +67,7 @@ GLOBAL(kernel_text)
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
#include <cesfic/cesfic/vectors.s> #include <cesfic/cesfic/vectors.s>
@ -216,7 +216,7 @@ Lmemok:
#endif #endif
movl #_C_LABEL(end),%d5 | end of static kernel text/data movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart2: Lstart2:
addl #NBPG-1,%d5 addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4 movl %d5,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA

6
sys/arch/evbppc/evbppc/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.1 2002/12/09 12:15:54 scw Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2003/04/08 23:12:20 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -151,7 +151,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
/* /*
* Compute the segment size, and adjust counts. * Compute the segment size, and adjust counts.
*/ */
sgsize = NBPG - ((u_long)vaddr & PGOFSET); sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
if (buflen < sgsize) if (buflen < sgsize)
sgsize = buflen; sgsize = buflen;
@ -566,7 +566,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
for (curseg = 0; curseg < nsegs; curseg++) { for (curseg = 0; curseg < nsegs; curseg++) {
for (addr = segs[curseg].ds_addr; for (addr = segs[curseg].ds_addr;
addr < (segs[curseg].ds_addr + segs[curseg].ds_len); addr < (segs[curseg].ds_addr + segs[curseg].ds_len);
addr += NBPG, va += NBPG, size -= NBPG) { addr += PAGE_SIZE, va += PAGE_SIZE, size -= PAGE_SIZE) {
if (size == 0) if (size == 0)
panic("_bus_dmamem_map: size botch"); panic("_bus_dmamem_map: size botch");
pmap_enter(pmap_kernel(), va, addr, pmap_enter(pmap_kernel(), va, addr,

8
sys/arch/evbppc/evbppc/evbppc_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: evbppc_machdep.c,v 1.1 2002/12/09 12:15:54 scw Exp $ */ /* $NetBSD: evbppc_machdep.c,v 1.2 2003/04/08 23:12:20 thorpej Exp $ */
/* /*
* Copyright 2001, 2002 Wasabi Systems, Inc. * Copyright 2001, 2002 Wasabi Systems, Inc.
@ -103,11 +103,11 @@ mapiodev(paddr_t pa, psize_t len, int flags)
if (va == 0) if (va == 0)
return NULL; return NULL;
for (; len > 0; len -= NBPG) { for (; len > 0; len -= PAGE_SIZE) {
pmap_kenter_pa(taddr, faddr, pmap_kenter_pa(taddr, faddr,
VM_PROT_READ|VM_PROT_WRITE|PME_NOCACHE); VM_PROT_READ|VM_PROT_WRITE|PME_NOCACHE);
faddr += NBPG; faddr += PAGE_SIZE;
taddr += NBPG; taddr += PAGE_SIZE;
} }
return (void *)(va + off); return (void *)(va + off);

4
sys/arch/hp300/hp300/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.28 2003/01/17 22:53:08 thorpej Exp $ # $NetBSD: genassym.cf,v 1.29 2003/04/08 22:57:55 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -145,7 +145,7 @@ endif
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK
define MAXADDR MAXADDR define MAXADDR MAXADDR

12
sys/arch/hp300/hp300/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.128 2003/02/02 10:24:39 wiz Exp $ */ /* $NetBSD: locore.s,v 1.129 2003/04/08 22:57:55 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -77,7 +77,7 @@ GLOBAL(kernel_text)
* The bootloader places the bootinfo in this page, and we allocate * The bootloader places the bootinfo in this page, and we allocate
* a VA for it and map it in pmap_bootstrap(). * a VA for it and map it in pmap_bootstrap().
*/ */
.fill NBPG/4,4,0 .fill PAGE_SIZE/4,4,0
/* /*
* Temporary stack for a variety of purposes. * Temporary stack for a variety of purposes.
@ -86,7 +86,7 @@ GLOBAL(kernel_text)
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
#include <hp300/hp300/vectors.s> #include <hp300/hp300/vectors.s>
@ -376,7 +376,7 @@ Lstart2:
#endif #endif
movl #_C_LABEL(end),%d5 | end of static kernel text/data movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart3: Lstart3:
addl #NBPG-1,%d5 addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4 movl %d5,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA
@ -1442,7 +1442,7 @@ Lbootcode:
movl #0,%d0 movl #0,%d0
movc %d0,%cacr | caches off movc %d0,%cacr | caches off
.long 0x4e7b0003 | movc %d0,%tc .long 0x4e7b0003 | movc %d0,%tc
movl %d2,MAXADDR+NBPG-4 | restore old high page contents movl %d2,MAXADDR+PAGE_SIZE-4 | restore old high page contents
DOREBOOT DOREBOOT
LmotommuF: LmotommuF:
#endif #endif
@ -1457,7 +1457,7 @@ LhpmmuB:
#if defined(M68K_MMU_HP) #if defined(M68K_MMU_HP)
MMUADDR(%a0) MMUADDR(%a0)
movl #0xFFFF0000,%a0@(MMUCMD) | totally disable MMU movl #0xFFFF0000,%a0@(MMUCMD) | totally disable MMU
movl %d2,MAXADDR+NBPG-4 | restore old high page contents movl %d2,MAXADDR+PAGE_SIZE-4 | restore old high page contents
DOREBOOT DOREBOOT
#endif #endif
Lebootcode: Lebootcode:

4
sys/arch/luna68k/luna68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.7 2003/01/17 23:13:12 thorpej Exp $ # $NetBSD: genassym.cf,v 1.8 2003/04/08 22:57:55 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -96,7 +96,7 @@ define EC_VIRT EC_VIRT
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

6
sys/arch/luna68k/luna68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.16 2003/01/17 23:13:12 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.17 2003/04/08 22:57:55 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -68,7 +68,7 @@
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
#include <luna68k/luna68k/vectors.s> #include <luna68k/luna68k/vectors.s>
@ -216,7 +216,7 @@ Lstart2:
RELOC(end,%a0) RELOC(end,%a0)
movl %a0,%d2 | end of static kernel text/data movl %a0,%d2 | end of static kernel text/data
Lstart3: Lstart3:
addl #NBPG-1,%d2 addl #PAGE_SIZE-1,%d2
andl #PG_FRAME,%d2 | round to a page andl #PG_FRAME,%d2 | round to a page
movl %d2,%a4 movl %d2,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA

20
sys/arch/m68k/m68k/copypage.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: copypage.s,v 1.8 2001/05/18 15:31:38 fredette Exp $ */ /* $NetBSD: copypage.s,v 1.9 2003/04/08 22:57:56 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -50,14 +50,14 @@
/* /*
* copypage040(fromaddr, toaddr) * copypage040(fromaddr, toaddr)
* *
* Optimized version of bcopy for a single page-aligned NBPG byte copy, * Optimized version of bcopy for a single page-aligned PAGE_SIZE byte copy,
* using instuctions only available on the mc68040 and later. * using instuctions only available on the mc68040 and later.
*/ */
#if defined(M68040) || defined(M68060) #if defined(M68040) || defined(M68060)
ENTRY(copypage040) ENTRY(copypage040)
movl %sp@(4),%a0 | source address movl %sp@(4),%a0 | source address
movl %sp@(8),%a1 | destiniation address movl %sp@(8),%a1 | destiniation address
movw #NBPG/32-1,%d0 | number of 32 byte chunks - 1 movw #PAGE_SIZE/32-1,%d0 | number of 32 byte chunks - 1
Lm16loop: Lm16loop:
.long 0xf6209000 | move16 %a0@+,%a1@+ .long 0xf6209000 | move16 %a0@+,%a1@+
.long 0xf6209000 | move16 %a0@+,%a1@+ .long 0xf6209000 | move16 %a0@+,%a1@+
@ -68,13 +68,13 @@ Lm16loop:
/* /*
* copypage(fromaddr, toaddr) * copypage(fromaddr, toaddr)
* *
* Optimized version of bcopy for a single page-aligned NBPG byte copy. * Optimized version of bcopy for a single page-aligned PAGE_SIZE byte copy.
*/ */
ENTRY(copypage) ENTRY(copypage)
movl %sp@(4),%a0 | source address movl %sp@(4),%a0 | source address
movl %sp@(8),%a1 | destiniation address movl %sp@(8),%a1 | destiniation address
#ifndef __mc68010__ #ifndef __mc68010__
movw #NBPG/32-1,%d0 | number of 32 byte chunks - 1 movw #PAGE_SIZE/32-1,%d0 | number of 32 byte chunks - 1
Lmlloop: Lmlloop:
movl %a0@+,%a1@+ movl %a0@+,%a1@+
movl %a0@+,%a1@+ movl %a0@+,%a1@+
@ -86,7 +86,7 @@ Lmlloop:
movl %a0@+,%a1@+ movl %a0@+,%a1@+
dbf %d0,Lmlloop dbf %d0,Lmlloop
#else /* __mc68010__ */ #else /* __mc68010__ */
movw #NBPG/4-1,%d0 | number of 4 byte chunks - 1 movw #PAGE_SIZE/4-1,%d0 | number of 4 byte chunks - 1
Lmlloop: Lmlloop:
movl %a0@+,%a1@+ movl %a0@+,%a1@+
dbf %d0,Lmlloop | use the 68010 loop mode dbf %d0,Lmlloop | use the 68010 loop mode
@ -96,12 +96,12 @@ Lmlloop:
/* /*
* zeropage(addr) * zeropage(addr)
* *
* Optimized version of bzero for a single page-aligned NBPG byte zero. * Optimized version of bzero for a single page-aligned PAGE_SIZE byte zero.
*/ */
ENTRY(zeropage) ENTRY(zeropage)
movl %sp@(4),%a0 | dest address movl %sp@(4),%a0 | dest address
#ifndef __mc68010__ #ifndef __mc68010__
movql #NBPG/256-1,%d0 | number of 256 byte chunks - 1 movql #PAGE_SIZE/256-1,%d0 | number of 256 byte chunks - 1
movml %d2-%d7,%sp@- movml %d2-%d7,%sp@-
movql #0,%d1 movql #0,%d1
movql #0,%d2 movql #0,%d2
@ -111,7 +111,7 @@ ENTRY(zeropage)
movql #0,%d6 movql #0,%d6
movql #0,%d7 movql #0,%d7
movl %d1,%a1 movl %d1,%a1
lea %a0@(NBPG),%a0 lea %a0@(PAGE_SIZE),%a0
Lzloop: Lzloop:
movml %d1-%d7/%a1,%a0@- movml %d1-%d7/%a1,%a0@-
movml %d1-%d7/%a1,%a0@- movml %d1-%d7/%a1,%a0@-
@ -124,7 +124,7 @@ Lzloop:
dbf %d0,Lzloop dbf %d0,Lzloop
movml %sp@+,%d2-%d7 movml %sp@+,%d2-%d7
#else /* __mc68010__ */ #else /* __mc68010__ */
movw #NBPG/4-1,%d0 | number of 4 byte chunks - 1 movw #PAGE_SIZE/4-1,%d0 | number of 4 byte chunks - 1
Lzloop: Lzloop:
clrl %a0@+ clrl %a0@+
dbf %d0,Lzloop | use the 68010 loop mode dbf %d0,Lzloop | use the 68010 loop mode

4
sys/arch/mac68k/mac68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.24 2003/01/17 23:21:40 thorpej Exp $ # $NetBSD: genassym.cf,v 1.25 2003/04/08 22:57:56 thorpej Exp $
# #
# Copyright (c) 1990 The Regents of the University of California. # Copyright (c) 1990 The Regents of the University of California.
@ -82,7 +82,7 @@ define FPU_68040 FPU_68040
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define P1PAGES P1PAGES define P1PAGES P1PAGES
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define NPTEPG NPTEPG define NPTEPG NPTEPG
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define SYSPTSIZE SYSPTSIZE define SYSPTSIZE SYSPTSIZE

4
sys/arch/mac68k/mac68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.140 2003/01/17 23:21:40 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.141 2003/04/08 22:57:56 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -1475,7 +1475,7 @@ get_pte_fail10:
GLOBAL(sanity_check) GLOBAL(sanity_check)
.long 0x18621862 | this is our stack overflow checker. .long 0x18621862 | this is our stack overflow checker.
.space 4 * NBPG .space 4 * PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
GLOBAL(machineid) GLOBAL(machineid)

4
sys/arch/mvme68k/mvme68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.24 2003/01/17 23:42:04 thorpej Exp $ # $NetBSD: genassym.cf,v 1.25 2003/04/08 22:57:56 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -113,7 +113,7 @@ define EC_VIRT EC_VIRT
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

22
sys/arch/mvme68k/mvme68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.90 2003/01/17 23:42:04 thorpej Exp $ */ /* $NetBSD: locore.s,v 1.91 2003/04/08 22:57:57 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -62,7 +62,7 @@
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
ASLOCAL(bug_vbr) ASLOCAL(bug_vbr)
@ -314,13 +314,13 @@ Linit147:
/* offboard RAM */ /* offboard RAM */
clrl %a0@(0x0c) | phys_seg_list[1].ps_start clrl %a0@(0x0c) | phys_seg_list[1].ps_start
movl #NBPG-1,%d0 movl #PAGE_SIZE-1,%d0
addl 0xfffe0764,%d0 | Start of offboard segment addl 0xfffe0764,%d0 | Start of offboard segment
andl #-NBPG,%d0 | Round up to page boundary andl #-PAGE_SIZE,%d0 | Round up to page boundary
jbeq Lsavmaxmem | Jump if none defined jbeq Lsavmaxmem | Jump if none defined
movl #NBPG,%d1 | Note: implicit '+1' movl #PAGE_SIZE,%d1 | Note: implicit '+1'
addl 0xfffe0768,%d1 | End of offboard segment addl 0xfffe0768,%d1 | End of offboard segment
andl #-NBPG,%d1 | Round up to page boundary andl #-PAGE_SIZE,%d1 | Round up to page boundary
cmpl %d1,%d0 | Quick and dirty validity check cmpl %d1,%d0 | Quick and dirty validity check
jbcs Loff_ok | Yup, looks good. jbcs Loff_ok | Yup, looks good.
movel %a0@(4),%d1 | Just use onboard RAM otherwise movel %a0@(4),%d1 | Just use onboard RAM otherwise
@ -508,13 +508,13 @@ Lis1xx_common:
/* offboard RAM */ /* offboard RAM */
clrl %a0@(0x0c) | phys_seg_list[1].ps_start clrl %a0@(0x0c) | phys_seg_list[1].ps_start
movl #NBPG-1,%d0 movl #PAGE_SIZE-1,%d0
addl 0xfffc0000,%d0 | Start of offboard segment addl 0xfffc0000,%d0 | Start of offboard segment
andl #-NBPG,%d0 | Round up to page boundary andl #-PAGE_SIZE,%d0 | Round up to page boundary
jbeq Ldone1xx | Jump if none defined jbeq Ldone1xx | Jump if none defined
movl #NBPG,%d1 | Note: implicit '+1' movl #PAGE_SIZE,%d1 | Note: implicit '+1'
addl 0xfffc0004,%d1 | End of offboard segment addl 0xfffc0004,%d1 | End of offboard segment
andl #-NBPG,%d1 | Round up to page boundary andl #-PAGE_SIZE,%d1 | Round up to page boundary
cmpl %d1,%d0 | Quick and dirty validity check cmpl %d1,%d0 | Quick and dirty validity check
jbcs Lramsave1xx | Yup, looks good. jbcs Lramsave1xx | Yup, looks good.
movel %a0@(4),%d1 | Just use onboard RAM otherwise movel %a0@(4),%d1 | Just use onboard RAM otherwise
@ -561,7 +561,7 @@ Lstart1:
#endif #endif
movl #_C_LABEL(end),%d2 | end of static kernel text/data movl #_C_LABEL(end),%d2 | end of static kernel text/data
Lstart2: Lstart2:
addl #NBPG-1,%d2 addl #PAGE_SIZE-1,%d2
andl #PG_FRAME,%d2 | round to a page andl #PG_FRAME,%d2 | round to a page
movl %d2,%a4 movl %d2,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA

4
sys/arch/news68k/news68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.11 2003/01/18 06:05:42 thorpej Exp $ # $NetBSD: genassym.cf,v 1.12 2003/04/08 22:57:57 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -99,7 +99,7 @@ define EC_VIRT EC_VIRT
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

6
sys/arch/news68k/news68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.29 2003/01/18 12:29:02 tsutsui Exp $ */ /* $NetBSD: locore.s,v 1.30 2003/04/08 22:57:57 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -66,7 +66,7 @@
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
ASLOCAL(monitor_vbr) ASLOCAL(monitor_vbr)
@ -335,7 +335,7 @@ Lstart1:
RELOC(end,%a0) RELOC(end,%a0)
movl %a0,%d2 | end of static kernel text/data movl %a0,%d2 | end of static kernel text/data
Lstart2: Lstart2:
addl #NBPG-1,%d2 addl #PAGE_SIZE-1,%d2
andl #PG_FRAME,%d2 | round to a page andl #PG_FRAME,%d2 | round to a page
movl %d2,%a4 movl %d2,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA

4
sys/arch/next68k/next68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.15 2003/01/18 06:09:55 thorpej Exp $ # $NetBSD: genassym.cf,v 1.16 2003/04/08 22:57:57 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -118,7 +118,7 @@ endif
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

8
sys/arch/next68k/next68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.38 2003/02/02 10:24:39 wiz Exp $ */ /* $NetBSD: locore.s,v 1.39 2003/04/08 22:57:57 thorpej Exp $ */
/* /*
* Copyright (c) 1998 Darrin B. Jewell * Copyright (c) 1998 Darrin B. Jewell
@ -75,14 +75,14 @@ GLOBAL(kernel_text)
/* /*
* Leave page zero empty so it can be unmapped * Leave page zero empty so it can be unmapped
*/ */
.space NBPG .space PAGE_SIZE
/* /*
* Temporary stack for a variety of purposes. * Temporary stack for a variety of purposes.
*/ */
.data .data
GLOBAL(endstack) GLOBAL(endstack)
.space NBPG .space PAGE_SIZE
GLOBAL(bgnstack) GLOBAL(bgnstack)
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
@ -271,7 +271,7 @@ Lstart2:
movl #_C_LABEL(end),%d5 | end of static kernel text/data movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart3: Lstart3:
addl #NBPG-1,%d5 addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4 movl %d5,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA

4
sys/arch/x68k/x68k/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.21 2003/01/18 07:14:21 thorpej Exp $ # $NetBSD: genassym.cf,v 1.22 2003/04/08 22:57:57 thorpej Exp $
# #
# Copyright (c) 1982, 1990, 1993 # Copyright (c) 1982, 1990, 1993
@ -103,7 +103,7 @@ endif
# general constants # general constants
define UPAGES UPAGES define UPAGES UPAGES
define USPACE USPACE define USPACE USPACE
define NBPG NBPG define PAGE_SIZE PAGE_SIZE
define PGSHIFT PGSHIFT define PGSHIFT PGSHIFT
define USRSTACK USRSTACK define USRSTACK USRSTACK

6
sys/arch/x68k/x68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.69 2003/02/02 10:24:40 wiz Exp $ */ /* $NetBSD: locore.s,v 1.70 2003/04/08 22:57:58 thorpej Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -69,7 +69,7 @@ GLOBAL(kernel_text)
* our text segment. * our text segment.
*/ */
.data .data
.space NBPG .space PAGE_SIZE
ASLOCAL(tmpstk) ASLOCAL(tmpstk)
#include <x68k/x68k/vectors.s> #include <x68k/x68k/vectors.s>
@ -824,7 +824,7 @@ Lstart1:
#endif #endif
movl #_C_LABEL(end),%d5 | end of static kernel text/data movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart2: Lstart2:
addl #NBPG-1,%d5 addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4 movl %d5,%a4
addl %a5,%a4 | convert to PA addl %a5,%a4 | convert to PA