From fd8912c287dd2cf32f18c97e8a35eb0d5cd087f0 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Fri, 24 May 2013 19:21:29 +0100 Subject: [PATCH] Fixing up mps_rank_* to the new interface as a step towards reviving the old test suite. Copied from Perforce Change: 182174 ServerID: perforce.ravenbrook.com --- mps/test/argerr/10.c | 2 +- mps/test/argerr/100.c | 2 +- mps/test/argerr/101.c | 2 +- mps/test/argerr/102.c | 2 +- mps/test/argerr/103.c | 2 +- mps/test/argerr/106.c | 2 +- mps/test/argerr/107.c | 2 +- mps/test/argerr/108.c | 2 +- mps/test/argerr/109.c | 2 +- mps/test/argerr/11.c | 2 +- mps/test/argerr/110.c | 2 +- mps/test/argerr/111.c | 2 +- mps/test/argerr/112.c | 2 +- mps/test/argerr/113.c | 2 +- mps/test/argerr/114.c | 2 +- mps/test/argerr/115.c | 2 +- mps/test/argerr/116.c | 2 +- mps/test/argerr/117.c | 2 +- mps/test/argerr/118.c | 2 +- mps/test/argerr/12.c | 2 +- mps/test/argerr/121.c | 2 +- mps/test/argerr/122.c | 2 +- mps/test/argerr/123.c | 2 +- mps/test/argerr/124.c | 2 +- mps/test/argerr/125.c | 2 +- mps/test/argerr/126.c | 2 +- mps/test/argerr/127.c | 2 +- mps/test/argerr/128.c | 2 +- mps/test/argerr/129.c | 2 +- mps/test/argerr/13.c | 2 +- mps/test/argerr/130.c | 2 +- mps/test/argerr/131.c | 2 +- mps/test/argerr/132.c | 2 +- mps/test/argerr/133.c | 2 +- mps/test/argerr/134.c | 2 +- mps/test/argerr/135.c | 2 +- mps/test/argerr/136.c | 2 +- mps/test/argerr/137.c | 2 +- mps/test/argerr/138.c | 2 +- mps/test/argerr/139.c | 2 +- mps/test/argerr/14.c | 2 +- mps/test/argerr/140.c | 2 +- mps/test/argerr/141.c | 2 +- mps/test/argerr/142.c | 2 +- mps/test/argerr/143.c | 2 +- mps/test/argerr/146.c | 4 ++-- mps/test/argerr/147.c | 4 ++-- mps/test/argerr/148.c | 4 ++-- mps/test/argerr/149.c | 4 ++-- mps/test/argerr/15.c | 2 +- mps/test/argerr/150.c | 4 ++-- mps/test/argerr/151.c | 4 ++-- mps/test/argerr/154.c | 4 ++-- mps/test/argerr/16.c | 2 +- mps/test/argerr/17.c | 2 +- mps/test/argerr/18.c | 2 +- mps/test/argerr/19.c | 2 +- mps/test/argerr/4.c | 2 +- mps/test/argerr/45.c | 4 ++-- mps/test/argerr/46.c | 4 ++-- mps/test/argerr/47.c | 4 ++-- mps/test/argerr/48.c | 4 ++-- mps/test/argerr/49.c | 2 +- mps/test/argerr/5.c | 2 +- mps/test/argerr/50.c | 2 +- mps/test/argerr/51.c | 4 ++-- mps/test/argerr/52.c | 4 ++-- mps/test/argerr/53.c | 4 ++-- mps/test/argerr/54.c | 4 ++-- mps/test/argerr/55.c | 4 ++-- mps/test/argerr/56.c | 4 ++-- mps/test/argerr/57.c | 4 ++-- mps/test/argerr/58.c | 4 ++-- mps/test/argerr/59.c | 4 ++-- mps/test/argerr/6.c | 2 +- mps/test/argerr/60.c | 4 ++-- mps/test/argerr/61.c | 4 ++-- mps/test/argerr/62.c | 4 ++-- mps/test/argerr/63.c | 4 ++-- mps/test/argerr/64.c | 4 ++-- mps/test/argerr/65.c | 4 ++-- mps/test/argerr/66.c | 4 ++-- mps/test/argerr/67.c | 4 ++-- mps/test/argerr/7.c | 2 +- mps/test/argerr/8.c | 2 +- mps/test/argerr/9.c | 2 +- mps/test/argerr/90.c | 2 +- mps/test/argerr/91.c | 2 +- mps/test/argerr/92.c | 2 +- mps/test/argerr/93.c | 2 +- mps/test/argerr/96.c | 2 +- mps/test/argerr/97.c | 2 +- mps/test/argerr/98.c | 2 +- mps/test/argerr/99.c | 2 +- mps/test/conerr/17.c | 2 +- mps/test/conerr/28.c | 2 +- mps/test/conerr/29.c | 2 +- mps/test/conerr/30.c | 2 +- mps/test/conerr/31.c | 2 +- mps/test/conerr/32.c | 2 +- mps/test/conerr/33.c | 2 +- mps/test/conerr/33a.c | 2 +- mps/test/conerr/34.c | 4 ++-- mps/test/conerr/35.c | 4 ++-- mps/test/conerr/36.c | 4 ++-- mps/test/conerr/37.c | 4 ++-- mps/test/conerr/37f.c | 4 ++-- mps/test/conerr/38.c | 4 ++-- mps/test/conerr/38f.c | 4 ++-- mps/test/conerr/39.c | 4 ++-- mps/test/conerr/39f.c | 4 ++-- mps/test/conerr/40.c | 4 ++-- mps/test/conerr/40f.c | 4 ++-- mps/test/conerr/41.c | 2 +- mps/test/conerr/42.c | 2 +- mps/test/conerr/43.c | 2 +- mps/test/conerr/44.c | 2 +- mps/test/conerr/44a.c | 2 +- mps/test/conerr/6.c | 2 +- mps/test/function/10.c | 4 ++-- mps/test/function/103.c | 16 +++++++-------- mps/test/function/104.c | 22 ++++++++++---------- mps/test/function/105.c | 12 +++++------ mps/test/function/106.c | 4 ++-- mps/test/function/107.c | 4 ++-- mps/test/function/108.c | 6 +++--- mps/test/function/109.c | 22 ++++++++++---------- mps/test/function/11.c | 4 ++-- mps/test/function/110.c | 22 ++++++++++---------- mps/test/function/111.c | 22 ++++++++++---------- mps/test/function/112.c | 8 ++++---- mps/test/function/113.c | 16 +++++++-------- mps/test/function/114.c | 16 +++++++-------- mps/test/function/116.c | 12 +++++------ mps/test/function/117.c | 8 ++++---- mps/test/function/118.c | 4 ++-- mps/test/function/12.c | 4 ++-- mps/test/function/122.c | 30 +++++++++++++-------------- mps/test/function/123.c | 14 ++++++------- mps/test/function/124.c | 18 ++++++++--------- mps/test/function/125.c | 12 +++++------ mps/test/function/126.c | 10 ++++----- mps/test/function/127.c | 18 ++++++++--------- mps/test/function/128.c | 18 ++++++++--------- mps/test/function/129.c | 18 ++++++++--------- mps/test/function/12p.c | 4 ++-- mps/test/function/13.c | 4 ++-- mps/test/function/130.c | 14 ++++++------- mps/test/function/131.c | 12 +++++------ mps/test/function/132.c | 8 ++++---- mps/test/function/133.c | 6 +++--- mps/test/function/134.c | 18 ++++++++--------- mps/test/function/138.c | 6 +++--- mps/test/function/14.c | 6 +++--- mps/test/function/147.c | 4 ++-- mps/test/function/148.c | 20 +++++++++--------- mps/test/function/149.c | 8 ++++---- mps/test/function/15.c | 4 ++-- mps/test/function/150.c | 22 ++++++++++---------- mps/test/function/151.c | 4 ++-- mps/test/function/152.c | 12 +++++------ mps/test/function/153.c | 4 ++-- mps/test/function/16.c | 6 +++--- mps/test/function/171.c | 18 ++++++++--------- mps/test/function/18.c | 2 +- mps/test/function/19.c | 4 ++-- mps/test/function/2.c | 4 ++-- mps/test/function/20.c | 2 +- mps/test/function/203.c | 2 +- mps/test/function/204.c | 2 +- mps/test/function/205.c | 2 +- mps/test/function/214.c | 2 +- mps/test/function/215.c | 18 ++++++++--------- mps/test/function/223.c | 18 ++++++++--------- mps/test/function/226.c | 16 +++++++-------- mps/test/function/227.c | 36 ++++++++++++++++----------------- mps/test/function/23.c | 2 +- mps/test/function/24.c | 4 ++-- mps/test/function/25.c | 4 ++-- mps/test/function/27.c | 4 ++-- mps/test/function/28.c | 4 ++-- mps/test/function/29.c | 4 ++-- mps/test/function/3.c | 4 ++-- mps/test/function/30.c | 4 ++-- mps/test/function/31.c | 6 +++--- mps/test/function/32.c | 6 +++--- mps/test/function/33.c | 6 +++--- mps/test/function/34.c | 6 +++--- mps/test/function/35.c | 4 ++-- mps/test/function/36.c | 6 +++--- mps/test/function/37.c | 6 +++--- mps/test/function/38.c | 20 +++++++++--------- mps/test/function/39.c | 6 +++--- mps/test/function/4.c | 4 ++-- mps/test/function/40.c | 6 +++--- mps/test/function/41.c | 6 +++--- mps/test/function/42.c | 6 +++--- mps/test/function/43.c | 8 ++++---- mps/test/function/44.c | 8 ++++---- mps/test/function/45.c | 4 ++-- mps/test/function/46.c | 6 +++--- mps/test/function/47.c | 12 +++++------ mps/test/function/48.c | 16 +++++++-------- mps/test/function/49.c | 22 ++++++++++---------- mps/test/function/5.c | 6 +++--- mps/test/function/50.c | 22 ++++++++++---------- mps/test/function/51.c | 22 ++++++++++---------- mps/test/function/52.c | 10 ++++----- mps/test/function/53.c | 6 +++--- mps/test/function/54.c | 6 +++--- mps/test/function/55.c | 6 +++--- mps/test/function/56.c | 6 +++--- mps/test/function/57.c | 6 +++--- mps/test/function/6.c | 4 ++-- mps/test/function/60.c | 6 +++--- mps/test/function/61.c | 6 +++--- mps/test/function/62.c | 6 +++--- mps/test/function/63.c | 4 ++-- mps/test/function/64.c | 6 +++--- mps/test/function/65.c | 18 ++++++++--------- mps/test/function/66.c | 22 ++++++++++---------- mps/test/function/67.c | 10 ++++----- mps/test/function/68.c | 6 +++--- mps/test/function/69.c | 4 ++-- mps/test/function/72.c | 4 ++-- mps/test/function/73.c | 8 ++++---- mps/test/function/74.c | 8 ++++---- mps/test/function/75.c | 8 ++++---- mps/test/function/76.c | 22 ++++++++++---------- mps/test/function/77.c | 16 +++++++-------- mps/test/function/78.c | 16 +++++++-------- mps/test/function/79.c | 16 +++++++-------- mps/test/function/80.c | 16 +++++++-------- mps/test/function/81.c | 12 +++++------ mps/test/function/83.c | 6 +++--- mps/test/function/9.c | 4 ++-- mps/test/function/96.c | 14 ++++++------- mps/test/function/97.c | 22 ++++++++++---------- mps/test/function/99.c | 16 +++++++-------- mps/test/test/testlib/rankfmt.c | 8 ++++---- 240 files changed, 760 insertions(+), 760 deletions(-) diff --git a/mps/test/argerr/10.c b/mps/test/argerr/10.c index 0a2066731ae..0c2bc1af852 100644 --- a/mps/test/argerr/10.c +++ b/mps/test/argerr/10.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/100.c b/mps/test/argerr/100.c index 93ebf8ebd3e..f6dc766560c 100644 --- a/mps/test/argerr/100.c +++ b/mps/test/argerr/100.c @@ -23,7 +23,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(NULL, space, - MPS_RANK_AMBIG, 0, a, sizeof a), + mps_rank_ambig(), 0, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/101.c b/mps/test/argerr/101.c index 8ea8f72c4b8..156c72ffb2b 100644 --- a/mps/test/argerr/101.c +++ b/mps/test/argerr/101.c @@ -23,7 +23,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(UNALIGNED, space, - MPS_RANK_AMBIG, 0, a, sizeof a), + mps_rank_ambig(), 0, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/102.c b/mps/test/argerr/102.c index 6f14179dd2a..964b8c76c07 100644 --- a/mps/test/argerr/102.c +++ b/mps/test/argerr/102.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, NULL, - MPS_RANK_AMBIG, 0, a, sizeof a), + mps_rank_ambig(), 0, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/103.c b/mps/test/argerr/103.c index e523c03366a..b70ca481d8f 100644 --- a/mps/test/argerr/103.c +++ b/mps/test/argerr/103.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, UNALIGNED, - MPS_RANK_AMBIG, 0, a, sizeof a), + mps_rank_ambig(), 0, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/106.c b/mps/test/argerr/106.c index ebe918bf5fc..fab732cc895 100644 --- a/mps/test/argerr/106.c +++ b/mps/test/argerr/106.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - HIGHBIT_INT+MPS_RANK_AMBIG, 0, a, sizeof a), + HIGHBIT_INT+mps_rank_ambig(), 0, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/107.c b/mps/test/argerr/107.c index 8f0290fad6d..1f03691eb52 100644 --- a/mps/test/argerr/107.c +++ b/mps/test/argerr/107.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, MPS_RM_MIN-1, a, sizeof a), + mps_rank_ambig(), MPS_RM_MIN-1, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/108.c b/mps/test/argerr/108.c index 11f1d98f0cb..b0110ef95df 100644 --- a/mps/test/argerr/108.c +++ b/mps/test/argerr/108.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, MPS_RM_MAX+1, a, sizeof a), + mps_rank_ambig(), MPS_RM_MAX+1, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/109.c b/mps/test/argerr/109.c index de04f3f932a..78bcd7ed6b5 100644 --- a/mps/test/argerr/109.c +++ b/mps/test/argerr/109.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, HIGHBIT_INT, a, sizeof a), + mps_rank_ambig(), HIGHBIT_INT, a, sizeof a), "root create"); } diff --git a/mps/test/argerr/11.c b/mps/test/argerr/11.c index 3bcb028979e..c87d65c814b 100644 --- a/mps/test/argerr/11.c +++ b/mps/test/argerr/11.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/110.c b/mps/test/argerr/110.c index 417fd9a1c52..706e0b64093 100644 --- a/mps/test/argerr/110.c +++ b/mps/test/argerr/110.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, 0, NULL, sizeof a), + mps_rank_ambig(), 0, NULL, sizeof a), "root create"); } diff --git a/mps/test/argerr/111.c b/mps/test/argerr/111.c index dfbdb80f56c..54ec7a31240 100644 --- a/mps/test/argerr/111.c +++ b/mps/test/argerr/111.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, 0, UNALIGNED, sizeof a), + mps_rank_ambig(), 0, UNALIGNED, sizeof a), "root create"); } diff --git a/mps/test/argerr/112.c b/mps/test/argerr/112.c index 64bfa232f09..e4afe8883f3 100644 --- a/mps/test/argerr/112.c +++ b/mps/test/argerr/112.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, 0, a, (size_t) 0), + mps_rank_ambig(), 0, a, (size_t) 0), "root create"); } diff --git a/mps/test/argerr/113.c b/mps/test/argerr/113.c index b56707e00d6..a2f65ac2419 100644 --- a/mps/test/argerr/113.c +++ b/mps/test/argerr/113.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, 0, a, (size_t) 31), + mps_rank_ambig(), 0, a, (size_t) 31), "root create"); } diff --git a/mps/test/argerr/114.c b/mps/test/argerr/114.c index 6ba5d95f4ae..9ac491def36 100644 --- a/mps/test/argerr/114.c +++ b/mps/test/argerr/114.c @@ -24,7 +24,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie(mps_root_create_table(&root, space, - MPS_RANK_AMBIG, 0, a, (size_t) -32), + mps_rank_ambig(), 0, a, (size_t) -32), "root create"); } diff --git a/mps/test/argerr/115.c b/mps/test/argerr/115.c index 413f5545775..30f076a45e6 100644 --- a/mps/test/argerr/115.c +++ b/mps/test/argerr/115.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(NULL, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(NULL, space, mps_rank_ambig(), 0, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/116.c b/mps/test/argerr/116.c index 1a6cf62c792..6cb63e16e68 100644 --- a/mps/test/argerr/116.c +++ b/mps/test/argerr/116.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(UNALIGNED, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(UNALIGNED, space, mps_rank_ambig(), 0, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/117.c b/mps/test/argerr/117.c index 9a5e97d8725..3b562905559 100644 --- a/mps/test/argerr/117.c +++ b/mps/test/argerr/117.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, NULL, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, NULL, mps_rank_ambig(), 0, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/118.c b/mps/test/argerr/118.c index 5cc58f76000..4ad2e50a9de 100644 --- a/mps/test/argerr/118.c +++ b/mps/test/argerr/118.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, UNALIGNED, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, UNALIGNED, mps_rank_ambig(), 0, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/12.c b/mps/test/argerr/12.c index 3cf21053c5f..56a98b12c11 100644 --- a/mps/test/argerr/12.c +++ b/mps/test/argerr/12.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/121.c b/mps/test/argerr/121.c index ba224f85059..66273c68ff2 100644 --- a/mps/test/argerr/121.c +++ b/mps/test/argerr/121.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG+HIGHBIT_INT, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig()+HIGHBIT_INT, 0, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/122.c b/mps/test/argerr/122.c index 2fecc14ea38..6f2513925aa 100644 --- a/mps/test/argerr/122.c +++ b/mps/test/argerr/122.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, MPS_RM_MIN-1, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), MPS_RM_MIN-1, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/123.c b/mps/test/argerr/123.c index b36e879f298..4c419f86c89 100644 --- a/mps/test/argerr/123.c +++ b/mps/test/argerr/123.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, MPS_RM_MAX+1, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), MPS_RM_MAX+1, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/124.c b/mps/test/argerr/124.c index 0ab1996e530..39a6ae9d197 100644 --- a/mps/test/argerr/124.c +++ b/mps/test/argerr/124.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, HIGHBIT_INT, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), HIGHBIT_INT, fmtscan, a, &a[32]), "root create"); diff --git a/mps/test/argerr/125.c b/mps/test/argerr/125.c index 7b706fb97b2..d16d633f42a 100644 --- a/mps/test/argerr/125.c +++ b/mps/test/argerr/125.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), 0, fmtscan, NULL, &a[32]), "root create"); diff --git a/mps/test/argerr/126.c b/mps/test/argerr/126.c index 06cb76ac198..443ae8fc1b1 100644 --- a/mps/test/argerr/126.c +++ b/mps/test/argerr/126.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), 0, fmtscan, UNALIGNED, &a[32]), "root create"); diff --git a/mps/test/argerr/127.c b/mps/test/argerr/127.c index c031515d83b..443aaa31951 100644 --- a/mps/test/argerr/127.c +++ b/mps/test/argerr/127.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), 0, fmtscan, a, NULL), "root create"); diff --git a/mps/test/argerr/128.c b/mps/test/argerr/128.c index 59069693215..b4cf0948734 100644 --- a/mps/test/argerr/128.c +++ b/mps/test/argerr/128.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), 0, fmtscan, a, (mps_addr_t)(((char *)(&a[0]))+1)), "root create"); diff --git a/mps/test/argerr/129.c b/mps/test/argerr/129.c index 1de934ddecb..a050cbce2b0 100644 --- a/mps/test/argerr/129.c +++ b/mps/test/argerr/129.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_fmt(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_fmt(&root, space, mps_rank_ambig(), 0, fmtscan, &a[10], &a[0]), "root create"); diff --git a/mps/test/argerr/13.c b/mps/test/argerr/13.c index 517738d4b81..3a38dcbfae6 100644 --- a/mps/test/argerr/13.c +++ b/mps/test/argerr/13.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/130.c b/mps/test/argerr/130.c index af50f4a4d6e..f58c41789e2 100644 --- a/mps/test/argerr/130.c +++ b/mps/test/argerr/130.c @@ -21,7 +21,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(NULL, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(NULL, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/131.c b/mps/test/argerr/131.c index d3bb1d89f74..7d9569a57bd 100644 --- a/mps/test/argerr/131.c +++ b/mps/test/argerr/131.c @@ -21,7 +21,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(UNALIGNED, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(UNALIGNED, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/132.c b/mps/test/argerr/132.c index 0e0751e6fb0..643fb7f7abe 100644 --- a/mps/test/argerr/132.c +++ b/mps/test/argerr/132.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, NULL, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, NULL, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/133.c b/mps/test/argerr/133.c index 20bec1b0291..a22508e7010 100644 --- a/mps/test/argerr/133.c +++ b/mps/test/argerr/133.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, UNALIGNED, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, UNALIGNED, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/134.c b/mps/test/argerr/134.c index e699854ce54..6b94573de3e 100644 --- a/mps/test/argerr/134.c +++ b/mps/test/argerr/134.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG-1, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig()-1, 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/135.c b/mps/test/argerr/135.c index e3b19e926aa..03850c94dac 100644 --- a/mps/test/argerr/135.c +++ b/mps/test/argerr/135.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG+1, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig()+1, 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/136.c b/mps/test/argerr/136.c index 330be15b33f..28c26cd8baa 100644 --- a/mps/test/argerr/136.c +++ b/mps/test/argerr/136.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG+HIGHBIT_INT, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig()+HIGHBIT_INT, 0, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/137.c b/mps/test/argerr/137.c index c1fd3225165..4274d84b1ed 100644 --- a/mps/test/argerr/137.c +++ b/mps/test/argerr/137.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), MPS_RM_MIN-1, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/138.c b/mps/test/argerr/138.c index f7c3b201054..c43d79725b7 100644 --- a/mps/test/argerr/138.c +++ b/mps/test/argerr/138.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), MPS_RM_MAX+1, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/139.c b/mps/test/argerr/139.c index 637a6f4251d..78d5cb3ac70 100644 --- a/mps/test/argerr/139.c +++ b/mps/test/argerr/139.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), HIGHBIT_INT, thread, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/14.c b/mps/test/argerr/14.c index 476c511ff06..78a5dff17bf 100644 --- a/mps/test/argerr/14.c +++ b/mps/test/argerr/14.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/140.c b/mps/test/argerr/140.c index c5a92c5bb0f..4dbfe74063f 100644 --- a/mps/test/argerr/140.c +++ b/mps/test/argerr/140.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), 0, NULL, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/141.c b/mps/test/argerr/141.c index b368eb35f76..d259d946b99 100644 --- a/mps/test/argerr/141.c +++ b/mps/test/argerr/141.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), 0, UNALIGNED, mps_stack_scan_ambig, stackpointer, 0), "root create"); diff --git a/mps/test/argerr/142.c b/mps/test/argerr/142.c index 26261a32093..4297ed60882 100644 --- a/mps/test/argerr/142.c +++ b/mps/test/argerr/142.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, NULL, 0), "root create"); diff --git a/mps/test/argerr/143.c b/mps/test/argerr/143.c index b2d41a058ad..57de2e3d619 100644 --- a/mps/test/argerr/143.c +++ b/mps/test/argerr/143.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, UNALIGNED, 0), "root create"); diff --git a/mps/test/argerr/146.c b/mps/test/argerr/146.c index 523ec8ca9a0..7985ac37b49 100644 --- a/mps/test/argerr/146.c +++ b/mps/test/argerr/146.c @@ -451,7 +451,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -466,7 +466,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/147.c b/mps/test/argerr/147.c index aca62798987..c3d9abb9e88 100644 --- a/mps/test/argerr/147.c +++ b/mps/test/argerr/147.c @@ -451,7 +451,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -466,7 +466,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/148.c b/mps/test/argerr/148.c index fe5508bdf51..a0491c35703 100644 --- a/mps/test/argerr/148.c +++ b/mps/test/argerr/148.c @@ -451,7 +451,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -466,7 +466,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/149.c b/mps/test/argerr/149.c index f7f08b9ef29..a27dbf378b9 100644 --- a/mps/test/argerr/149.c +++ b/mps/test/argerr/149.c @@ -452,7 +452,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -467,7 +467,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/15.c b/mps/test/argerr/15.c index e6fbed8ca9b..77c36aa6669 100644 --- a/mps/test/argerr/15.c +++ b/mps/test/argerr/15.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/150.c b/mps/test/argerr/150.c index 5619c0ae4c0..7789aa21051 100644 --- a/mps/test/argerr/150.c +++ b/mps/test/argerr/150.c @@ -451,7 +451,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -466,7 +466,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/151.c b/mps/test/argerr/151.c index cedb8fe9826..34b04e838cb 100644 --- a/mps/test/argerr/151.c +++ b/mps/test/argerr/151.c @@ -452,7 +452,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -467,7 +467,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = allocone(ap, 100); diff --git a/mps/test/argerr/154.c b/mps/test/argerr/154.c index 91002926cb7..e853da9e966 100644 --- a/mps/test/argerr/154.c +++ b/mps/test/argerr/154.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/16.c b/mps/test/argerr/16.c index 84f99364d90..bf7245d65a9 100644 --- a/mps/test/argerr/16.c +++ b/mps/test/argerr/16.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/17.c b/mps/test/argerr/17.c index da43a3f29df..e57b93ada34 100644 --- a/mps/test/argerr/17.c +++ b/mps/test/argerr/17.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/18.c b/mps/test/argerr/18.c index 463a0cf6f95..67341899a72 100644 --- a/mps/test/argerr/18.c +++ b/mps/test/argerr/18.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/19.c b/mps/test/argerr/19.c index 3d9ff23972a..1a68350e3cb 100644 --- a/mps/test/argerr/19.c +++ b/mps/test/argerr/19.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/4.c b/mps/test/argerr/4.c index 16642ba5d2a..75f0e889a14 100644 --- a/mps/test/argerr/4.c +++ b/mps/test/argerr/4.c @@ -26,7 +26,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/45.c b/mps/test/argerr/45.c index 6b635f1274d..42ae8e5aa7a 100644 --- a/mps/test/argerr/45.c +++ b/mps/test/argerr/45.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -43,7 +43,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(NULL, pool, MPS_RANK_EXACT), + mps_ap_create(NULL, pool, mps_rank_exact()), "create ap"); } diff --git a/mps/test/argerr/46.c b/mps/test/argerr/46.c index de325d35810..22dea3a01d9 100644 --- a/mps/test/argerr/46.c +++ b/mps/test/argerr/46.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -43,7 +43,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(UNALIGNED, pool, MPS_RANK_EXACT), + mps_ap_create(UNALIGNED, pool, mps_rank_exact()), "create ap"); } diff --git a/mps/test/argerr/47.c b/mps/test/argerr/47.c index 8d625f4f0f9..07ae0839aa0 100644 --- a/mps/test/argerr/47.c +++ b/mps/test/argerr/47.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -44,7 +44,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, NULL, MPS_RANK_EXACT), + mps_ap_create(&ap, NULL, mps_rank_exact()), "create ap"); } diff --git a/mps/test/argerr/48.c b/mps/test/argerr/48.c index 600225a07da..8ab791d91b1 100644 --- a/mps/test/argerr/48.c +++ b/mps/test/argerr/48.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -44,7 +44,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, UNALIGNED, MPS_RANK_EXACT), + mps_ap_create(&ap, UNALIGNED, mps_rank_exact()), "create ap"); } diff --git a/mps/test/argerr/49.c b/mps/test/argerr/49.c index 6283ec1f2a6..3ca7b8dd84a 100644 --- a/mps/test/argerr/49.c +++ b/mps/test/argerr/49.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/5.c b/mps/test/argerr/5.c index c42109aa58f..08bece2c5c5 100644 --- a/mps/test/argerr/5.c +++ b/mps/test/argerr/5.c @@ -26,7 +26,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/50.c b/mps/test/argerr/50.c index 29a6e93f41d..391a16b7447 100644 --- a/mps/test/argerr/50.c +++ b/mps/test/argerr/50.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/51.c b/mps/test/argerr/51.c index 8333fa8ddc6..56db2ed2024 100644 --- a/mps/test/argerr/51.c +++ b/mps/test/argerr/51.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -44,7 +44,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT+HIGHBIT_INT), + mps_ap_create(&ap, pool, mps_rank_exact()+HIGHBIT_INT), "create ap"); } diff --git a/mps/test/argerr/52.c b/mps/test/argerr/52.c index 88b9c1be1e1..e04a7c7f8aa 100644 --- a/mps/test/argerr/52.c +++ b/mps/test/argerr/52.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -44,7 +44,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(NULL); diff --git a/mps/test/argerr/53.c b/mps/test/argerr/53.c index 984c5694982..a16f4735dce 100644 --- a/mps/test/argerr/53.c +++ b/mps/test/argerr/53.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -44,7 +44,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(UNALIGNED); diff --git a/mps/test/argerr/54.c b/mps/test/argerr/54.c index 0a293ae076a..54181b79acd 100644 --- a/mps/test/argerr/54.c +++ b/mps/test/argerr/54.c @@ -32,7 +32,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -47,7 +47,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/55.c b/mps/test/argerr/55.c index e6de7a47491..11df71afe18 100644 --- a/mps/test/argerr/55.c +++ b/mps/test/argerr/55.c @@ -32,7 +32,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -47,7 +47,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/56.c b/mps/test/argerr/56.c index 90bd5e521ab..84091a0a2ee 100644 --- a/mps/test/argerr/56.c +++ b/mps/test/argerr/56.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/57.c b/mps/test/argerr/57.c index b7d504c7f5f..8f14018b2f0 100644 --- a/mps/test/argerr/57.c +++ b/mps/test/argerr/57.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/58.c b/mps/test/argerr/58.c index a92535d46b8..88d207df69d 100644 --- a/mps/test/argerr/58.c +++ b/mps/test/argerr/58.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/59.c b/mps/test/argerr/59.c index b04978cc72d..e0cdd8b0e2d 100644 --- a/mps/test/argerr/59.c +++ b/mps/test/argerr/59.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/6.c b/mps/test/argerr/6.c index 66d1a20e2d7..b7445b9155e 100644 --- a/mps/test/argerr/6.c +++ b/mps/test/argerr/6.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/60.c b/mps/test/argerr/60.c index 755f96d07dd..fef10f491d3 100644 --- a/mps/test/argerr/60.c +++ b/mps/test/argerr/60.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); cdie( diff --git a/mps/test/argerr/61.c b/mps/test/argerr/61.c index d44ab40cf05..e2616dbfd28 100644 --- a/mps/test/argerr/61.c +++ b/mps/test/argerr/61.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/62.c b/mps/test/argerr/62.c index cfcf024ead9..564abc72261 100644 --- a/mps/test/argerr/62.c +++ b/mps/test/argerr/62.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/63.c b/mps/test/argerr/63.c index e09a3e9af60..da89eee016c 100644 --- a/mps/test/argerr/63.c +++ b/mps/test/argerr/63.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/64.c b/mps/test/argerr/64.c index 1e08ceaca09..b16e3d1006a 100644 --- a/mps/test/argerr/64.c +++ b/mps/test/argerr/64.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/65.c b/mps/test/argerr/65.c index 307b33de7f1..fe9672143c7 100644 --- a/mps/test/argerr/65.c +++ b/mps/test/argerr/65.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/66.c b/mps/test/argerr/66.c index 60fbf3fd923..ca5231429b4 100644 --- a/mps/test/argerr/66.c +++ b/mps/test/argerr/66.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/67.c b/mps/test/argerr/67.c index f97ff4870d5..48fde207483 100644 --- a/mps/test/argerr/67.c +++ b/mps/test/argerr/67.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -48,7 +48,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do{ diff --git a/mps/test/argerr/7.c b/mps/test/argerr/7.c index 84a1befa7ed..61eb367bd31 100644 --- a/mps/test/argerr/7.c +++ b/mps/test/argerr/7.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/8.c b/mps/test/argerr/8.c index f597cb76d92..c74bb7eac25 100644 --- a/mps/test/argerr/8.c +++ b/mps/test/argerr/8.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/9.c b/mps/test/argerr/9.c index c801466908f..7158fc627d9 100644 --- a/mps/test/argerr/9.c +++ b/mps/test/argerr/9.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/argerr/90.c b/mps/test/argerr/90.c index 0d772a1e531..c33d928452f 100644 --- a/mps/test/argerr/90.c +++ b/mps/test/argerr/90.c @@ -26,7 +26,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(NULL, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create(NULL, space, mps_rank_ambig(), 0, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/91.c b/mps/test/argerr/91.c index 8b44b3f6ad8..6ccf551fd02 100644 --- a/mps/test/argerr/91.c +++ b/mps/test/argerr/91.c @@ -26,7 +26,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(UNALIGNED, space, MPS_RANK_AMBIG, 0, + cdie(mps_root_create(UNALIGNED, space, mps_rank_ambig(), 0, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/92.c b/mps/test/argerr/92.c index ab13bfbc185..1f30f38d1a0 100644 --- a/mps/test/argerr/92.c +++ b/mps/test/argerr/92.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, NULL, MPS_RANK_AMBIG, 0, + cdie(mps_root_create(&root, NULL, mps_rank_ambig(), 0, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/93.c b/mps/test/argerr/93.c index ac93eaff013..b8d5f92e7a7 100644 --- a/mps/test/argerr/93.c +++ b/mps/test/argerr/93.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, UNALIGNED, MPS_RANK_AMBIG, 0, + cdie(mps_root_create(&root, UNALIGNED, mps_rank_ambig(), 0, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/96.c b/mps/test/argerr/96.c index 747eea2da29..c0fa803d0b5 100644 --- a/mps/test/argerr/96.c +++ b/mps/test/argerr/96.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, space, MPS_RANK_AMBIG+HIGHBIT_INT, 0, + cdie(mps_root_create(&root, space, mps_rank_ambig()+HIGHBIT_INT, 0, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/97.c b/mps/test/argerr/97.c index 1448cc96241..598051f20a2 100644 --- a/mps/test/argerr/97.c +++ b/mps/test/argerr/97.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, space, MPS_RANK_AMBIG, MPS_RM_MIN-1, + cdie(mps_root_create(&root, space, mps_rank_ambig(), MPS_RM_MIN-1, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/98.c b/mps/test/argerr/98.c index e99c2d54cc7..bd812af7530 100644 --- a/mps/test/argerr/98.c +++ b/mps/test/argerr/98.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, space, MPS_RANK_AMBIG, MPS_RM_MAX+1, + cdie(mps_root_create(&root, space, mps_rank_ambig(), MPS_RM_MAX+1, rootscan, NULL, 0), "root create"); diff --git a/mps/test/argerr/99.c b/mps/test/argerr/99.c index fdd05548abe..6a824d1960b 100644 --- a/mps/test/argerr/99.c +++ b/mps/test/argerr/99.c @@ -27,7 +27,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create(&root, space, MPS_RANK_AMBIG, HIGHBIT_INT, + cdie(mps_root_create(&root, space, mps_rank_ambig(), HIGHBIT_INT, rootscan, NULL, 0), "root create"); diff --git a/mps/test/conerr/17.c b/mps/test/conerr/17.c index 58ce32707c7..4893c1f25e6 100644 --- a/mps/test/conerr/17.c +++ b/mps/test/conerr/17.c @@ -49,7 +49,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); /* diff --git a/mps/test/conerr/28.c b/mps/test/conerr/28.c index d1d362f2d0f..db990ba8a3c 100644 --- a/mps/test/conerr/28.c +++ b/mps/test/conerr/28.c @@ -51,7 +51,7 @@ static void test(void) */ cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(ap); diff --git a/mps/test/conerr/29.c b/mps/test/conerr/29.c index 94fb96a4384..af81d338353 100644 --- a/mps/test/conerr/29.c +++ b/mps/test/conerr/29.c @@ -52,7 +52,7 @@ static void test(void) comment("Destroyed pool."); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(ap); diff --git a/mps/test/conerr/30.c b/mps/test/conerr/30.c index 29b609f8318..de459e33d9e 100644 --- a/mps/test/conerr/30.c +++ b/mps/test/conerr/30.c @@ -50,7 +50,7 @@ static void test(void) /* cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); */ diff --git a/mps/test/conerr/31.c b/mps/test/conerr/31.c index 19db46b2289..5aa77a4fe1c 100644 --- a/mps/test/conerr/31.c +++ b/mps/test/conerr/31.c @@ -49,7 +49,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(ap); diff --git a/mps/test/conerr/32.c b/mps/test/conerr/32.c index 055f613aa8f..40a35e77b7d 100644 --- a/mps/test/conerr/32.c +++ b/mps/test/conerr/32.c @@ -32,7 +32,7 @@ static void test(void) extendBy, avgSize, maxSize), "create pool"); - cdie(mps_ap_create(&ap, pool, MPS_RANK_EXACT), + cdie(mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_pool_destroy(pool); diff --git a/mps/test/conerr/33.c b/mps/test/conerr/33.c index 9f5a3ca9bf5..e4a050c4c09 100644 --- a/mps/test/conerr/33.c +++ b/mps/test/conerr/33.c @@ -49,7 +49,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_AMBIG), + mps_ap_create(&ap, pool, mps_rank_ambig()), "create ap"); mps_ap_destroy(ap); diff --git a/mps/test/conerr/33a.c b/mps/test/conerr/33a.c index 8d7ad42b439..4a22932ee0f 100644 --- a/mps/test/conerr/33a.c +++ b/mps/test/conerr/33a.c @@ -50,7 +50,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_AMBIG), + mps_ap_create(&ap, pool, mps_rank_ambig()), "create ap"); do diff --git a/mps/test/conerr/34.c b/mps/test/conerr/34.c index 6614721b81e..d30cc2c6017 100644 --- a/mps/test/conerr/34.c +++ b/mps/test/conerr/34.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -42,7 +42,7 @@ static void test(void) /* cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); */ diff --git a/mps/test/conerr/35.c b/mps/test/conerr/35.c index a9240fa25fd..ef2e44e03e6 100644 --- a/mps/test/conerr/35.c +++ b/mps/test/conerr/35.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -41,7 +41,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); mps_ap_destroy(ap); diff --git a/mps/test/conerr/36.c b/mps/test/conerr/36.c index ec08901e8c1..6943eee2c30 100644 --- a/mps/test/conerr/36.c +++ b/mps/test/conerr/36.c @@ -28,7 +28,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -41,7 +41,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); { diff --git a/mps/test/conerr/37.c b/mps/test/conerr/37.c index fe4d3bb9939..d2f42904346 100644 --- a/mps/test/conerr/37.c +++ b/mps/test/conerr/37.c @@ -30,7 +30,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -43,7 +43,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/37f.c b/mps/test/conerr/37f.c index ad61ec1c0e4..d0dcf97305b 100644 --- a/mps/test/conerr/37f.c +++ b/mps/test/conerr/37f.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -46,7 +46,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/38.c b/mps/test/conerr/38.c index a1241bd2740..338baf5871d 100644 --- a/mps/test/conerr/38.c +++ b/mps/test/conerr/38.c @@ -30,7 +30,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -43,7 +43,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/38f.c b/mps/test/conerr/38f.c index 1a5b0354b55..e0261ea8549 100644 --- a/mps/test/conerr/38f.c +++ b/mps/test/conerr/38f.c @@ -33,7 +33,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -46,7 +46,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/39.c b/mps/test/conerr/39.c index 9b65d451657..bc1cf193527 100644 --- a/mps/test/conerr/39.c +++ b/mps/test/conerr/39.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -42,7 +42,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); allocone(ap, 0, NULL, NULL, 0x20); diff --git a/mps/test/conerr/39f.c b/mps/test/conerr/39f.c index 309b808ec82..e698ad93293 100644 --- a/mps/test/conerr/39f.c +++ b/mps/test/conerr/39f.c @@ -32,7 +32,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -45,7 +45,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); allocone(ap, 0, NULL, NULL, 0x20); diff --git a/mps/test/conerr/40.c b/mps/test/conerr/40.c index 4af4ea3d5e6..d1f94ce3ec3 100644 --- a/mps/test/conerr/40.c +++ b/mps/test/conerr/40.c @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -42,7 +42,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/40f.c b/mps/test/conerr/40f.c index b1044d80cf7..ad520bc877d 100644 --- a/mps/test/conerr/40f.c +++ b/mps/test/conerr/40f.c @@ -32,7 +32,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -45,7 +45,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); do diff --git a/mps/test/conerr/41.c b/mps/test/conerr/41.c index cb0b356b0f3..b49f5965362 100644 --- a/mps/test/conerr/41.c +++ b/mps/test/conerr/41.c @@ -24,7 +24,7 @@ static void test(void) */ cdie( - mps_root_create_table(&root, space, MPS_RANK_AMBIG, 0, + mps_root_create_table(&root, space, mps_rank_ambig(), 0, roottable, sizeof(mps_addr_t[10])), "create root"); mps_root_destroy(root); diff --git a/mps/test/conerr/42.c b/mps/test/conerr/42.c index 4dcef268a5d..adafb5cc25b 100644 --- a/mps/test/conerr/42.c +++ b/mps/test/conerr/42.c @@ -25,7 +25,7 @@ static void test(void) comment("Destroyed space."); cdie( - mps_root_create_table(&root, space, MPS_RANK_AMBIG, 0, + mps_root_create_table(&root, space, mps_rank_ambig(), 0, roottable, sizeof(mps_addr_t[10])), "create root"); mps_root_destroy(root); diff --git a/mps/test/conerr/43.c b/mps/test/conerr/43.c index fb3e8f4e436..333a9f67d73 100644 --- a/mps/test/conerr/43.c +++ b/mps/test/conerr/43.c @@ -23,7 +23,7 @@ static void test(void) /* cdie( - mps_root_create_table(&root, space, MPS_RANK_AMBIG, 0, + mps_root_create_table(&root, space, mps_rank_ambig(), 0, roottable, sizeof(mps_addr_t[10])), "create root"); */ diff --git a/mps/test/conerr/44.c b/mps/test/conerr/44.c index ab8e741e555..a9734c0435d 100644 --- a/mps/test/conerr/44.c +++ b/mps/test/conerr/44.c @@ -22,7 +22,7 @@ static void test(void) cdie(mps_space_create(&space), "create space"); cdie( - mps_root_create_table(&root, space, MPS_RANK_AMBIG, 0, + mps_root_create_table(&root, space, mps_rank_ambig(), 0, roottable, sizeof(mps_addr_t[10])), "create root"); mps_root_destroy(root); diff --git a/mps/test/conerr/44a.c b/mps/test/conerr/44a.c index 34edab6599a..e8f3216cbab 100644 --- a/mps/test/conerr/44a.c +++ b/mps/test/conerr/44a.c @@ -26,7 +26,7 @@ static void test(void) */ cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/conerr/6.c b/mps/test/conerr/6.c index 336a47b3d3f..e5234b03bc5 100644 --- a/mps/test/conerr/6.c +++ b/mps/test/conerr/6.c @@ -23,7 +23,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); diff --git a/mps/test/function/10.c b/mps/test/function/10.c index 1465135602f..f795b1aafe4 100644 --- a/mps/test/function/10.c +++ b/mps/test/function/10.c @@ -72,7 +72,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -85,7 +85,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); for(i=0; i<1000; i++) diff --git a/mps/test/function/103.c b/mps/test/function/103.c index 8de05bb8e0f..91d84a8a0ff 100644 --- a/mps/test/function/103.c +++ b/mps/test/function/103.c @@ -73,11 +73,11 @@ static void test(void) cdie(mps_arena_commit_limit_set(arena, (size_t) (1024*1024*30)), "limit"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -88,16 +88,16 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); /* allocate 16 M of (live) stuff */ - b = allocone(ap, 2, MPS_RANK_EXACT); + b = allocone(ap, 2, mps_rank_exact()); for (j=0; j<160; j++) { - a = allocone(ap, 2, MPS_RANK_EXACT); + a = allocone(ap, 2, mps_rank_exact()); setref(a, 0, b); - b = allocdumb(ap, 1024*100, MPS_RANK_EXACT); + b = allocdumb(ap, 1024*100, mps_rank_exact()); setref(a, 1, b); b = a; } @@ -105,7 +105,7 @@ static void test(void) comment("created 16M of live objects"); for (j=0; j<1000; j++) { - res=allocrdumb(&a, ap, 1024*1024, MPS_RANK_EXACT); + res=allocrdumb(&a, ap, 1024*1024, mps_rank_exact()); } fillup(); @@ -122,7 +122,7 @@ static void test(void) empty(); for (j=0; j<1000*1024; j++) { - res=allocrdumb(&a, ap, 1024, MPS_RANK_EXACT); + res=allocrdumb(&a, ap, 1024, mps_rank_exact()); if (res == MPS_RES_OK) { comment("%i ok", j); } else { diff --git a/mps/test/function/104.c b/mps/test/function/104.c index 849d955669e..ad4c8601e5c 100644 --- a/mps/test/function/104.c +++ b/mps/test/function/104.c @@ -121,11 +121,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_table(&root, arena, MPS_RANK_EXACT, 0, + cdie(mps_root_create_table(&root, arena, mps_rank_exact(), 0, (mps_addr_t *)&a[0], 4), "create a root table"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&b[0], 4), "create b root table"); @@ -142,26 +142,26 @@ static void test(void) "create pool(awl)"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap(amc)"); cdie( - mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap(amcz)"); cdie( - mps_ap_create(&apawl, poolawl, MPS_RANK_EXACT), + mps_ap_create(&apawl, poolawl, mps_rank_exact()), "create ap(awl)"); newstamp = 0; for (i=0; i<4; i++) { - die(allocrdumb(&a[i], aplo, 64, MPS_RANK_EXACT), "alloc failed"); + die(allocrdumb(&a[i], aplo, 64, mps_rank_exact()), "alloc failed"); a[i]->data.checkedflag = newstamp; - die(allocrone(&b[i], apawl, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(&b[i], apawl, 5, mps_rank_exact()), "alloc failed"); b[i]->data.checkedflag = newstamp; b[i]->data.ref[0].addr = a[i]; - die(allocrone(&a[i], apamc, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(&a[i], apamc, 5, mps_rank_exact()), "alloc failed"); a[i]->data.checkedflag = newstamp; a[i]->data.ref[0].addr = b[i]; } @@ -173,14 +173,14 @@ static void test(void) for (i=0; i<10000; i++) { k = ranint(4); - die(allocrdumb(&a[k], aplo, 64, MPS_RANK_EXACT), "alloc failed"); + die(allocrdumb(&a[k], aplo, 64, mps_rank_exact()), "alloc failed"); a[k]->data.checkedflag = newstamp; k = ranint(4); - die(allocrone(&b[k], apawl, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(&b[k], apawl, 5, mps_rank_exact()), "alloc failed"); b[k]->data.checkedflag = newstamp; b[k]->data.ref[0].addr = a[ranint(4)]; b[k]->data.ref[1].addr = b[ranint(4)]; - die(allocrone(&a[k], apamc, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(&a[k], apamc, 5, mps_rank_exact()), "alloc failed"); a[k]->data.checkedflag = newstamp; a[k]->data.ref[2].addr = b[ranint(4)]; } diff --git a/mps/test/function/105.c b/mps/test/function/105.c index 2c36bf45004..232dbf2b6f5 100644 --- a/mps/test/function/105.c +++ b/mps/test/function/105.c @@ -42,7 +42,7 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -55,17 +55,17 @@ static void test(void) cdie(mps_pool_create(&poolawl, arena, mps_class_awl(), format), "create pool(awl)"); - cdie(mps_ap_create(&apweak, poolawl, MPS_RANK_WEAK), + cdie(mps_ap_create(&apweak, poolawl, mps_rank_weak()), "create ap(weak)"); - cdie(mps_ap_create(&apawl, poolawl, MPS_RANK_EXACT), + cdie(mps_ap_create(&apawl, poolawl, mps_rank_exact()), "create ap(awl)"); - cdie(mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + cdie(mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap(amc)"); - b = allocone(apamc, 1, MPS_RANK_EXACT); - a = allocone(apweak, 1, MPS_RANK_WEAK); + b = allocone(apamc, 1, mps_rank_exact()); + a = allocone(apweak, 1, mps_rank_weak()); mps_ap_destroy(apawl); mps_ap_destroy(apamc); diff --git a/mps/test/function/106.c b/mps/test/function/106.c index c110a061d6f..acc587e937e 100644 --- a/mps/test/function/106.c +++ b/mps/test/function/106.c @@ -79,7 +79,7 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -90,7 +90,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = string_ch("Hello there"); diff --git a/mps/test/function/107.c b/mps/test/function/107.c index 3a35032e0b9..4f080553342 100644 --- a/mps/test/function/107.c +++ b/mps/test/function/107.c @@ -79,7 +79,7 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -90,7 +90,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); a = string_ch("Hello there"); diff --git a/mps/test/function/108.c b/mps/test/function/108.c index d78850bdfcb..b6e662dee50 100644 --- a/mps/test/function/108.c +++ b/mps/test/function/108.c @@ -47,7 +47,7 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -60,11 +60,11 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); for(i=0; i<100; i++) { diff --git a/mps/test/function/109.c b/mps/test/function/109.c index 908592602af..c491f611efe 100644 --- a/mps/test/function/109.c +++ b/mps/test/function/109.c @@ -138,11 +138,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root0, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root0, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -160,13 +160,13 @@ static void test(void) cdie(mmqa_pool_create_chain(&poollo, arena, mps_class_amcz(), format, chain), "create pool(amcz)"); - cdie(mps_ap_create(&apawl, poolawl, MPS_RANK_WEAK), + cdie(mps_ap_create(&apawl, poolawl, mps_rank_weak()), "create ap(awl)"); - cdie(mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + cdie(mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap(amc)"); - cdie(mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + cdie(mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap(amcz)"); mps_message_type_enable(arena, mps_message_type_finalization()); @@ -177,9 +177,9 @@ static void test(void) b = a; for (j=0; j<1000; j++) { - a = allocone(apamc, 2, MPS_RANK_EXACT); - c = allocone(apawl, 2, MPS_RANK_WEAK); - d = allocone(aplo, 2, MPS_RANK_EXACT); /* rank irrelevant here! */ + a = allocone(apamc, 2, mps_rank_exact()); + c = allocone(apawl, 2, mps_rank_weak()); + d = allocone(aplo, 2, mps_rank_exact()); /* rank irrelevant here! */ mps_finalize(arena, (mps_addr_t*)&a); mps_finalize(arena, (mps_addr_t*)&c); mps_finalize(arena, (mps_addr_t*)&d); @@ -212,7 +212,7 @@ static void test(void) for (j=0; j<1000; j++) { comment("%d of 1000", j); - a = allocone(apamc, 10000, MPS_RANK_EXACT); + a = allocone(apamc, 10000, mps_rank_exact()); mps_finalize(arena, (mps_addr_t*)&a); final_count +=1; comment("finalize"); @@ -233,7 +233,7 @@ static void test(void) comment("%d of 1000", j); finalpoll(&z, FINAL_QUEUE); qpoll(&z, FINAL_STORE); - a = allocone(apamc, 2, MPS_RANK_EXACT); + a = allocone(apamc, 2, mps_rank_exact()); setref(z, 0, b); setref(a, 1, z); b = a; @@ -241,7 +241,7 @@ static void test(void) for (j=0; j<1000; j++) { - a = allocone(apamc, 2, MPS_RANK_EXACT); + a = allocone(apamc, 2, mps_rank_exact()); qpoll(&z, FINAL_DISCARD); finalpoll(&z, FINAL_DISCARD); setref(a, 0, b); diff --git a/mps/test/function/11.c b/mps/test/function/11.c index d6c5002cb4f..43da60992de 100644 --- a/mps/test/function/11.c +++ b/mps/test/function/11.c @@ -46,7 +46,7 @@ static void test(void) "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -59,7 +59,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); inpsize=0x4000; diff --git a/mps/test/function/110.c b/mps/test/function/110.c index 63cadfc2ccf..98d1a82f119 100644 --- a/mps/test/function/110.c +++ b/mps/test/function/110.c @@ -142,11 +142,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root0, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root0, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -164,13 +164,13 @@ static void test(void) cdie(mmqa_pool_create_chain(&poollo, arena, mps_class_amcz(), format, chain), "create pool(amcz)"); - cdie(mps_ap_create(&apawl, poolawl, MPS_RANK_WEAK), + cdie(mps_ap_create(&apawl, poolawl, mps_rank_weak()), "create ap(awl)"); - cdie(mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + cdie(mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap(amc)"); - cdie(mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + cdie(mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap(amcz)"); mps_message_type_enable(arena, mps_message_type_finalization()); @@ -181,9 +181,9 @@ static void test(void) b = a; for (j=0; j<10; j++) { - a = allocone(apamc, 2, MPS_RANK_EXACT); - c = allocone(apawl, 2, MPS_RANK_WEAK); - d = allocone(aplo, 2, MPS_RANK_EXACT); /* rank irrelevant here! */ + a = allocone(apamc, 2, mps_rank_exact()); + c = allocone(apawl, 2, mps_rank_weak()); + d = allocone(aplo, 2, mps_rank_exact()); /* rank irrelevant here! */ mps_finalize(arena, (mps_addr_t*)&a); mps_finalize(arena, (mps_addr_t*)&c); mps_finalize(arena, (mps_addr_t*)&d); @@ -216,7 +216,7 @@ static void test(void) for (j=0; j<10; j++) { comment("%d of 10", j); - a = allocone(apamc, 10000, MPS_RANK_EXACT); + a = allocone(apamc, 10000, mps_rank_exact()); mps_finalize(arena, (mps_addr_t*)&a); final_count +=1; comment("finalize"); @@ -237,7 +237,7 @@ static void test(void) comment("%d of 10", j); finalpoll(&z, FINAL_QUEUE); qpoll(&z, FINAL_STORE); - a = allocone(apamc, 2, MPS_RANK_EXACT); + a = allocone(apamc, 2, mps_rank_exact()); setref(z, 0, b); setref(a, 1, z); b = a; @@ -245,7 +245,7 @@ static void test(void) for (j=0; j<10; j++) { - a = allocone(apamc, 2, MPS_RANK_EXACT); + a = allocone(apamc, 2, mps_rank_exact()); qpoll(&z, FINAL_DISCARD); finalpoll(&z, FINAL_DISCARD); setref(a, 0, b); diff --git a/mps/test/function/111.c b/mps/test/function/111.c index 5e43216a0be..4e693ad489d 100644 --- a/mps/test/function/111.c +++ b/mps/test/function/111.c @@ -110,11 +110,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root0, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root0, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -132,13 +132,13 @@ static void test(void) cdie(mmqa_pool_create_chain(&poollo, arena, mps_class_amcz(), format, chain), "create pool(amcz)"); - cdie(mps_ap_create(&apawl, poolawl, MPS_RANK_WEAK), + cdie(mps_ap_create(&apawl, poolawl, mps_rank_weak()), "create ap(awl)"); - cdie(mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + cdie(mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap(amc)"); - cdie(mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + cdie(mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap(amcz)"); mps_message_type_enable(arena, mps_message_type_finalization()); @@ -149,9 +149,9 @@ static void test(void) b = a; for (j=0; j<1000; j++) { - a = allocone(apamc, 2, MPS_RANK_EXACT); - c = allocone(apawl, 2, MPS_RANK_WEAK); - d = allocone(aplo, 2, MPS_RANK_EXACT); /* rank irrelevant here! */ + a = allocone(apamc, 2, mps_rank_exact()); + c = allocone(apawl, 2, mps_rank_weak()); + d = allocone(aplo, 2, mps_rank_exact()); /* rank irrelevant here! */ mps_finalize(arena, (mps_addr_t*)&a); mps_finalize(arena, (mps_addr_t*)&c); mps_finalize(arena, (mps_addr_t*)&d); @@ -178,9 +178,9 @@ static void test(void) finalpoll(&z, FINAL_DISCARD); if (mps_message_poll(arena) == 0) { i++; - a = allocdumb(apawl, 1024, MPS_RANK_WEAK); - a = allocdumb(apamc, 1024, MPS_RANK_EXACT); - a = allocdumb(aplo, 1024, MPS_RANK_EXACT); + a = allocdumb(apawl, 1024, mps_rank_weak()); + a = allocdumb(apamc, 1024, mps_rank_exact()); + a = allocdumb(aplo, 1024, mps_rank_exact()); mps_arena_collect(arena); comment(" %i", final_count); } diff --git a/mps/test/function/112.c b/mps/test/function/112.c index 2a583d8ca0b..fd18b59c972 100644 --- a/mps/test/function/112.c +++ b/mps/test/function/112.c @@ -41,11 +41,11 @@ static void test(void) { "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root0, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root0, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -56,13 +56,13 @@ static void test(void) { die(mmqa_pool_create_chain(&poollo, arena, mps_class_amcz(), format, chain), "create pool"); - cdie(mps_ap_create(&aplo, poollo, MPS_RANK_EXACT), + cdie(mps_ap_create(&aplo, poollo, mps_rank_exact()), "create ap"); /* alloc lots in an LO pool; it should be collected away */ for(j=0; j<1000; j++) { - a = allocdumb(aplo, 1024ul*1024, MPS_RANK_EXACT); + a = allocdumb(aplo, 1024ul*1024, mps_rank_exact()); } /* (total allocated is 1000 M) */ diff --git a/mps/test/function/113.c b/mps/test/function/113.c index bff372d420f..4607bfff992 100644 --- a/mps/test/function/113.c +++ b/mps/test/function/113.c @@ -35,12 +35,12 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1,space,MPS_RANK_AMBIG,0,&exfmt_root,1), + mps_root_create_table(&root1,space,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); cdie( @@ -56,19 +56,19 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&apawl, poolawl, MPS_RANK_EXACT), + mps_ap_create(&apawl, poolawl, mps_rank_exact()), "create ap"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); - b = allocone(apamc, 1, MPS_RANK_EXACT); + b = allocone(apamc, 1, mps_rank_exact()); for (j=1; j<100; j++) { comment("%i of 100.", j); - a = allocone(apamc, 5, MPS_RANK_EXACT); + a = allocone(apamc, 5, mps_rank_exact()); b = a; c = a; d = a; @@ -78,8 +78,8 @@ static void test(void) for (i=1; i<5000; i++) { - c = allocone(apamc, 20, MPS_RANK_EXACT); - d = allocone(apawl, 20, MPS_RANK_EXACT); + c = allocone(apamc, 20, mps_rank_exact()); + d = allocone(apawl, 20, mps_rank_exact()); if (ranint(8) == 0) e = c; if (ranint(8) == 0) f = c; if (ranint(8) == 0) g = c; diff --git a/mps/test/function/114.c b/mps/test/function/114.c index 6bdc8fdcbd9..3f4b2119a84 100644 --- a/mps/test/function/114.c +++ b/mps/test/function/114.c @@ -35,12 +35,12 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1,space,MPS_RANK_AMBIG,0,&exfmt_root,1), + mps_root_create_table(&root1,space,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); cdie( @@ -56,19 +56,19 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&apawl, poolawl, MPS_RANK_EXACT), + mps_ap_create(&apawl, poolawl, mps_rank_exact()), "create ap"); cdie( - mps_ap_create(&apamc, poolawl, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolawl, mps_rank_exact()), "create ap"); - b = allocone(apamc, 1, MPS_RANK_EXACT); + b = allocone(apamc, 1, mps_rank_exact()); for (j=1; j<100; j++) { comment("%i of 100.", j); - a = allocone(apamc, 5, MPS_RANK_EXACT); + a = allocone(apamc, 5, mps_rank_exact()); b = a; c = a; d = a; @@ -78,8 +78,8 @@ static void test(void) for (i=1; i<5000; i++) { - c = allocone(apamc, 20, MPS_RANK_EXACT); - d = allocone(apawl, 20, MPS_RANK_EXACT); + c = allocone(apamc, 20, mps_rank_exact()); + d = allocone(apawl, 20, mps_rank_exact()); if (ranint(8) == 0) e = c; if (ranint(8) == 0) f = c; if (ranint(8) == 0) g = c; diff --git a/mps/test/function/116.c b/mps/test/function/116.c index e854783e045..dc26bdb4a67 100644 --- a/mps/test/function/116.c +++ b/mps/test/function/116.c @@ -39,7 +39,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); - cdie(mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( @@ -51,7 +51,7 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); /* allocate until full */ @@ -61,7 +61,7 @@ static void test(void) b = NULL; - while (allocrone(&a, ap, 128, MPS_RANK_EXACT) == MPS_RES_OK) { + while (allocrone(&a, ap, 128, mps_rank_exact()) == MPS_RES_OK) { i++; setref(a, 0, b); b = a; @@ -71,11 +71,11 @@ static void test(void) /* try to allocate 10 times */ - cdie(mps_ap_create(&ap2, pool, MPS_RANK_EXACT), "create second ap"); + cdie(mps_ap_create(&ap2, pool, mps_rank_exact()), "create second ap"); mps_ap_destroy(ap); for (i = 0; i < 10; i++) { - res = allocrone(&a, ap2, 128, MPS_RANK_EXACT); + res = allocrone(&a, ap2, 128, mps_rank_exact()); report("predie", "%s", err_text(res)); } @@ -84,7 +84,7 @@ static void test(void) mps_root_destroy(root); for (i = 0; i < 10; i++) { - res = allocrone(&a, ap2, 128, MPS_RANK_EXACT); + res = allocrone(&a, ap2, 128, mps_rank_exact()); report("postdie", "%s", err_text(res)); } diff --git a/mps/test/function/117.c b/mps/test/function/117.c index 4a799749114..be174f0e114 100644 --- a/mps/test/function/117.c +++ b/mps/test/function/117.c @@ -48,7 +48,7 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -59,15 +59,15 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&ap, pool, MPS_RANK_EXACT), + mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); /* allocate a jolly big chain of objects */ - b = allocone(ap, 4, MPS_RANK_EXACT); + b = allocone(ap, 4, mps_rank_exact()); for (i = 0; i < 256*1024; i++) { - a = allocone(ap, 4, MPS_RANK_EXACT); + a = allocone(ap, 4, mps_rank_exact()); setref(a, 0, b); b = a; } diff --git a/mps/test/function/118.c b/mps/test/function/118.c index 82c17d907c5..5267e6bdc2b 100644 --- a/mps/test/function/118.c +++ b/mps/test/function/118.c @@ -111,8 +111,8 @@ static void test(void) die(mmqa_pool_create_chain(&pool, arena, mps_class_amc(), format, chain), "create pool"); - die(mps_ap_create(&ap, pool, MPS_RANK_EXACT), "BufferCreate"); - die(mps_ap_create(&busy_ap, pool, MPS_RANK_EXACT), "BufferCreate"); + die(mps_ap_create(&ap, pool, mps_rank_exact()), "BufferCreate"); + die(mps_ap_create(&busy_ap, pool, mps_rank_exact()), "BufferCreate"); /* create an ap, and leave it busy */ die(mps_reserve(&busy_init, busy_ap, objSIZE), "mps_reserve busy"); diff --git a/mps/test/function/12.c b/mps/test/function/12.c index 608b76336c7..7d8ac91829d 100644 --- a/mps/test/function/12.c +++ b/mps/test/function/12.c @@ -77,7 +77,7 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -88,7 +88,7 @@ static void test(void) "create pool"); for (i=0; idata.id = 0; setref(a, 0, b); } diff --git a/mps/test/function/124.c b/mps/test/function/124.c index a5b985edb1c..257ca412ab4 100644 --- a/mps/test/function/124.c +++ b/mps/test/function/124.c @@ -57,7 +57,7 @@ static void alloc_back(void) for (j = 0; j < BACKITER; j++) { i = ranint(ranint(ranint(ranint(TABSIZE)+1)+1)+1); - objtab[i] = allocdumb(apamc, BACKSIZE, MPS_RANK_EXACT); + objtab[i] = allocdumb(apamc, BACKSIZE, mps_rank_exact()); } } @@ -76,12 +76,12 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); cdie( - mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1, arena, MPS_RANK_EXACT, 0, &objtab[0], TABSIZE), + mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -91,7 +91,7 @@ static void test(void) "create pool(amc)"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); inramp = 0; @@ -104,16 +104,16 @@ static void test(void) } alloc_back(); if (inramp) { - s = allocone(apamc, 3, MPS_RANK_EXACT); + s = allocone(apamc, 3, mps_rank_exact()); setref(r, 0, s); setref(s, 1, r); r = s; - s = allocdumb(apamc, RAMPSIZE, MPS_RANK_EXACT); + s = allocdumb(apamc, RAMPSIZE, mps_rank_exact()); setref(r, 2, s); rsize ++; if (ranint(LEAVERAMP) == 0) { - r = allocone(apamc, 2, MPS_RANK_EXACT); - s = allocone(apamc, 2, MPS_RANK_EXACT); + r = allocone(apamc, 2, mps_rank_exact()); + s = allocone(apamc, 2, mps_rank_exact()); #ifdef RAMP_INTERFACE mps_ap_alloc_pattern_end(apamc, mps_alloc_pattern_ramp()); #endif @@ -130,7 +130,7 @@ static void test(void) mps_ap_alloc_pattern_begin(apamc, mps_alloc_pattern_ramp()); #endif comment("ramp begin"); - r = allocone(apamc, 3, MPS_RANK_EXACT); + r = allocone(apamc, 3, mps_rank_exact()); inramp = 1; rsize = 0; } diff --git a/mps/test/function/125.c b/mps/test/function/125.c index 9dfdfe201ae..ee86efe1371 100644 --- a/mps/test/function/125.c +++ b/mps/test/function/125.c @@ -42,11 +42,11 @@ static void test(void) "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -57,12 +57,12 @@ static void test(void) die(mmqa_pool_create_chain(&pool, arena, mps_class_amc(), format, chain), "create pool"); - cdie(mps_ap_create(&ap, pool, MPS_RANK_EXACT), + cdie(mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); comment("ready"); - b = allocone(ap, 2, MPS_RANK_EXACT); + b = allocone(ap, 2, mps_rank_exact()); /* allocate lots of little objects */ @@ -70,10 +70,10 @@ static void test(void) comment("reserved %ld, committed %ld", mps_arena_reserved(arena), mps_arena_committed(arena)); for (j=0; j<10000; j++) { - a = allocone(ap, 2, MPS_RANK_EXACT); + a = allocone(ap, 2, mps_rank_exact()); setref(a, 0, b); b = a; - a = allocone(ap, 1, MPS_RANK_EXACT); + a = allocone(ap, 1, mps_rank_exact()); setref(b, 1, a); } mps_arena_collect(arena); diff --git a/mps/test/function/126.c b/mps/test/function/126.c index 836bbf38303..bba7d7766aa 100644 --- a/mps/test/function/126.c +++ b/mps/test/function/126.c @@ -40,11 +40,11 @@ static void test(void) "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); - cdie(mps_root_create_table(&root1, arena, MPS_RANK_AMBIG, 0, + cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -55,7 +55,7 @@ static void test(void) die(mmqa_pool_create_chain(&pool, arena, mps_class_amc(), format, chain), "create pool"); - cdie(mps_ap_create(&ap, pool, MPS_RANK_EXACT), + cdie(mps_ap_create(&ap, pool, mps_rank_exact()), "create ap"); comment("ready"); @@ -63,13 +63,13 @@ static void test(void) comment("reserved %ld, committed %ld", mps_arena_reserved(arena), mps_arena_committed(arena)); - b = allocdumb(ap, 1024ul*1024ul*40, MPS_RANK_EXACT); + b = allocdumb(ap, 1024ul*1024ul*40, mps_rank_exact()); comment("alloc 40 MB"); comment("reserved %ld, committed %ld", mps_arena_reserved(arena), mps_arena_committed(arena)); - b = allocdumb(ap, 1024ul*1024ul*40, MPS_RANK_EXACT); + b = allocdumb(ap, 1024ul*1024ul*40, mps_rank_exact()); comment("alloc 80 MB"); comment("reserved %ld, committed %ld", diff --git a/mps/test/function/127.c b/mps/test/function/127.c index 5b6d8b73c24..ab11f9a3e3c 100644 --- a/mps/test/function/127.c +++ b/mps/test/function/127.c @@ -48,7 +48,7 @@ static void alloc_back(void) { for (j = 0; j < BACKITER; j++) { i = ranint(ranint(ranint(ranint(TABSIZE)+1)+1)+1); - objtab[i] = allocdumb(apamc, BACKSIZE, MPS_RANK_EXACT); + objtab[i] = allocdumb(apamc, BACKSIZE, mps_rank_exact()); } } @@ -68,12 +68,12 @@ static void test(void) { cdie(mps_thread_reg(&thread, arena), "register thread"); cdie( - mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1, arena, MPS_RANK_EXACT, 0, &objtab[0], TABSIZE), + mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); cdie( @@ -85,7 +85,7 @@ static void test(void) { "create pool"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); inramp = 0; @@ -96,16 +96,16 @@ static void test(void) { } alloc_back(); if (inramp) { - s = allocone(apamc, 3, MPS_RANK_EXACT); + s = allocone(apamc, 3, mps_rank_exact()); setref(r, 0, s); setref(s, 1, r); r = s; - s = allocdumb(apamc, RAMPSIZE, MPS_RANK_EXACT); + s = allocdumb(apamc, RAMPSIZE, mps_rank_exact()); setref(r, 2, s); rsize ++; if (ranint(LEAVERAMP) == 0) { - r = allocone(apamc, 2, MPS_RANK_EXACT); - s = allocone(apamc, 2, MPS_RANK_EXACT); + r = allocone(apamc, 2, mps_rank_exact()); + s = allocone(apamc, 2, mps_rank_exact()); #ifdef RAMP_INTERFACE mps_ap_alloc_pattern_end(apamc, mps_alloc_pattern_ramp()); #endif @@ -122,7 +122,7 @@ static void test(void) { mps_ap_alloc_pattern_begin(apamc, mps_alloc_pattern_ramp()); #endif comment("ramp begin"); - r = allocone(apamc, 3, MPS_RANK_EXACT); + r = allocone(apamc, 3, mps_rank_exact()); inramp = 1; rsize = 0; } diff --git a/mps/test/function/128.c b/mps/test/function/128.c index 2bc0eb1fafb..6fa80e73e67 100644 --- a/mps/test/function/128.c +++ b/mps/test/function/128.c @@ -48,7 +48,7 @@ static void alloc_back(void) { for (j = 0; j < BACKITER; j++) { i = ranint(ranint(ranint(ranint(TABSIZE)+1)+1)+1); - objtab[i] = allocdumb(apamc, BACKSIZE, MPS_RANK_EXACT); + objtab[i] = allocdumb(apamc, BACKSIZE, mps_rank_exact()); } } @@ -68,12 +68,12 @@ static void test(void) { cdie(mps_thread_reg(&thread, arena), "register thread"); cdie( - mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1, arena, MPS_RANK_EXACT, 0, &objtab[0], TABSIZE), + mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); cdie( @@ -85,7 +85,7 @@ static void test(void) { "create pool"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); inramp = 0; @@ -96,16 +96,16 @@ static void test(void) { } alloc_back(); if (inramp) { - s = allocone(apamc, 3, MPS_RANK_EXACT); + s = allocone(apamc, 3, mps_rank_exact()); setref(r, 0, s); setref(s, 1, r); r = s; - s = allocdumb(apamc, RAMPSIZE, MPS_RANK_EXACT); + s = allocdumb(apamc, RAMPSIZE, mps_rank_exact()); setref(r, 2, s); rsize ++; if (ranint(LEAVERAMP) == 0) { - r = allocone(apamc, 2, MPS_RANK_EXACT); - s = allocone(apamc, 2, MPS_RANK_EXACT); + r = allocone(apamc, 2, mps_rank_exact()); + s = allocone(apamc, 2, mps_rank_exact()); #ifdef RAMP_INTERFACE mps_ap_alloc_pattern_end(apamc, mps_alloc_pattern_ramp()); #endif @@ -122,7 +122,7 @@ static void test(void) { mps_ap_alloc_pattern_begin(apamc, mps_alloc_pattern_ramp()); #endif comment("ramp begin"); - r = allocone(apamc, 3, MPS_RANK_EXACT); + r = allocone(apamc, 3, mps_rank_exact()); inramp = 1; rsize = 0; } diff --git a/mps/test/function/129.c b/mps/test/function/129.c index a6ebc663b53..abc581c32c3 100644 --- a/mps/test/function/129.c +++ b/mps/test/function/129.c @@ -49,7 +49,7 @@ static void alloc_back(void) { for (j = 0; j < BACKITER; j++) { i = ranint(ranint(ranint(ranint(TABSIZE)+1)+1)+1); - objtab[i] = allocdumb(apamc, BACKSIZE, MPS_RANK_EXACT); + objtab[i] = allocdumb(apamc, BACKSIZE, mps_rank_exact()); } } @@ -67,12 +67,12 @@ static void test(void) { cdie(mps_thread_reg(&thread, arena), "register thread"); cdie( - mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1, arena, MPS_RANK_EXACT, 0, &objtab[0], TABSIZE), + mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); cdie( @@ -84,7 +84,7 @@ static void test(void) { "create pool"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); inramp = 0; @@ -95,16 +95,16 @@ static void test(void) { } alloc_back(); if (inramp) { - s = allocone(apamc, 3, MPS_RANK_EXACT); + s = allocone(apamc, 3, mps_rank_exact()); setref(r, 0, s); setref(s, 1, r); r = s; - s = allocdumb(apamc, RAMPSIZE, MPS_RANK_EXACT); + s = allocdumb(apamc, RAMPSIZE, mps_rank_exact()); setref(r, 2, s); rsize ++; if (ranint(LEAVERAMP) == 0) { - r = allocone(apamc, 2, MPS_RANK_EXACT); - s = allocone(apamc, 2, MPS_RANK_EXACT); + r = allocone(apamc, 2, mps_rank_exact()); + s = allocone(apamc, 2, mps_rank_exact()); #ifdef RAMP_INTERFACE mps_ap_alloc_pattern_end(apamc, mps_alloc_pattern_ramp()); #endif @@ -121,7 +121,7 @@ static void test(void) { mps_ap_alloc_pattern_begin(apamc, mps_alloc_pattern_ramp()); #endif comment("ramp begin"); - r = allocone(apamc, 3, MPS_RANK_EXACT); + r = allocone(apamc, 3, mps_rank_exact()); inramp = 1; rsize = 0; } diff --git a/mps/test/function/12p.c b/mps/test/function/12p.c index 6a0373fecfb..61e215609d7 100644 --- a/mps/test/function/12p.c +++ b/mps/test/function/12p.c @@ -68,7 +68,7 @@ static void test(void) cdie(mps_thread_reg(&thread, space), "register thread"); cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, + mps_root_create_reg(&root, space, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); @@ -82,7 +82,7 @@ static void test(void) for (i=0; idata.ref[0].addr = a[i]; addr = &a[i]; - die(allocrone(addr, apamc, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(addr, apamc, 5, mps_rank_exact()), "alloc failed"); a[i]->data.ref[0].addr = b[i]; } @@ -174,14 +174,14 @@ static void test(void) for (i=0; i<10000; i++) { k = ranint(4); addr = &a[k]; - die(allocrdumb(addr, aplo, 64, MPS_RANK_EXACT), "alloc failed"); + die(allocrdumb(addr, aplo, 64, mps_rank_exact()), "alloc failed"); k = ranint(4); addr = &b[k]; - die(allocrone(addr, apawl, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(addr, apawl, 5, mps_rank_exact()), "alloc failed"); b[k]->data.ref[0].addr = a[ranint(4)]; b[k]->data.ref[1].addr = b[ranint(4)]; addr = &a[k]; - die(allocrone(addr, apamc, 5, MPS_RANK_EXACT), "alloc failed"); + die(allocrone(addr, apamc, 5, mps_rank_exact()), "alloc failed"); f[k] = a[k]->data.ref[2].addr; a[k]->data.ref[2].addr = b[ranint(4)]; } diff --git a/mps/test/function/99.c b/mps/test/function/99.c index 215ed189b3f..78c49a72390 100644 --- a/mps/test/function/99.c +++ b/mps/test/function/99.c @@ -43,12 +43,12 @@ static void test(void) "create arena"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, mps_stack_scan_ambig, stackpointer, 0), "create root"); cdie( - mps_root_create_table(&root1,arena,MPS_RANK_AMBIG,0,&exfmt_root,1), + mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -60,18 +60,18 @@ static void test(void) "create pool"); cdie( - mps_ap_create(&apamcz, poolamcz, MPS_RANK_EXACT), + mps_ap_create(&apamcz, poolamcz, mps_rank_exact()), "create ap"); cdie( - mps_ap_create(&apamc, poolamc, MPS_RANK_EXACT), + mps_ap_create(&apamc, poolamc, mps_rank_exact()), "create ap"); - b = allocone(apamc, 1, MPS_RANK_EXACT); + b = allocone(apamc, 1, mps_rank_exact()); for (j =1 ; j < 100; j++) { comment("%i of 100.", j); - a = allocone(apamc, 5, MPS_RANK_EXACT); + a = allocone(apamc, 5, mps_rank_exact()); b = a; c = a; d = a; @@ -80,8 +80,8 @@ static void test(void) g = a; for (i = 1; i < 5000; i++) { - c = allocone(apamc, 20, MPS_RANK_EXACT); - d = allocone(apamcz, 20, MPS_RANK_EXACT); + c = allocone(apamc, 20, mps_rank_exact()); + d = allocone(apamcz, 20, mps_rank_exact()); if (ranint(8) == 0) e = c; if (ranint(8) == 0) f = c; if (ranint(8) == 0) g = c; diff --git a/mps/test/test/testlib/rankfmt.c b/mps/test/test/testlib/rankfmt.c index db8feea2a64..cc0cd653882 100644 --- a/mps/test/test/testlib/rankfmt.c +++ b/mps/test/test/testlib/rankfmt.c @@ -362,12 +362,12 @@ static mps_res_t myscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) res = MPS_FIX(ss, (mps_addr_t *) &p); if (res != MPS_RES_OK) return res; if (p == NULL) { - asserts(rank == MPS_RANK_WEAK, + asserts(rank == mps_rank_weak(), "non-weak reference fixed to NULL at %p[assoc]", obj); commentif(deathcomments, "fixed %p[assoc] to NULL", obj->data.id); INCCOUNT(DYING_REFERENCE_COUNT); } else if (p != q) { - asserts(rank != MPS_RANK_AMBIG, + asserts(rank != mps_rank_ambig(), "ambiguous reference changed by fix at %p[assoc]", obj); } obj->data.assoc = p; @@ -386,12 +386,12 @@ static mps_res_t myscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) q = p; res = MPS_FIX(ss, (mps_addr_t *) &p); if (p == NULL) { - asserts(rank == MPS_RANK_WEAK, + asserts(rank == mps_rank_weak(), "non-weak reference fixed to NULL at %p[i]", obj); commentif(deathcomments, "fixed %li[%i] to NULL", obj->data.id, i); INCCOUNT(DYING_REFERENCE_COUNT); } else if (p != q) { - asserts(rank != MPS_RANK_AMBIG, + asserts(rank != mps_rank_ambig(), "ambiguous reference changed by fix at %p[i]", obj); } if (res != MPS_RES_OK) return res;