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

@@ -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");
 

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");

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");

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");

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");

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");
 

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");
 

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");
 

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");
 

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");
 

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);

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);

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);

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);

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");
 

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);

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);

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(

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 
 }

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");
 
 }

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");
 
 }

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");
 
 }

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");
 

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");
 

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");
 

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");
 
 }

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);

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);

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(

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(

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(

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(

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(

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(

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");
 

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(

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{

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{

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{

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{

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{

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{

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{

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 

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");
 
 /*

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);

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);

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");
 */
 

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);

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);