mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity

Fix bug in landtest: block needs to be aligned.

Browse source 
Copied from Perforce
 Change: 186611
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-06-14 11:21:57 +01:00
parent 3a2f360df7
commit fb8a86c973
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mps/code/landtest.c
View file

@ -480,7 +480,7 @@ extern int main(int argc, char *argv[])
Arena arena;
TestStateStruct state;
void *p;
Addr dummyBlock;
Addr block;
BT allocTable;
MFSStruct blockPool;
CBSStruct cbsStruct;
@ -506,16 +506,13 @@ extern int main(int argc, char *argv[])
die((mps_res_t)BTCreate(&allocTable, arena, ArraySize),
"failed to create alloc table");
/* We're not going to use this block, but I feel unhappy just */
/* inventing addresses. */
die((mps_res_t)ControlAlloc(&p, arena, ArraySize * align,
die((mps_res_t)ControlAlloc(&p, arena, (ArraySize + 1) * align,
/* withReservoirPermit */ FALSE),
"failed to allocate block");
dummyBlock = p; /* avoid pun */
block = AddrAlignUp(p, align);
if (verbose) {
printf("Allocated block [%p,%p)\n", (void*)dummyBlock,
(char *)dummyBlock + ArraySize);
printf("Allocated block [%p,%p)\n", block, AddrAdd(block, ArraySize));
}
/* 1. Test CBS */
@ -525,7 +522,7 @@ extern int main(int argc, char *argv[])
"failed to initialise CBS");
} MPS_ARGS_END(args);
state.align = align;
state.block = dummyBlock;
state.block = block;
state.allocTable = allocTable;
state.land = cbs;
test(&state, nCBSOperations);
@ -580,6 +577,7 @@ extern int main(int argc, char *argv[])
PoolFinish(mfs);
}
ControlFree(arena, p, (ArraySize + 1) * align);
mps_arena_destroy(arena);
printf("\nNumber of allocations attempted: %"PRIuLONGEST"\n",