UPAGES --> USPACE

This commit is contained in:
mycroft 1995-04-12 15:38:09 +00:00
parent bf15373974
commit 7e37bbe000
2 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: genassym.c,v 1.34 1995/04/07 22:29:46 fvdl Exp $ */
/* $NetBSD: genassym.c,v 1.35 1995/04/12 15:38:09 mycroft Exp $ */
/*-
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -97,6 +97,7 @@ main()
def("VM_MAXUSER_ADDRESS", VM_MAXUSER_ADDRESS);
def("UPAGES", UPAGES);
def("USPACE", USPACE);
def("PGSHIFT", PGSHIFT);
def("PDSHIFT", PDSHIFT);

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.119 1995/04/07 22:29:39 fvdl Exp $ */
/* $NetBSD: locore.s,v 1.120 1995/04/12 15:38:13 mycroft Exp $ */
#undef DIAGNOSTIC
#define DIAGNOSTIC
@ -544,7 +544,7 @@ begin: /* Now running relocated at KERNBASE. */
movl %edx,_Crtat
/* Set up bootstrap stack. */
movl $(_kstack+UPAGES*NBPG-4*12),%esp # bootstrap stack end location
movl $(_kstack+USPACE-4*12),%esp # bootstrap stack end location
xorl %eax,%eax # mark end of frames
movl %eax,%ebp
movl _proc0paddr,%eax
@ -1822,7 +1822,7 @@ ENTRY(switch_exit)
/* Thoroughly nuke the old process's resources. */
pushl P_VMSPACE(%edi)
call _vmspace_free
pushl $(UPAGES << PGSHIFT)
pushl $USPACE
pushl P_ADDR(%edi)
pushl _kernel_map
call _kmem_free
@ -1860,7 +1860,7 @@ ENTRY(savectx)
movl %esp,%eax # eax = stack pointer
movl %eax,%edx # edx = stack offset from bottom
subl $_kstack,%edx
movl $(UPAGES << PGSHIFT),%ecx # ecx = ctob(UPAGES) - offset
movl $USPACE,%ecx # ecx = USPACE - offset
subl %edx,%ecx
pushl %ecx
addl %edx,%esi # esi = stack in p2