mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-24 07:41:54 -07:00
Code Issues Projects Releases Wiki Activity

Rename grainsizecheck as arenagrainsizecheck.

Browse source 
Copied from Perforce
 Change: 186506
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-06-11 17:33:10 +01:00
parent 99f2473bd8
commit 26e8aecdf2
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mps/code/arena.c
View file

@ -22,9 +22,9 @@ SRCID(arena, "$Id$");
#define ArenaFreeLand(arena) (&(arena)->freeLandStruct.landStruct)
/* GrainSizeCheck -- check that size is a valid arena grain size */
/* ArenaGrainSizeCheck -- check that size is a valid arena grain size */
Bool GrainSizeCheck(Size size)
Bool ArenaGrainSizeCheck(Size size)
{
CHECKL(size > 0);
/* <design/arena/#req.attr.block.align.min> */
@ -146,7 +146,7 @@ Bool ArenaCheck(Arena arena)
CHECKL(arena->spareCommitted <= arena->committed);
CHECKL(ShiftCheck(arena->zoneShift));
CHECKL(GrainSizeCheck(arena->grainSize));
CHECKL(ArenaGrainSizeCheck(arena->grainSize));
/* Stripes can't be smaller than grains. */
CHECKL(((Size)1 << arena->zoneShift) >= arena->grainSize);
@ -194,7 +194,7 @@ Res ArenaInit(Arena arena, ArenaClass class, Size grainSize, ArgList args)
AVER(arena != NULL);
AVERT(ArenaClass, class);
AVERT(GrainSize, grainSize);
AVERT(ArenaGrainSize, grainSize);
if (ArgPick(&arg, args, MPS_KEY_ARENA_ZONED))
zoned = arg.val.b;

2
mps/code/mpm.h
View file

@ -520,7 +520,7 @@ extern Ring GlobalsRememberedSummaryRing(Globals);
#define ArenaGreyRing(arena, rank) (&(arena)->greyRing[rank])
#define ArenaPoolRing(arena) (&ArenaGlobals(arena)->poolRing)
extern Bool GrainSizeCheck(Size size);
extern Bool ArenaGrainSizeCheck(Size size);
#define AddrArenaGrainUp(addr, arena) AddrAlignUp(addr, ArenaGrainSize(arena))
#define AddrArenaGrainDown(addr, arena) AddrAlignDown(addr, ArenaGrainSize(arena))
#define AddrIsArenaGrain(addr, arena) AddrIsAligned(addr, ArenaGrainSize(arena))

2
mps/code/vman.c
View file

@ -34,7 +34,7 @@ Bool VMCheck(VM vm)
CHECKL(vm->base != (Addr)0);
CHECKL(vm->limit != (Addr)0);
CHECKL(vm->base < vm->limit);
CHECKL(GrainSizeCheck(VMAN_GRAIN_SIZE));
CHECKL(ArenaGrainSizeCheck(VMAN_GRAIN_SIZE));
CHECKL(AddrIsAligned(vm->base, VMAN_GRAIN_SIZE));
CHECKL(AddrIsAligned(vm->limit, VMAN_GRAIN_SIZE));
CHECKL(vm->block != NULL);

4
mps/code/vmix.c
View file

@ -88,7 +88,7 @@ Bool VMCheck(VM vm)
CHECKL(vm->limit != 0);
CHECKL(vm->base < vm->limit);
CHECKL(vm->mapped <= vm->reserved);
CHECKL(GrainSizeCheck(vm->grainSize));
CHECKL(ArenaGrainSizeCheck(vm->grainSize));
CHECKL(AddrIsAligned(vm->base, vm->grainSize));
CHECKL(AddrIsAligned(vm->limit, vm->grainSize));
return TRUE;
@ -126,7 +126,7 @@ Res VMCreate(VM *vmReturn, Size size, void *params)
size = SizeAlignUp(size, grainSize);
if((size == 0) || (size > (Size)(size_t)-1))
return ResRESOURCE;
AVERT(GrainSize, grainSize);
AVERT(ArenaGrainSize, grainSize);
/* Map in a page to store the descriptor on. */
addr = mmap(0, (size_t)SizeAlignUp(sizeof(VMStruct), grainSize),

4
mps/code/vmw3.c
View file

@ -84,7 +84,7 @@ Bool VMCheck(VM vm)
CHECKL(vm->limit != 0);
CHECKL(vm->base < vm->limit);
CHECKL(vm->mapped <= vm->reserved);
CHECKL(GrainSizeCheck(vm->grainSize));
CHECKL(ArenaGrainSizeCheck(vm->grainSize));
CHECKL(AddrIsAligned(vm->base, vm->grainSize));
CHECKL(AddrIsAligned(vm->limit, vm->grainSize));
return TRUE;
@ -135,7 +135,7 @@ Res VMCreate(VM *vmReturn, Size size, void *params)
GetSystemInfo(&si);
grainSize = (Align)si.dwPageSize;
AVER((DWORD)grainSize == si.dwPageSize); /* check it didn't truncate */
AVERT(GrainSize, grainSize);
AVERT(ArenaGrainSize, grainSize);
size = SizeAlignUp(size, grainSize);
if ((size == 0) || (size > (Size)(SIZE_T)-1))
return ResRESOURCE;