X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debug%2Fsorter%2Fretros.c;h=a97e5545f32e34344a7866aadc64d41a62cc4317;hb=889bb33b738e79732f3fb1ca79b361ac0375aa76;hp=b0de3a824e91b53848ee9f9ca5064cdfd6e86c45;hpb=8c661b20faa518f211d54b59ede9127e3b633914;p=libucw.git diff --git a/debug/sorter/retros.c b/debug/sorter/retros.c index b0de3a82..a97e5545 100644 --- a/debug/sorter/retros.c +++ b/debug/sorter/retros.c @@ -23,25 +23,12 @@ static u32 sum; static struct elt *alloc_elts(uns n) { -#if 0 - return xmalloc(n * sizeof(struct elt)); -#else - uns len = ALIGN_TO(n * sizeof(struct elt), PAGE_SIZE); - void *p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - ASSERT(p != MAP_FAILED); - return p; -#endif + return big_alloc(n * sizeof(struct elt)); } static void free_elts(struct elt *a, uns n) { -#if 0 - xfree(a); - (void) n; -#else - uns len = ALIGN_TO(n * sizeof(struct elt), PAGE_SIZE); - munmap(a, len); -#endif + big_free(a, n * sizeof(struct elt)); } static int comp(const void *x, const void *y) @@ -198,8 +185,8 @@ static void r1c_sse_sort(void) struct elt *ptrs[256], *x, *lim; ASSERT(sizeof(struct elt) == 16); - ASSERT(!((addr_int_t)alt & 15)); - ASSERT(!((addr_int_t)ary & 15)); + ASSERT(!((uintptr_t)alt & 15)); + ASSERT(!((uintptr_t)ary & 15)); x = ary; lim = ary + n; bzero(cnt, sizeof(cnt));