From d7dcaa4745dd417ab2df9facf8490dfd3b4c6b8b Mon Sep 17 00:00:00 2001 From: David Lovemore Date: Thu, 5 Jul 2012 15:26:47 +0100 Subject: [PATCH] Update mv2test for 64-bit even though it is failing. varargs and alignment fixes. Copied from Perforce Change: 178561 ServerID: perforce.ravenbrook.com --- mps/code/mv2test.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mps/code/mv2test.c b/mps/code/mv2test.c index fc2f95ab435..b2f7fcf7ea8 100644 --- a/mps/code/mv2test.c +++ b/mps/code/mv2test.c @@ -190,12 +190,13 @@ static size_t randomSize(int i) #define TEST_SET_SIZE 1234 #define TEST_LOOPS 27 +#define alignUp(w, a) (((w) + (a) - 1) & ~((size_t)(a) - 1)) + static mps_res_t make(mps_addr_t *p, mps_ap_t ap, size_t size) { mps_res_t res; - /* --- align */ - size = ((size+7)/8)*8; + size = alignUp(size, MPS_PF_ALIGN); do { MPS_RESERVE_BLOCK(res, *p, ap, size); @@ -298,7 +299,7 @@ static void stress_with_arena_class(mps_arena_class_t aclass) die(mps_arena_create(&arena, aclass, testArenaSIZE), "mps_arena_create"); - min = 8; + min = MPS_PF_ALIGN; mean = 42; max = 8192; @@ -307,7 +308,7 @@ static void stress_with_arena_class(mps_arena_class_t aclass) mean, /* median_size */ max, /* maximum_size */ (mps_count_t)TEST_SET_SIZE/2, /* reserve_depth */ - 30 /* fragmentation_limit */ + (mps_count_t)30 /* fragmentation_limit */ ), "stress MVT");