mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 14:30:42 -08:00
Code Issues Projects Releases Wiki Activity

Configurable arena alignment on windows.

Browse source 
Copied from Perforce
 Change: 186380
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-05-30 13:53:01 +01:00
parent 57b3acfb7d
commit 2129f452ed
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mps/code/vmix.c
View file

@ -149,8 +149,6 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
}
vm = (VM)addr;
vm->align = align;
/* See .assume.not-last. */
reserved = size + align - pagealign;
addr = mmap(0, reserved, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
@ -161,14 +159,15 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
goto failReserve;
}
vm->align = align;
vm->reserved_base = addr;
vm->base = AddrAlignUp(addr, align);
vm->limit = AddrAdd(vm->base, size);
AVER(vm->base < vm->limit); /* .assume.not-last */
vm->reserved = reserved;
vm->mapped = (Size)0;
vm->mapped = 0;
vm->sig = VMSig;
AVERT(VM, vm);
EVENT4(VMCreate, vm, vm->align, vm->base, vm->limit);

31
mps/code/vmw3.c
View file

@ -59,7 +59,8 @@ SRCID(vmw3, "$Id$");
typedef struct VMStruct {
Sig sig; /* <design/sig/> */
Align align; /* page size */
Addr base, limit; /* boundaries of reserved space */
void *reserved_base; /* unaligned base of VirtualAlloc'd memory */
Addr base, limit; /* aligned boundaries of reserved space */
Size reserved; /* total reserved address space */
Size mapped; /* total mapped memory */
} VMStruct;
@ -120,13 +121,16 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
{
LPVOID vbase;
SYSTEM_INFO si;
Align align;
Align pagealign;
VM vm;
Res res;
BOOL b;
VMParams vmParams = params;
Size reserved;
AVER(vmReturn != NULL);
AVER(size > 0);
AVERT(Align, align);
AVER(params != NULL); /* FIXME: Should have full AVERT? */
AVER(COMPATTYPE(LPVOID, Addr)); /* .assume.lpvoid-addr */
@ -137,10 +141,11 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
/* Check that the page size will fit in an object of type Align, and
* that it is a valid alignment (see .assume.sysalign). */
AVER(si.dwPageSize > 0);
AVER(si.dwPageSize <= (DWORD)(Align)-1);
AVERT(Align, (Align)si.dwPageSize);
AVER(si.dwPageSize <= (Align)-1);
pagealign = si.dwPageSize;
AVERT(Align, pagealign);
align = AlignAlignUp(align, (Align)si.dwPageSize);
align = AlignAlignUp(align, pagealign);
size = SizeAlignUp(size, align);
if ((size == 0) || (size > (Size)(SIZE_T)-1))
return ResRESOURCE;
@ -153,8 +158,9 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
vm = (VM)vbase;
/* Allocate the address space. */
reserved = size + align - pagealign;
vbase = VirtualAlloc(NULL,
size,
reserved,
vmParams->topDown ?
MEM_RESERVE | MEM_TOP_DOWN :
MEM_RESERVE,
@ -164,19 +170,19 @@ Res VMCreate(VM *vmReturn, Size size, Align align, void *params)
goto failReserve;
}
AVER(AddrIsAligned(vbase, align));
vm->align = align;
vm->base = (Addr)vbase;
vm->limit = AddrAdd(vbase, size);
vm->reserved_base = vbase;
vm->base = AddrAlignUp(vbase, align);
vm->limit = AddrAdd(vm->base, size);
AVER(vm->base < vm->limit); /* .assume.not-last */
vm->reserved = size;
vm->mapped = 0;
AVER(vm->base < vm->limit); /* .assume.not-last */
vm->sig = VMSig;
AVERT(VM, vm);
EVENT4(VMCreate, vm, vm->align, vm->base, vm->limit);
*vmReturn = vm;
return ResOK;
@ -203,7 +209,7 @@ void VMDestroy(VM vm)
* fail and it would be nice to have a dead sig there. */
vm->sig = SigInvalid;
b = VirtualFree((LPVOID)vm->base, (SIZE_T)0, MEM_RELEASE);
b = VirtualFree((LPVOID)vm->reserved_base, (SIZE_T)0, MEM_RELEASE);
AVER(b != 0);
b = VirtualFree((LPVOID)vm, (SIZE_T)0, MEM_RELEASE);
@ -276,6 +282,7 @@ Res VMMap(VM vm, Addr base, Addr limit)
AVER((Addr)b == base); /* base should've been aligned */
vm->mapped += AddrOffset(base, limit);
AVER(vm->mapped <= vm->reserved);
EVENT3(VMMap, vm, base, limit);
return ResOK;