From ceaca84a7f1c79d3bb9a73dcf288edd883b45e2d Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 9 Jan 2019 16:17:17 +0000 Subject: [PATCH] Avoid using deprecated function mps_tramp. Use mps_root_create_thread in preference to mps_root_create_reg. New test harness run_test passes pointer to cold end of stack, since this is needed by many tests. Copied from Perforce Change: 195917 --- mps/test/argerr/0.c | 4 +-- mps/test/argerr/1.c | 4 +-- mps/test/argerr/10.c | 15 ++------ mps/test/argerr/100.c | 9 ++--- mps/test/argerr/101.c | 9 ++--- mps/test/argerr/102.c | 9 ++--- mps/test/argerr/103.c | 9 ++--- mps/test/argerr/104.c | 9 ++--- mps/test/argerr/105.c | 9 ++--- mps/test/argerr/106.c | 9 ++--- mps/test/argerr/107.c | 9 ++--- mps/test/argerr/108.c | 9 ++--- mps/test/argerr/109.c | 9 ++--- mps/test/argerr/11.c | 15 ++------ mps/test/argerr/110.c | 9 ++--- mps/test/argerr/111.c | 9 ++--- mps/test/argerr/112.c | 9 ++--- mps/test/argerr/113.c | 9 ++--- mps/test/argerr/114.c | 9 ++--- mps/test/argerr/115.c | 9 ++--- mps/test/argerr/116.c | 9 ++--- mps/test/argerr/117.c | 9 ++--- mps/test/argerr/118.c | 9 ++--- mps/test/argerr/119.c | 9 ++--- mps/test/argerr/12.c | 15 ++------ mps/test/argerr/120.c | 9 ++--- mps/test/argerr/121.c | 9 ++--- mps/test/argerr/122.c | 9 ++--- mps/test/argerr/123.c | 9 ++--- mps/test/argerr/124.c | 9 ++--- mps/test/argerr/125.c | 9 ++--- mps/test/argerr/126.c | 9 ++--- mps/test/argerr/127.c | 9 ++--- mps/test/argerr/128.c | 9 ++--- mps/test/argerr/129.c | 9 ++--- mps/test/argerr/13.c | 15 ++------ mps/test/argerr/130.c | 16 +++------ mps/test/argerr/131.c | 16 +++------ mps/test/argerr/132.c | 16 +++------ mps/test/argerr/133.c | 16 +++------ mps/test/argerr/134.c | 11 ++---- mps/test/argerr/135.c | 11 ++---- mps/test/argerr/136.c | 11 ++---- mps/test/argerr/137.c | 11 ++---- mps/test/argerr/138.c | 11 ++---- mps/test/argerr/139.c | 11 ++---- mps/test/argerr/14.c | 15 ++------ mps/test/argerr/140.c | 16 +++------ mps/test/argerr/141.c | 16 +++------ mps/test/argerr/142.c | 16 +++------ mps/test/argerr/143.c | 16 +++------ mps/test/argerr/144.c | 9 ++--- mps/test/argerr/145.c | 9 ++--- mps/test/argerr/146.c | 15 ++------ mps/test/argerr/147.c | 15 ++------ mps/test/argerr/148.c | 15 ++------ mps/test/argerr/149.c | 15 ++------ mps/test/argerr/15.c | 15 ++------ mps/test/argerr/150.c | 15 ++------ mps/test/argerr/151.c | 15 ++------ mps/test/argerr/152.c | 9 ++--- mps/test/argerr/153.c | 5 +-- mps/test/argerr/154.c | 15 ++------ mps/test/argerr/155.c | 4 +-- mps/test/argerr/156.c | 4 +-- mps/test/argerr/157.c | 4 +-- mps/test/argerr/158.c | 4 +-- mps/test/argerr/159.c | 4 +-- mps/test/argerr/16.c | 15 ++------ mps/test/argerr/160.c | 4 +-- mps/test/argerr/161.c | 4 +-- mps/test/argerr/17.c | 15 ++------ mps/test/argerr/18.c | 15 ++------ mps/test/argerr/19.c | 15 ++------ mps/test/argerr/2.c | 4 +-- mps/test/argerr/20.c | 9 ++--- mps/test/argerr/21.c | 9 ++--- mps/test/argerr/22.c | 9 ++--- mps/test/argerr/23.c | 9 ++--- mps/test/argerr/24.c | 9 ++--- mps/test/argerr/25.c | 9 ++--- mps/test/argerr/26.c | 9 ++--- mps/test/argerr/27.c | 9 ++--- mps/test/argerr/28.c | 9 ++--- mps/test/argerr/29.c | 9 ++--- mps/test/argerr/3.c | 4 +-- mps/test/argerr/30.c | 9 ++--- mps/test/argerr/31.c | 9 ++--- mps/test/argerr/32.c | 9 ++--- mps/test/argerr/33.c | 9 ++--- mps/test/argerr/34.c | 4 +-- mps/test/argerr/35.c | 4 +-- mps/test/argerr/36.c | 9 ++--- mps/test/argerr/37.c | 4 +-- mps/test/argerr/38.c | 9 ++--- mps/test/argerr/39.c | 9 ++--- mps/test/argerr/4.c | 15 ++------ mps/test/argerr/40.c | 9 ++--- mps/test/argerr/41.c | 4 +-- mps/test/argerr/42.c | 4 +-- mps/test/argerr/45.c | 15 ++------ mps/test/argerr/46.c | 15 ++------ mps/test/argerr/47.c | 15 ++------ mps/test/argerr/48.c | 15 ++------ mps/test/argerr/49.c | 15 ++------ mps/test/argerr/5.c | 15 ++------ mps/test/argerr/50.c | 15 ++------ mps/test/argerr/51.c | 15 ++------ mps/test/argerr/52.c | 15 ++------ mps/test/argerr/53.c | 15 ++------ mps/test/argerr/54.c | 15 ++------ mps/test/argerr/55.c | 15 ++------ mps/test/argerr/56.c | 15 ++------ mps/test/argerr/57.c | 15 ++------ mps/test/argerr/58.c | 15 ++------ mps/test/argerr/59.c | 15 ++------ mps/test/argerr/6.c | 15 ++------ mps/test/argerr/60.c | 15 ++------ mps/test/argerr/61.c | 15 ++------ mps/test/argerr/62.c | 15 ++------ mps/test/argerr/63.c | 15 ++------ mps/test/argerr/64.c | 15 ++------ mps/test/argerr/65.c | 15 ++------ mps/test/argerr/66.c | 15 ++------ mps/test/argerr/67.c | 15 ++------ mps/test/argerr/68.c | 9 ++--- mps/test/argerr/69.c | 9 ++--- mps/test/argerr/7.c | 15 ++------ mps/test/argerr/70.c | 9 ++--- mps/test/argerr/71.c | 9 ++--- mps/test/argerr/72.c | 9 ++--- mps/test/argerr/73.c | 9 ++--- mps/test/argerr/74.c | 9 ++--- mps/test/argerr/75.c | 9 ++--- mps/test/argerr/76.c | 9 ++--- mps/test/argerr/77.c | 9 ++--- mps/test/argerr/78.c | 9 ++--- mps/test/argerr/79.c | 9 ++--- mps/test/argerr/8.c | 15 ++------ mps/test/argerr/80.c | 9 ++--- mps/test/argerr/81.c | 9 ++--- mps/test/argerr/82.c | 9 ++--- mps/test/argerr/83.c | 9 ++--- mps/test/argerr/84.c | 9 ++--- mps/test/argerr/85.c | 9 ++--- mps/test/argerr/86.c | 9 ++--- mps/test/argerr/87.c | 9 ++--- mps/test/argerr/88.c | 9 ++--- mps/test/argerr/89.c | 9 ++--- mps/test/argerr/9.c | 15 ++------ mps/test/argerr/90.c | 9 ++--- mps/test/argerr/91.c | 9 ++--- mps/test/argerr/92.c | 9 ++--- mps/test/argerr/93.c | 9 ++--- mps/test/argerr/94.c | 9 ++--- mps/test/argerr/95.c | 9 ++--- mps/test/argerr/96.c | 9 ++--- mps/test/argerr/97.c | 9 ++--- mps/test/argerr/98.c | 9 ++--- mps/test/argerr/99.c | 9 ++--- mps/test/conerr/0.c | 4 +-- mps/test/conerr/1.c | 4 +-- mps/test/conerr/10.c | 4 +-- mps/test/conerr/11.c | 4 +-- mps/test/conerr/12.c | 4 +-- mps/test/conerr/13.c | 4 +-- mps/test/conerr/14.c | 4 +-- mps/test/conerr/15.c | 4 +-- mps/test/conerr/16.c | 4 +-- mps/test/conerr/17.c | 4 +-- mps/test/conerr/18.c | 4 +-- mps/test/conerr/19.c | 4 +-- mps/test/conerr/2.c | 4 +-- mps/test/conerr/20.c | 4 +-- mps/test/conerr/21.c | 4 +-- mps/test/conerr/22.c | 4 +-- mps/test/conerr/23.c | 4 +-- mps/test/conerr/24.c | 4 +-- mps/test/conerr/25.c | 4 +-- mps/test/conerr/26.c | 4 +-- mps/test/conerr/27.c | 4 +-- mps/test/conerr/28.c | 4 +-- mps/test/conerr/29.c | 4 +-- mps/test/conerr/3.c | 4 +-- mps/test/conerr/30.c | 4 +-- mps/test/conerr/31.c | 4 +-- mps/test/conerr/32.c | 4 +-- mps/test/conerr/33.c | 4 +-- mps/test/conerr/33a.c | 4 +-- mps/test/conerr/34.c | 15 ++------ mps/test/conerr/35.c | 15 ++------ mps/test/conerr/36.c | 15 ++------ mps/test/conerr/37.c | 15 ++------ mps/test/conerr/37f.c | 15 ++------ mps/test/conerr/38.c | 15 ++------ mps/test/conerr/38f.c | 15 ++------ mps/test/conerr/39.c | 15 ++------ mps/test/conerr/39f.c | 15 ++------ mps/test/conerr/4.c | 4 +-- mps/test/conerr/40.c | 15 ++------ mps/test/conerr/40f.c | 15 ++------ mps/test/conerr/41.c | 9 ++--- mps/test/conerr/42.c | 9 ++--- mps/test/conerr/43.c | 9 ++--- mps/test/conerr/44.c | 9 ++--- mps/test/conerr/44a.c | 15 ++------ mps/test/conerr/45.c | 9 ++--- mps/test/conerr/46.c | 9 ++--- mps/test/conerr/47.c | 9 ++--- mps/test/conerr/48.c | 9 ++--- mps/test/conerr/49.c | 9 ++--- mps/test/conerr/5.c | 4 +-- mps/test/conerr/50.c | 4 +-- mps/test/conerr/51.c | 4 +-- mps/test/conerr/52.c | 4 +-- mps/test/conerr/53.c | 4 +-- mps/test/conerr/54.c | 4 +-- mps/test/conerr/55.c | 4 +-- mps/test/conerr/56.c | 4 +-- mps/test/conerr/57.c | 4 +-- mps/test/conerr/58.c | 4 +-- mps/test/conerr/59.c | 4 +-- mps/test/conerr/6.c | 15 ++------ mps/test/conerr/60.c | 4 +-- mps/test/conerr/61.c | 4 +-- mps/test/conerr/62.c | 4 +-- mps/test/conerr/63.c | 4 +-- mps/test/conerr/64.c | 4 +-- mps/test/conerr/65.c | 4 +-- mps/test/conerr/66.c | 4 +-- mps/test/conerr/67.c | 4 +-- mps/test/conerr/68.c | 4 +-- mps/test/conerr/7.c | 9 ++--- mps/test/conerr/8.c | 4 +-- mps/test/conerr/9.c | 4 +-- mps/test/function/1.c | 4 +-- mps/test/function/10.c | 15 ++------ mps/test/function/100.c | 8 ++--- mps/test/function/101.c | 8 ++--- mps/test/function/103.c | 14 ++------ mps/test/function/104.c | 8 ++--- mps/test/function/105.c | 15 ++------ mps/test/function/106.c | 13 ++----- mps/test/function/107.c | 13 ++----- mps/test/function/108.c | 15 ++------ mps/test/function/109.c | 14 ++------ mps/test/function/11.c | 15 ++------ mps/test/function/110.c | 14 ++------ mps/test/function/111.c | 14 ++------ mps/test/function/112.c | 15 +++----- mps/test/function/113.c | 15 ++------ mps/test/function/114.c | 15 ++------ mps/test/function/116.c | 13 ++----- mps/test/function/117.c | 14 ++------ mps/test/function/118.c | 4 +-- mps/test/function/119.c | 9 ++--- mps/test/function/12.c | 14 ++------ mps/test/function/120.c | 10 ++---- mps/test/function/121.c | 4 +-- mps/test/function/122.c | 12 ++----- mps/test/function/123.c | 9 ++--- mps/test/function/124.c | 15 ++------ mps/test/function/125.c | 15 ++------ mps/test/function/126.c | 15 ++------ mps/test/function/127.c | 16 +++------ mps/test/function/128.c | 16 +++------ mps/test/function/129.c | 16 +++------ mps/test/function/12p.c | 15 ++------ mps/test/function/13.c | 15 ++------ mps/test/function/130.c | 4 +-- mps/test/function/131.c | 4 +-- mps/test/function/134.c | 16 +++------ mps/test/function/135.c | 10 ++---- mps/test/function/136.c | 8 ++--- mps/test/function/137.c | 9 ++--- mps/test/function/138.c | 4 +-- mps/test/function/139.c | 9 ++--- mps/test/function/14.c | 15 ++------ mps/test/function/140.c | 8 ++--- mps/test/function/144.c | 9 ++--- mps/test/function/147.c | 4 +-- mps/test/function/148.c | 4 +-- mps/test/function/15.c | 15 ++------ mps/test/function/150.c | 14 ++------ mps/test/function/151.c | 4 +-- mps/test/function/152.c | 4 +-- mps/test/function/153.c | 4 +-- mps/test/function/158.c | 9 ++--- mps/test/function/159.c | 9 ++--- mps/test/function/16.c | 15 ++------ mps/test/function/160.c | 9 ++--- mps/test/function/161.c | 8 ++--- mps/test/function/162.c | 9 ++--- mps/test/function/163.c | 9 ++--- mps/test/function/164.c | 8 ++--- mps/test/function/165.c | 4 +-- mps/test/function/167.c | 4 +-- mps/test/function/17.c | 4 +-- mps/test/function/170.c | 4 +-- mps/test/function/171.c | 16 +++------ mps/test/function/18.c | 15 ++------ mps/test/function/19.c | 15 ++------ mps/test/function/2.c | 15 ++------ mps/test/function/20.c | 14 +++----- mps/test/function/200.c | 8 ++--- mps/test/function/203.c | 8 ++--- mps/test/function/204.c | 8 ++--- mps/test/function/205.c | 8 ++--- mps/test/function/206.c | 8 ++--- mps/test/function/207.c | 8 ++--- mps/test/function/21.c | 5 +-- mps/test/function/214.c | 9 ++--- mps/test/function/215.c | 16 +++------ mps/test/function/22.c | 5 +-- mps/test/function/223.c | 16 +++------ mps/test/function/224.c | 4 +-- mps/test/function/226.c | 16 +++------ mps/test/function/227.c | 20 +++-------- mps/test/function/228.c | 4 +-- mps/test/function/229.c | 4 +-- mps/test/function/23.c | 10 ++---- mps/test/function/231.c | 4 +-- mps/test/function/232.c | 4 +-- mps/test/function/233.c | 4 +-- mps/test/function/234.c | 20 +++++------ mps/test/function/235.c | 4 +-- mps/test/function/24.c | 15 ++------ mps/test/function/25.c | 15 +++----- mps/test/function/26.c | 5 +-- mps/test/function/27.c | 14 ++------ mps/test/function/28.c | 15 ++------ mps/test/function/29.c | 15 +++----- mps/test/function/3.c | 15 ++------ mps/test/function/30.c | 15 ++------ mps/test/function/31.c | 15 ++------ mps/test/function/32.c | 15 ++------ mps/test/function/33.c | 15 ++------ mps/test/function/34.c | 15 ++------ mps/test/function/35.c | 10 ++---- mps/test/function/36.c | 15 ++------ mps/test/function/37.c | 10 ++---- mps/test/function/38.c | 14 ++------ mps/test/function/39.c | 15 ++------ mps/test/function/4.c | 15 ++------ mps/test/function/40.c | 10 ++---- mps/test/function/41.c | 19 +++------- mps/test/function/42.c | 15 ++------ mps/test/function/43.c | 15 ++------ mps/test/function/44.c | 15 ++------ mps/test/function/45.c | 14 ++------ mps/test/function/46.c | 14 ++------ mps/test/function/47.c | 16 +++------ mps/test/function/48.c | 15 ++------ mps/test/function/49.c | 14 ++------ mps/test/function/5.c | 15 ++------ mps/test/function/50.c | 14 ++------ mps/test/function/51.c | 14 ++------ mps/test/function/52.c | 10 ++---- mps/test/function/53.c | 15 ++------ mps/test/function/54.c | 15 ++------ mps/test/function/55.c | 15 ++------ mps/test/function/56.c | 15 ++------ mps/test/function/57.c | 15 ++------ mps/test/function/6.c | 14 ++------ mps/test/function/60.c | 15 ++------ mps/test/function/61.c | 15 ++------ mps/test/function/62.c | 15 ++------ mps/test/function/63.c | 15 ++------ mps/test/function/64.c | 15 ++------ mps/test/function/65.c | 8 ++--- mps/test/function/66.c | 16 +++------ mps/test/function/67.c | 10 ++---- mps/test/function/68.c | 15 ++------ mps/test/function/69.c | 10 ++---- mps/test/function/7.c | 4 +-- mps/test/function/70.c | 4 +-- mps/test/function/71.c | 4 +-- mps/test/function/72.c | 9 ++--- mps/test/function/73.c | 15 +++----- mps/test/function/74.c | 15 +++----- mps/test/function/75.c | 14 ++------ mps/test/function/76.c | 14 ++------ mps/test/function/77.c | 15 ++------ mps/test/function/78.c | 15 ++------ mps/test/function/79.c | 15 ++------ mps/test/function/8.c | 4 +-- mps/test/function/80.c | 15 ++------ mps/test/function/81.c | 15 ++------ mps/test/function/83.c | 9 ++--- mps/test/function/9.c | 16 ++------- mps/test/function/96.c | 14 ++------ mps/test/function/97.c | 8 ++--- mps/test/function/98.c | 4 +-- mps/test/function/99.c | 15 ++------ mps/test/misc/0.c | 9 ++--- mps/test/misc/1.c | 10 ++---- mps/test/misc/2.c | 10 ++---- mps/test/test/script/version | 3 +- mps/test/test/testlib/testlib.c | 61 +++++---------------------------- mps/test/test/testlib/testlib.h | 9 ++--- 400 files changed, 1021 insertions(+), 3101 deletions(-) diff --git a/mps/test/argerr/0.c b/mps/test/argerr/0.c index 12f4411e8ab..f12bea4d25d 100644 --- a/mps/test/argerr/0.c +++ b/mps/test/argerr/0.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { adie(mps_arena_create(NULL, mps_arena_class_vm(), mmqaArenaSIZE), "Create arena"); @@ -22,6 +22,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/1.c b/mps/test/argerr/1.c index 75ab07dc84a..84c7313af6c 100644 --- a/mps/test/argerr/1.c +++ b/mps/test/argerr/1.c @@ -12,7 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { adie(mps_arena_create(UNALIGNED, mps_arena_class_vm(), mmqaArenaSIZE), "Create arena"); @@ -20,6 +20,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/10.c b/mps/test/argerr/10.c index 1519c3e4170..09d4ecce970 100644 --- a/mps/test/argerr/10.c +++ b/mps/test/argerr/10.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -36,11 +34,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -57,9 +51,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/100.c b/mps/test/argerr/100.c index 6b7bf5a547a..6c07e2776b3 100644 --- a/mps/test/argerr/100.c +++ b/mps/test/argerr/100.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -34,9 +32,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/101.c b/mps/test/argerr/101.c index 3115e6fddde..0149bd3877e 100644 --- a/mps/test/argerr/101.c +++ b/mps/test/argerr/101.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/102.c b/mps/test/argerr/102.c index b65d6a037d2..0e0f4652f2b 100644 --- a/mps/test/argerr/102.c +++ b/mps/test/argerr/102.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/103.c b/mps/test/argerr/103.c index 588292e8c3c..971cb9a842a 100644 --- a/mps/test/argerr/103.c +++ b/mps/test/argerr/103.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -33,9 +31,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/104.c b/mps/test/argerr/104.c index 0c758172d44..f99ad91e819 100644 --- a/mps/test/argerr/104.c +++ b/mps/test/argerr/104.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/105.c b/mps/test/argerr/105.c index 0dd479590aa..8c17b888cc8 100644 --- a/mps/test/argerr/105.c +++ b/mps/test/argerr/105.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/106.c b/mps/test/argerr/106.c index 791edb2f0e6..0296c410671 100644 --- a/mps/test/argerr/106.c +++ b/mps/test/argerr/106.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/107.c b/mps/test/argerr/107.c index ebc6b8cc72c..dcb42814133 100644 --- a/mps/test/argerr/107.c +++ b/mps/test/argerr/107.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/108.c b/mps/test/argerr/108.c index d9a3013625a..c7926b5b439 100644 --- a/mps/test/argerr/108.c +++ b/mps/test/argerr/108.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/109.c b/mps/test/argerr/109.c index 7a43ad50775..75fa97ae83f 100644 --- a/mps/test/argerr/109.c +++ b/mps/test/argerr/109.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/11.c b/mps/test/argerr/11.c index f04946c5f49..af63885d51e 100644 --- a/mps/test/argerr/11.c +++ b/mps/test/argerr/11.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -33,11 +31,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -54,9 +48,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/110.c b/mps/test/argerr/110.c index 95091829139..b11ce9421ae 100644 --- a/mps/test/argerr/110.c +++ b/mps/test/argerr/110.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/111.c b/mps/test/argerr/111.c index 6f60b0a3269..2f6ce48d034 100644 --- a/mps/test/argerr/111.c +++ b/mps/test/argerr/111.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/112.c b/mps/test/argerr/112.c index 9fdb3dc999a..048a5bebbc5 100644 --- a/mps/test/argerr/112.c +++ b/mps/test/argerr/112.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/113.c b/mps/test/argerr/113.c index fd344eabe7f..20b4e3337a7 100644 --- a/mps/test/argerr/113.c +++ b/mps/test/argerr/113.c @@ -10,9 +10,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -31,9 +29,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/114.c b/mps/test/argerr/114.c index e814ded99df..116382263dd 100644 --- a/mps/test/argerr/114.c +++ b/mps/test/argerr/114.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -35,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/115.c b/mps/test/argerr/115.c index 7c32ebd6610..64ffe80cbc6 100644 --- a/mps/test/argerr/115.c +++ b/mps/test/argerr/115.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -40,9 +38,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/116.c b/mps/test/argerr/116.c index 5173a555495..9d6cd0fd396 100644 --- a/mps/test/argerr/116.c +++ b/mps/test/argerr/116.c @@ -12,15 +12,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -38,9 +36,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/117.c b/mps/test/argerr/117.c index 83b9afcfd5b..eed42a5a8d1 100644 --- a/mps/test/argerr/117.c +++ b/mps/test/argerr/117.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/118.c b/mps/test/argerr/118.c index 27f1cb0ee21..a65d2d87a3a 100644 --- a/mps/test/argerr/118.c +++ b/mps/test/argerr/118.c @@ -12,15 +12,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/119.c b/mps/test/argerr/119.c index 0b0f1d9892a..e34d5f5d83b 100644 --- a/mps/test/argerr/119.c +++ b/mps/test/argerr/119.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/12.c b/mps/test/argerr/12.c index efb4f8acba6..17351f13cce 100644 --- a/mps/test/argerr/12.c +++ b/mps/test/argerr/12.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -58,9 +52,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/120.c b/mps/test/argerr/120.c index 26049da615e..ba254439424 100644 --- a/mps/test/argerr/120.c +++ b/mps/test/argerr/120.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/121.c b/mps/test/argerr/121.c index b19ca32b78a..b40379643c1 100644 --- a/mps/test/argerr/121.c +++ b/mps/test/argerr/121.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/122.c b/mps/test/argerr/122.c index bbe91a830a5..bf28f30116e 100644 --- a/mps/test/argerr/122.c +++ b/mps/test/argerr/122.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/123.c b/mps/test/argerr/123.c index fb39e9e35b9..e96a5b6c6cd 100644 --- a/mps/test/argerr/123.c +++ b/mps/test/argerr/123.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/124.c b/mps/test/argerr/124.c index 31534bb65d2..b3c7c201796 100644 --- a/mps/test/argerr/124.c +++ b/mps/test/argerr/124.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/125.c b/mps/test/argerr/125.c index 61b66ebbc6b..9a7638b2b4a 100644 --- a/mps/test/argerr/125.c +++ b/mps/test/argerr/125.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/126.c b/mps/test/argerr/126.c index f4569c1bdbf..6d29ec8427f 100644 --- a/mps/test/argerr/126.c +++ b/mps/test/argerr/126.c @@ -10,15 +10,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -37,9 +35,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/127.c b/mps/test/argerr/127.c index be27cfc5b79..34610632f3e 100644 --- a/mps/test/argerr/127.c +++ b/mps/test/argerr/127.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/128.c b/mps/test/argerr/128.c index 6e528671f79..f37d0da243b 100644 --- a/mps/test/argerr/128.c +++ b/mps/test/argerr/128.c @@ -10,15 +10,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -37,9 +35,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/129.c b/mps/test/argerr/129.c index 0a1091e1dd2..a13e260e9b2 100644 --- a/mps/test/argerr/129.c +++ b/mps/test/argerr/129.c @@ -14,15 +14,13 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t fmtscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/13.c b/mps/test/argerr/13.c index 5e705b8ba09..80c3a3a96d8 100644 --- a/mps/test/argerr/13.c +++ b/mps/test/argerr/13.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,11 +33,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -56,9 +50,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/130.c b/mps/test/argerr/130.c index cabeee1a04f..f19217d28a9 100644 --- a/mps/test/argerr/130.c +++ b/mps/test/argerr/130.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = null &root_t for mps_root_create_reg + summary = null &root_t for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -25,17 +23,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(NULL, arena, mps_rank_ambig(), 0, - thread, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(NULL, arena, thread, stack_pointer), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/131.c b/mps/test/argerr/131.c index 362ca31c8c3..64ae067dafb 100644 --- a/mps/test/argerr/131.c +++ b/mps/test/argerr/131.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = UNALIGNED &root_t for mps_root_create_reg + summary = UNALIGNED &root_t for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -23,17 +21,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(UNALIGNED, arena, mps_rank_ambig(), 0, - thread, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(UNALIGNED, arena, thread, stack_pointer), "root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/132.c b/mps/test/argerr/132.c index 150fbbec174..ff15896fb2f 100644 --- a/mps/test/argerr/132.c +++ b/mps/test/argerr/132.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = null arena for mps_root_create_reg + summary = null arena for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -26,17 +24,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, NULL, mps_rank_ambig(), 0, - thread, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(&root, NULL, thread, stack_pointer), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/133.c b/mps/test/argerr/133.c index 49509529efb..7de24e94609 100644 --- a/mps/test/argerr/133.c +++ b/mps/test/argerr/133.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = UNALIGNED arena for mps_root_create_reg + summary = UNALIGNED arena for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -24,17 +22,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, UNALIGNED, mps_rank_ambig(), 0, - thread, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(&root, UNALIGNED, thread, stack_pointer), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/134.c b/mps/test/argerr/134.c index e0e34a42404..8d23f01bfca 100644 --- a/mps/test/argerr/134.c +++ b/mps/test/argerr/134.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -27,16 +25,13 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); cdie(mps_root_create_reg(&root, arena, mps_rank_ambig()-1, 0, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/135.c b/mps/test/argerr/135.c index 5f5edbf7fed..e624c823e47 100644 --- a/mps/test/argerr/135.c +++ b/mps/test/argerr/135.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -27,16 +25,13 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); cdie(mps_root_create_reg(&root, arena, mps_rank_ambig()+1, 0, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/136.c b/mps/test/argerr/136.c index 5bbfcc8a505..346dbbc2ffb 100644 --- a/mps/test/argerr/136.c +++ b/mps/test/argerr/136.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -28,16 +26,13 @@ static void test(void) cdie(mps_root_create_reg(&root, arena, mps_rank_ambig()+HIGHBIT_INT, 0, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/137.c b/mps/test/argerr/137.c index 0d98b56a58d..bcdd5f9ff1f 100644 --- a/mps/test/argerr/137.c +++ b/mps/test/argerr/137.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -28,16 +26,13 @@ static void test(void) cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), -1, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/138.c b/mps/test/argerr/138.c index 472b37c607d..64cf375f3ee 100644 --- a/mps/test/argerr/138.c +++ b/mps/test/argerr/138.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -28,16 +26,13 @@ static void test(void) cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 8, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/139.c b/mps/test/argerr/139.c index a87a6f340fd..2e7804edc74 100644 --- a/mps/test/argerr/139.c +++ b/mps/test/argerr/139.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -28,16 +26,13 @@ static void test(void) cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), HIGHBIT_INT, - thread, mps_stack_scan_ambig, stackpointer, 0), + thread, mps_stack_scan_ambig, stack_pointer, 0), "root create"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/14.c b/mps/test/argerr/14.c index 7cef120f738..fa3e1bb7041 100644 --- a/mps/test/argerr/14.c +++ b/mps/test/argerr/14.c @@ -16,9 +16,7 @@ END_HEADER #include "newfmt.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -31,11 +29,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -50,9 +44,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/140.c b/mps/test/argerr/140.c index 419105bc2ac..e77cff687d2 100644 --- a/mps/test/argerr/140.c +++ b/mps/test/argerr/140.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = null thread for mps_root_create_reg + summary = null thread for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -13,9 +13,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -25,17 +23,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, - NULL, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(&root, arena, NULL, stack_pointer), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/141.c b/mps/test/argerr/141.c index a412cb3ec2d..96fe07ea278 100644 --- a/mps/test/argerr/141.c +++ b/mps/test/argerr/141.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = UNALIGNED thread for mps_root_create_reg + summary = UNALIGNED thread for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -24,17 +22,11 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, - UNALIGNED, mps_stack_scan_ambig, stackpointer, 0), - "root create"); - + cdie(mps_root_create_thread(&root, arena, UNALIGNED, stack_pointer), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/142.c b/mps/test/argerr/142.c index 05869f11ce8..4cc792531bd 100644 --- a/mps/test/argerr/142.c +++ b/mps/test/argerr/142.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = null stackpointer for mps_root_create_reg + summary = null stack pointer for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -26,17 +24,11 @@ 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_stack_scan_ambig, NULL, 0), - "root create"); - + cdie(mps_root_create_thread(&root, arena, thread, NULL), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/143.c b/mps/test/argerr/143.c index 90563119c8c..03733516397 100644 --- a/mps/test/argerr/143.c +++ b/mps/test/argerr/143.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = UNALIGNED stackpointer for mps_root_create_reg + summary = UNALIGNED stack pointer for mps_root_create_thread language = c link = testlib.o OUTPUT_SPEC @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -26,17 +24,11 @@ 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_stack_scan_ambig, UNALIGNED, 0), - "root create"); - + cdie(mps_root_create_thread(&root, arena, thread, UNALIGNED), "thread root"); } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/144.c b/mps/test/argerr/144.c index 3556c45a967..6f165ed3ef1 100644 --- a/mps/test/argerr/144.c +++ b/mps/test/argerr/144.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -31,9 +29,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/145.c b/mps/test/argerr/145.c index 8795d328565..650e3bb0ccc 100644 --- a/mps/test/argerr/145.c +++ b/mps/test/argerr/145.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/146.c b/mps/test/argerr/146.c index 5cead98d9d8..0941d8079a7 100644 --- a/mps/test/argerr/146.c +++ b/mps/test/argerr/146.c @@ -374,9 +374,7 @@ static void setref(mycell *obj, int n, mycell *to) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -394,11 +392,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -438,9 +432,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/147.c b/mps/test/argerr/147.c index 72e2b34ad69..a3c49da358d 100644 --- a/mps/test/argerr/147.c +++ b/mps/test/argerr/147.c @@ -374,9 +374,7 @@ static void setref(mycell *obj, int n, mycell *to) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -394,11 +392,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -429,9 +423,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/148.c b/mps/test/argerr/148.c index 2420e6df343..8f9f6249000 100644 --- a/mps/test/argerr/148.c +++ b/mps/test/argerr/148.c @@ -374,9 +374,7 @@ static void setref(mycell *obj, int n, mycell *to) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -394,11 +392,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -429,9 +423,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/149.c b/mps/test/argerr/149.c index 0f2fbf58b75..2f0f2c451a9 100644 --- a/mps/test/argerr/149.c +++ b/mps/test/argerr/149.c @@ -436,9 +436,7 @@ long int getsize(mycell *obj) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -456,11 +454,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -491,9 +485,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/15.c b/mps/test/argerr/15.c index e2eeb830513..3a1ae94b8b8 100644 --- a/mps/test/argerr/15.c +++ b/mps/test/argerr/15.c @@ -14,9 +14,7 @@ END_HEADER #include "newfmt.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -29,11 +27,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -48,9 +42,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/150.c b/mps/test/argerr/150.c index 784932ec953..819ea574030 100644 --- a/mps/test/argerr/150.c +++ b/mps/test/argerr/150.c @@ -435,9 +435,7 @@ long int getsize(mycell *obj) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -455,11 +453,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -490,9 +484,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/151.c b/mps/test/argerr/151.c index cbe40d26d5a..cedbb9eb9b7 100644 --- a/mps/test/argerr/151.c +++ b/mps/test/argerr/151.c @@ -436,9 +436,7 @@ long int getsize(mycell *obj) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -456,11 +454,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -491,9 +485,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/152.c b/mps/test/argerr/152.c index 18d0feb933f..8273a9e43d2 100644 --- a/mps/test/argerr/152.c +++ b/mps/test/argerr/152.c @@ -11,9 +11,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/153.c b/mps/test/argerr/153.c index 93048298b11..ad53f16ef10 100644 --- a/mps/test/argerr/153.c +++ b/mps/test/argerr/153.c @@ -13,7 +13,8 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_addr_t q; @@ -29,6 +30,6 @@ static void test(void) { } int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/154.c b/mps/test/argerr/154.c index 58bfb6f50e1..2e53a87eefa 100644 --- a/mps/test/argerr/154.c +++ b/mps/test/argerr/154.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -70,9 +64,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/155.c b/mps/test/argerr/155.c index 9f1228b7750..4b8f5fbb4c0 100644 --- a/mps/test/argerr/155.c +++ b/mps/test/argerr/155.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { void *p = &p; mps_arena_t arena; @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/156.c b/mps/test/argerr/156.c index 1b9c0e8aae1..f12b813c6d1 100644 --- a/mps/test/argerr/156.c +++ b/mps/test/argerr/156.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { void *p = &p; mps_arena_t arena; @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/157.c b/mps/test/argerr/157.c index d08e079c75e..fdbd58ef456 100644 --- a/mps/test/argerr/157.c +++ b/mps/test/argerr/157.c @@ -15,7 +15,7 @@ END_HEADER #include "mps.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { void *p; mps_arena_t arena; @@ -32,6 +32,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/158.c b/mps/test/argerr/158.c index 5c6d7f44f4c..2e8707a83a7 100644 --- a/mps/test/argerr/158.c +++ b/mps/test/argerr/158.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; MPS_ARGS_BEGIN(args) { @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/159.c b/mps/test/argerr/159.c index 182641e35d5..a7cfd5e1ffc 100644 --- a/mps/test/argerr/159.c +++ b/mps/test/argerr/159.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; cdie(mps_arena_create_k(&arena, mps_arena_class_vm(), mps_args_none), @@ -25,6 +25,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/16.c b/mps/test/argerr/16.c index fc7289dfa4d..e7f6e738d86 100644 --- a/mps/test/argerr/16.c +++ b/mps/test/argerr/16.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -58,9 +52,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/160.c b/mps/test/argerr/160.c index 84f0c37c846..b0507ecd89f 100644 --- a/mps/test/argerr/160.c +++ b/mps/test/argerr/160.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; MPS_ARGS_BEGIN(args) { @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/161.c b/mps/test/argerr/161.c index 4276e63ca50..26b2741182f 100644 --- a/mps/test/argerr/161.c +++ b/mps/test/argerr/161.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mps.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; cdie(mps_arena_create_k(&arena, mps_arena_class_vm(), mps_args_none), @@ -25,6 +25,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/17.c b/mps/test/argerr/17.c index 6b8da796bff..e52d95664e7 100644 --- a/mps/test/argerr/17.c +++ b/mps/test/argerr/17.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,11 +32,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -55,9 +49,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/18.c b/mps/test/argerr/18.c index 1e1da958b7b..e52ae022753 100644 --- a/mps/test/argerr/18.c +++ b/mps/test/argerr/18.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -60,9 +54,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/19.c b/mps/test/argerr/19.c index b6048163a8a..ecc903abb7f 100644 --- a/mps/test/argerr/19.c +++ b/mps/test/argerr/19.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,11 +32,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -57,9 +51,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/2.c b/mps/test/argerr/2.c index 0d7b9125416..bc03a922ff0 100644 --- a/mps/test/argerr/2.c +++ b/mps/test/argerr/2.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -25,6 +25,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/20.c b/mps/test/argerr/20.c index 356aa7f0bdd..f52a0fad540 100644 --- a/mps/test/argerr/20.c +++ b/mps/test/argerr/20.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,9 +41,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/21.c b/mps/test/argerr/21.c index 24ac122270c..3b1cee1f790 100644 --- a/mps/test/argerr/21.c +++ b/mps/test/argerr/21.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/22.c b/mps/test/argerr/22.c index eef081c4916..7c37752f5fd 100644 --- a/mps/test/argerr/22.c +++ b/mps/test/argerr/22.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,9 +42,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/23.c b/mps/test/argerr/23.c index eea18e3944b..d628c6e93c0 100644 --- a/mps/test/argerr/23.c +++ b/mps/test/argerr/23.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,9 +40,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/24.c b/mps/test/argerr/24.c index 2418039edf2..e191c9a7e23 100644 --- a/mps/test/argerr/24.c +++ b/mps/test/argerr/24.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,9 +42,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/25.c b/mps/test/argerr/25.c index e1d8c93a718..36d0f97c64a 100644 --- a/mps/test/argerr/25.c +++ b/mps/test/argerr/25.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,9 +42,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/26.c b/mps/test/argerr/26.c index 3329cc38c55..2e5c25b7345 100644 --- a/mps/test/argerr/26.c +++ b/mps/test/argerr/26.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,9 +42,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/27.c b/mps/test/argerr/27.c index d0b5b5de682..6c96f99e1f6 100644 --- a/mps/test/argerr/27.c +++ b/mps/test/argerr/27.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,9 +41,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/28.c b/mps/test/argerr/28.c index 46969d09bd6..e04bb8ba7c5 100644 --- a/mps/test/argerr/28.c +++ b/mps/test/argerr/28.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/29.c b/mps/test/argerr/29.c index d453b65c61d..3d8e6e4ab7d 100644 --- a/mps/test/argerr/29.c +++ b/mps/test/argerr/29.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/3.c b/mps/test/argerr/3.c index 18fe3333161..7704a00c998 100644 --- a/mps/test/argerr/3.c +++ b/mps/test/argerr/3.c @@ -12,7 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -23,6 +23,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/30.c b/mps/test/argerr/30.c index 812ea8e9e7b..b03e88f262a 100644 --- a/mps/test/argerr/30.c +++ b/mps/test/argerr/30.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/31.c b/mps/test/argerr/31.c index c09f9d7c5d7..4b43ebd9a4e 100644 --- a/mps/test/argerr/31.c +++ b/mps/test/argerr/31.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/32.c b/mps/test/argerr/32.c index 4f97ee61cca..a8faad71177 100644 --- a/mps/test/argerr/32.c +++ b/mps/test/argerr/32.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/33.c b/mps/test/argerr/33.c index 0401b1c5e56..e2d013b2bb1 100644 --- a/mps/test/argerr/33.c +++ b/mps/test/argerr/33.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -45,9 +43,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/34.c b/mps/test/argerr/34.c index 4940d182965..a655f33bcc3 100644 --- a/mps/test/argerr/34.c +++ b/mps/test/argerr/34.c @@ -14,7 +14,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -32,6 +32,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/35.c b/mps/test/argerr/35.c index 72ca516e3c4..a12be3a2f26 100644 --- a/mps/test/argerr/35.c +++ b/mps/test/argerr/35.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,6 +34,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/36.c b/mps/test/argerr/36.c index a45812ecfda..27514a491fe 100644 --- a/mps/test/argerr/36.c +++ b/mps/test/argerr/36.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,9 +41,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/37.c b/mps/test/argerr/37.c index 6617e141744..a7daf755e95 100644 --- a/mps/test/argerr/37.c +++ b/mps/test/argerr/37.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,6 +34,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/38.c b/mps/test/argerr/38.c index 3da121b91de..7c08a8d850b 100644 --- a/mps/test/argerr/38.c +++ b/mps/test/argerr/38.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,9 +36,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/39.c b/mps/test/argerr/39.c index abea09f623c..81c4fbaed7b 100644 --- a/mps/test/argerr/39.c +++ b/mps/test/argerr/39.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,9 +36,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/4.c b/mps/test/argerr/4.c index 80f17177ebe..a1b915cdfce 100644 --- a/mps/test/argerr/4.c +++ b/mps/test/argerr/4.c @@ -16,9 +16,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -28,11 +26,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(NULL, arena, &fmtA), "create format"); @@ -41,9 +35,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/40.c b/mps/test/argerr/40.c index b087cd8f82d..7d8cd0b4c84 100644 --- a/mps/test/argerr/40.c +++ b/mps/test/argerr/40.c @@ -11,9 +11,7 @@ END_HEADER #include "mpscmfs.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,10 +32,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/argerr/41.c b/mps/test/argerr/41.c index 4b76e347e09..4e77da38dde 100644 --- a/mps/test/argerr/41.c +++ b/mps/test/argerr/41.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -33,6 +33,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/42.c b/mps/test/argerr/42.c index 9d36bebbcb1..a9d6e2190da 100644 --- a/mps/test/argerr/42.c +++ b/mps/test/argerr/42.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "arg.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -33,6 +33,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/45.c b/mps/test/argerr/45.c index c93fc3bbf7d..2d77a663d22 100644 --- a/mps/test/argerr/45.c +++ b/mps/test/argerr/45.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -62,9 +56,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/46.c b/mps/test/argerr/46.c index 29079884ed8..1f9bd759b75 100644 --- a/mps/test/argerr/46.c +++ b/mps/test/argerr/46.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,11 +33,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -60,9 +54,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/47.c b/mps/test/argerr/47.c index ede9b9a0da7..4a6c1253479 100644 --- a/mps/test/argerr/47.c +++ b/mps/test/argerr/47.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -63,9 +57,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/48.c b/mps/test/argerr/48.c index a938b8371c0..14524392c98 100644 --- a/mps/test/argerr/48.c +++ b/mps/test/argerr/48.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -36,11 +34,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -61,9 +55,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/49.c b/mps/test/argerr/49.c index d75e9c258c2..917c3df62df 100644 --- a/mps/test/argerr/49.c +++ b/mps/test/argerr/49.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -63,9 +57,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/5.c b/mps/test/argerr/5.c index a13072e130a..060664ebc51 100644 --- a/mps/test/argerr/5.c +++ b/mps/test/argerr/5.c @@ -14,9 +14,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -26,11 +24,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(UNALIGNED, arena, &fmtA), "create format"); @@ -39,9 +33,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/50.c b/mps/test/argerr/50.c index d4e700aaf60..4addae439d4 100644 --- a/mps/test/argerr/50.c +++ b/mps/test/argerr/50.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -63,9 +57,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/51.c b/mps/test/argerr/51.c index e4a901fbb86..29230442a0d 100644 --- a/mps/test/argerr/51.c +++ b/mps/test/argerr/51.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -63,9 +57,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/52.c b/mps/test/argerr/52.c index a8a9c419362..7a74a69c4af 100644 --- a/mps/test/argerr/52.c +++ b/mps/test/argerr/52.c @@ -21,9 +21,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -65,9 +59,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/53.c b/mps/test/argerr/53.c index fa60735e639..55b7e16089a 100644 --- a/mps/test/argerr/53.c +++ b/mps/test/argerr/53.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -36,11 +34,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -63,9 +57,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/54.c b/mps/test/argerr/54.c index f983a825272..586be2f5549 100644 --- a/mps/test/argerr/54.c +++ b/mps/test/argerr/54.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -69,9 +63,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/55.c b/mps/test/argerr/55.c index 087ad3d95e1..c664c604b5a 100644 --- a/mps/test/argerr/55.c +++ b/mps/test/argerr/55.c @@ -22,9 +22,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -39,11 +37,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -67,9 +61,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/56.c b/mps/test/argerr/56.c index 51bf29cc98a..1e499568bd7 100644 --- a/mps/test/argerr/56.c +++ b/mps/test/argerr/56.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -70,9 +64,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/57.c b/mps/test/argerr/57.c index 773fa1fbb55..5648a503be7 100644 --- a/mps/test/argerr/57.c +++ b/mps/test/argerr/57.c @@ -22,9 +22,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -40,11 +38,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -68,9 +62,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/58.c b/mps/test/argerr/58.c index 530b559827a..6fb66e52e99 100644 --- a/mps/test/argerr/58.c +++ b/mps/test/argerr/58.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -70,9 +64,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/59.c b/mps/test/argerr/59.c index 6dd044fe64a..0b64805957a 100644 --- a/mps/test/argerr/59.c +++ b/mps/test/argerr/59.c @@ -23,9 +23,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -69,9 +63,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/6.c b/mps/test/argerr/6.c index 8c3848aaba3..6960970154d 100644 --- a/mps/test/argerr/6.c +++ b/mps/test/argerr/6.c @@ -16,9 +16,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -30,11 +28,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, NULL, &fmtA), "create format"); @@ -43,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/60.c b/mps/test/argerr/60.c index 92cbcd5f04c..ed7027c1780 100644 --- a/mps/test/argerr/60.c +++ b/mps/test/argerr/60.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -70,9 +64,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/61.c b/mps/test/argerr/61.c index a1d5c81b590..c7618d33bf0 100644 --- a/mps/test/argerr/61.c +++ b/mps/test/argerr/61.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(NULL, p, (size_t) 64)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/62.c b/mps/test/argerr/62.c index 9cb1ef1e6d1..a037a5dd1b5 100644 --- a/mps/test/argerr/62.c +++ b/mps/test/argerr/62.c @@ -22,9 +22,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -40,11 +38,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -71,9 +65,6 @@ while (!mps_commit(UNALIGNED, p, (size_t) 64)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/63.c b/mps/test/argerr/63.c index 41a2cf52f92..0da3cd00989 100644 --- a/mps/test/argerr/63.c +++ b/mps/test/argerr/63.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(ap, NULL, (size_t) 64)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/64.c b/mps/test/argerr/64.c index 4743c21d069..5fab3db2272 100644 --- a/mps/test/argerr/64.c +++ b/mps/test/argerr/64.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(ap, UNALIGNED, (size_t) 64)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/65.c b/mps/test/argerr/65.c index 65be30d9aaa..9bcb5f28674 100644 --- a/mps/test/argerr/65.c +++ b/mps/test/argerr/65.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(ap, p, (size_t) 0)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/66.c b/mps/test/argerr/66.c index 9272b6c1354..905524fc449 100644 --- a/mps/test/argerr/66.c +++ b/mps/test/argerr/66.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(ap, p, (size_t) HIGHBIT_SIZE+64)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/67.c b/mps/test/argerr/67.c index b77eaa35d98..d478fdb15e7 100644 --- a/mps/test/argerr/67.c +++ b/mps/test/argerr/67.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -73,9 +67,6 @@ while (!mps_commit(ap, p, (size_t) 63)); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/68.c b/mps/test/argerr/68.c index e56f54fb116..5e7199afd5c 100644 --- a/mps/test/argerr/68.c +++ b/mps/test/argerr/68.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -28,9 +26,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/69.c b/mps/test/argerr/69.c index 28e9d44c11c..369b3219219 100644 --- a/mps/test/argerr/69.c +++ b/mps/test/argerr/69.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -26,9 +24,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/7.c b/mps/test/argerr/7.c index cc22fcb59ed..493338be16a 100644 --- a/mps/test/argerr/7.c +++ b/mps/test/argerr/7.c @@ -14,9 +14,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -27,11 +25,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, UNALIGNED, &fmtA), "create format"); @@ -40,9 +34,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/70.c b/mps/test/argerr/70.c index acdbfd05921..b6be0f7655e 100644 --- a/mps/test/argerr/70.c +++ b/mps/test/argerr/70.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/71.c b/mps/test/argerr/71.c index f3f8878b6d4..96d87e67368 100644 --- a/mps/test/argerr/71.c +++ b/mps/test/argerr/71.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -27,9 +25,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/72.c b/mps/test/argerr/72.c index 2cb4585b678..c95d5db9eeb 100644 --- a/mps/test/argerr/72.c +++ b/mps/test/argerr/72.c @@ -13,9 +13,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -30,9 +28,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/73.c b/mps/test/argerr/73.c index 552dc0c7c5a..0a2fd1ddb9e 100644 --- a/mps/test/argerr/73.c +++ b/mps/test/argerr/73.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/74.c b/mps/test/argerr/74.c index b14aa1782c6..e7132981d52 100644 --- a/mps/test/argerr/74.c +++ b/mps/test/argerr/74.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -31,9 +29,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/75.c b/mps/test/argerr/75.c index 848e0171edf..7e5a0ffade5 100644 --- a/mps/test/argerr/75.c +++ b/mps/test/argerr/75.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/76.c b/mps/test/argerr/76.c index 4eb0bf682c6..7a800e834fc 100644 --- a/mps/test/argerr/76.c +++ b/mps/test/argerr/76.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/77.c b/mps/test/argerr/77.c index 1e618cd922c..c0622187e5c 100644 --- a/mps/test/argerr/77.c +++ b/mps/test/argerr/77.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -30,9 +28,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/78.c b/mps/test/argerr/78.c index 21c148bad31..35f91647031 100644 --- a/mps/test/argerr/78.c +++ b/mps/test/argerr/78.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -34,9 +32,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/79.c b/mps/test/argerr/79.c index 19ef79d88b1..7625d00cb0f 100644 --- a/mps/test/argerr/79.c +++ b/mps/test/argerr/79.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/8.c b/mps/test/argerr/8.c index 1313e74ef82..7ca25ab0b48 100644 --- a/mps/test/argerr/8.c +++ b/mps/test/argerr/8.c @@ -16,9 +16,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -30,11 +28,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -45,9 +39,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/80.c b/mps/test/argerr/80.c index fe18238e2d7..e84e4a75a67 100644 --- a/mps/test/argerr/80.c +++ b/mps/test/argerr/80.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -34,9 +32,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/81.c b/mps/test/argerr/81.c index 869a5b0cb1d..6abd0183827 100644 --- a/mps/test/argerr/81.c +++ b/mps/test/argerr/81.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/82.c b/mps/test/argerr/82.c index ee7c9c18d2e..4bba722f1c8 100644 --- a/mps/test/argerr/82.c +++ b/mps/test/argerr/82.c @@ -10,9 +10,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/83.c b/mps/test/argerr/83.c index dbf8ceaed9b..b955b70bc95 100644 --- a/mps/test/argerr/83.c +++ b/mps/test/argerr/83.c @@ -10,9 +10,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -29,9 +27,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/84.c b/mps/test/argerr/84.c index d720daf13b3..c767e2ca2c3 100644 --- a/mps/test/argerr/84.c +++ b/mps/test/argerr/84.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -36,9 +34,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/85.c b/mps/test/argerr/85.c index 2d0a69d472b..6fd8d8e138a 100644 --- a/mps/test/argerr/85.c +++ b/mps/test/argerr/85.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -34,9 +32,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/86.c b/mps/test/argerr/86.c index 886d3120d17..5c342e413e6 100644 --- a/mps/test/argerr/86.c +++ b/mps/test/argerr/86.c @@ -14,9 +14,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -36,9 +34,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/87.c b/mps/test/argerr/87.c index 3321e301c0e..19d7c44cba2 100644 --- a/mps/test/argerr/87.c +++ b/mps/test/argerr/87.c @@ -12,9 +12,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -34,9 +32,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/88.c b/mps/test/argerr/88.c index 903ff293bca..68271c51b05 100644 --- a/mps/test/argerr/88.c +++ b/mps/test/argerr/88.c @@ -10,9 +10,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/89.c b/mps/test/argerr/89.c index f29791a6d20..3c3be9d48e0 100644 --- a/mps/test/argerr/89.c +++ b/mps/test/argerr/89.c @@ -10,9 +10,7 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -32,9 +30,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/9.c b/mps/test/argerr/9.c index 59910608efa..84ba817f840 100644 --- a/mps/test/argerr/9.c +++ b/mps/test/argerr/9.c @@ -14,9 +14,7 @@ END_HEADER #include "arg.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -27,11 +25,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -42,9 +36,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/90.c b/mps/test/argerr/90.c index b6a38156b4d..6ed6d4da1b5 100644 --- a/mps/test/argerr/90.c +++ b/mps/test/argerr/90.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -38,9 +36,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/91.c b/mps/test/argerr/91.c index 8264b1fe5d5..a8d8ac00d2d 100644 --- a/mps/test/argerr/91.c +++ b/mps/test/argerr/91.c @@ -12,14 +12,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -36,9 +34,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/92.c b/mps/test/argerr/92.c index 0a669653e9e..a650a430a46 100644 --- a/mps/test/argerr/92.c +++ b/mps/test/argerr/92.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/93.c b/mps/test/argerr/93.c index 6dc8d383f0d..27f270276f2 100644 --- a/mps/test/argerr/93.c +++ b/mps/test/argerr/93.c @@ -12,14 +12,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -37,9 +35,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/94.c b/mps/test/argerr/94.c index cd308af5e53..85009341879 100644 --- a/mps/test/argerr/94.c +++ b/mps/test/argerr/94.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/95.c b/mps/test/argerr/95.c index 478a9dfd787..b2b07bf654f 100644 --- a/mps/test/argerr/95.c +++ b/mps/test/argerr/95.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/96.c b/mps/test/argerr/96.c index adff8cc6a08..ec5c526a83a 100644 --- a/mps/test/argerr/96.c +++ b/mps/test/argerr/96.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/97.c b/mps/test/argerr/97.c index 5c10435c3cc..850aeae1128 100644 --- a/mps/test/argerr/97.c +++ b/mps/test/argerr/97.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/98.c b/mps/test/argerr/98.c index 35160ef0478..b84dfef0d98 100644 --- a/mps/test/argerr/98.c +++ b/mps/test/argerr/98.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/argerr/99.c b/mps/test/argerr/99.c index 9eece2c92b5..bb57512c51a 100644 --- a/mps/test/argerr/99.c +++ b/mps/test/argerr/99.c @@ -14,14 +14,12 @@ END_HEADER #include "testlib.h" #include "arg.h" -void *stackpointer; - static mps_res_t rootscan(mps_ss_t ss, void *p, size_t s) { return MPS_RES_OK; } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -39,9 +37,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/0.c b/mps/test/conerr/0.c index a7bd9a82565..5614aa5dddf 100644 --- a/mps/test/conerr/0.c +++ b/mps/test/conerr/0.c @@ -11,7 +11,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -24,6 +24,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/1.c b/mps/test/conerr/1.c index 2758c0385df..8d2ac0573e4 100644 --- a/mps/test/conerr/1.c +++ b/mps/test/conerr/1.c @@ -11,7 +11,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena = (mps_arena_t)1; @@ -21,6 +21,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/10.c b/mps/test/conerr/10.c index 14b1c9cd8ed..759cf3b84d3 100644 --- a/mps/test/conerr/10.c +++ b/mps/test/conerr/10.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format = (mps_fmt_t)&format; @@ -29,6 +29,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/11.c b/mps/test/conerr/11.c index 300ae95a388..9f09ce19d38 100644 --- a/mps/test/conerr/11.c +++ b/mps/test/conerr/11.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format; @@ -34,6 +34,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/12.c b/mps/test/conerr/12.c index 139abce195b..86322d46745 100644 --- a/mps/test/conerr/12.c +++ b/mps/test/conerr/12.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format; @@ -38,6 +38,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/13.c b/mps/test/conerr/13.c index cab4314a6a3..1882a4a216b 100644 --- a/mps/test/conerr/13.c +++ b/mps/test/conerr/13.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena = malloc(4096); mps_pool_t pool; @@ -27,6 +27,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/14.c b/mps/test/conerr/14.c index 13998e9e3cf..3d39fb6376b 100644 --- a/mps/test/conerr/14.c +++ b/mps/test/conerr/14.c @@ -12,7 +12,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/15.c b/mps/test/conerr/15.c index 6e1420dce4d..9562e63b1c0 100644 --- a/mps/test/conerr/15.c +++ b/mps/test/conerr/15.c @@ -15,7 +15,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool = malloc(4096); mps_pool_destroy(pool); @@ -23,6 +23,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/16.c b/mps/test/conerr/16.c index 75bf14aa21f..07df71aabc2 100644 --- a/mps/test/conerr/16.c +++ b/mps/test/conerr/16.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -30,6 +30,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/17.c b/mps/test/conerr/17.c index 7eaaa0f5548..a8ae0b0f400 100644 --- a/mps/test/conerr/17.c +++ b/mps/test/conerr/17.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -46,6 +46,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/18.c b/mps/test/conerr/18.c index d6ea9e923b5..a3b0b7d3fe0 100644 --- a/mps/test/conerr/18.c +++ b/mps/test/conerr/18.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena0; mps_arena_t arena1; @@ -47,6 +47,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/19.c b/mps/test/conerr/19.c index cbac8d6078f..1e2c237f3b7 100644 --- a/mps/test/conerr/19.c +++ b/mps/test/conerr/19.c @@ -16,7 +16,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool = malloc(4096); mps_addr_t obj; @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/2.c b/mps/test/conerr/2.c index ba18c963be0..147e3c4c862 100644 --- a/mps/test/conerr/2.c +++ b/mps/test/conerr/2.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -24,6 +24,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/20.c b/mps/test/conerr/20.c index 3b216844c39..317489cb36b 100644 --- a/mps/test/conerr/20.c +++ b/mps/test/conerr/20.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -33,6 +33,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/21.c b/mps/test/conerr/21.c index d00cf5d63af..29143e4f229 100644 --- a/mps/test/conerr/21.c +++ b/mps/test/conerr/21.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,6 +35,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/22.c b/mps/test/conerr/22.c index 9b13e48f93a..fe196b5fcd8 100644 --- a/mps/test/conerr/22.c +++ b/mps/test/conerr/22.c @@ -16,7 +16,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,6 +34,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/23.c b/mps/test/conerr/23.c index 9196264a242..7613f241f8d 100644 --- a/mps/test/conerr/23.c +++ b/mps/test/conerr/23.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,6 +35,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/24.c b/mps/test/conerr/24.c index 39ff8890bf7..346f9580df3 100644 --- a/mps/test/conerr/24.c +++ b/mps/test/conerr/24.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -48,6 +48,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/25.c b/mps/test/conerr/25.c index c4cfc508eea..429f197f54b 100644 --- a/mps/test/conerr/25.c +++ b/mps/test/conerr/25.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -48,6 +48,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/26.c b/mps/test/conerr/26.c index 6992cc8f1e0..6029e39ad1e 100644 --- a/mps/test/conerr/26.c +++ b/mps/test/conerr/26.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool0, pool1; @@ -39,6 +39,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/27.c b/mps/test/conerr/27.c index e84ce573c9f..3def222d3e0 100644 --- a/mps/test/conerr/27.c +++ b/mps/test/conerr/27.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool0, pool1; @@ -38,6 +38,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/28.c b/mps/test/conerr/28.c index d45c2f12484..909b039ab4d 100644 --- a/mps/test/conerr/28.c +++ b/mps/test/conerr/28.c @@ -12,7 +12,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool = (mps_pool_t)1; @@ -40,6 +40,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/29.c b/mps/test/conerr/29.c index 915581caccf..37bac6f32d7 100644 --- a/mps/test/conerr/29.c +++ b/mps/test/conerr/29.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,6 +44,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/3.c b/mps/test/conerr/3.c index dae5b202009..8c245650f7a 100644 --- a/mps/test/conerr/3.c +++ b/mps/test/conerr/3.c @@ -14,7 +14,7 @@ END_HEADER #include "mpmst.h" #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { char buf[sizeof(ArenaStruct)]; mps_arena_t arena; @@ -26,6 +26,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/30.c b/mps/test/conerr/30.c index 79daebca18c..82947fa60b1 100644 --- a/mps/test/conerr/30.c +++ b/mps/test/conerr/30.c @@ -12,7 +12,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -40,6 +40,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/31.c b/mps/test/conerr/31.c index dca4cc3caba..9dadf084a8e 100644 --- a/mps/test/conerr/31.c +++ b/mps/test/conerr/31.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpsclo.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -47,6 +47,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/32.c b/mps/test/conerr/32.c index 7ee92a781b5..a96eb5137e6 100644 --- a/mps/test/conerr/32.c +++ b/mps/test/conerr/32.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmfs.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,6 +35,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/33.c b/mps/test/conerr/33.c index 3a3cb2c1281..e745865a78c 100644 --- a/mps/test/conerr/33.c +++ b/mps/test/conerr/33.c @@ -10,7 +10,7 @@ END_HEADER #include "testlib.h" #include "mpscams.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -47,6 +47,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/33a.c b/mps/test/conerr/33a.c index 3add3105d5e..d4ab5578409 100644 --- a/mps/test/conerr/33a.c +++ b/mps/test/conerr/33a.c @@ -10,7 +10,7 @@ END_HEADER #include "testlib.h" #include "mpscams.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -53,6 +53,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/34.c b/mps/test/conerr/34.c index 4b6e526ebad..c2ec597c9c5 100644 --- a/mps/test/conerr/34.c +++ b/mps/test/conerr/34.c @@ -18,9 +18,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,11 +33,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -82,10 +76,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/35.c b/mps/test/conerr/35.c index eb25e49f83e..80aafa7180b 100644 --- a/mps/test/conerr/35.c +++ b/mps/test/conerr/35.c @@ -20,9 +20,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -82,10 +76,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/36.c b/mps/test/conerr/36.c index 60e68f8943a..9d8040d4a0d 100644 --- a/mps/test/conerr/36.c +++ b/mps/test/conerr/36.c @@ -20,9 +20,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -86,10 +80,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/37.c b/mps/test/conerr/37.c index 659a2139766..d749027db76 100644 --- a/mps/test/conerr/37.c +++ b/mps/test/conerr/37.c @@ -20,9 +20,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -39,11 +37,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -90,10 +84,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/37f.c b/mps/test/conerr/37f.c index 530af933fc6..024602762c1 100644 --- a/mps/test/conerr/37f.c +++ b/mps/test/conerr/37f.c @@ -23,9 +23,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -93,10 +87,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/38.c b/mps/test/conerr/38.c index cbaf71de7d0..c81d2b3253c 100644 --- a/mps/test/conerr/38.c +++ b/mps/test/conerr/38.c @@ -20,9 +20,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -39,11 +37,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -90,10 +84,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/38f.c b/mps/test/conerr/38f.c index eb8974dd32c..7d974aefa81 100644 --- a/mps/test/conerr/38f.c +++ b/mps/test/conerr/38f.c @@ -23,9 +23,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,11 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -93,10 +87,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/39.c b/mps/test/conerr/39.c index c2e4b82e3bd..4c4fb85f7e8 100644 --- a/mps/test/conerr/39.c +++ b/mps/test/conerr/39.c @@ -20,9 +20,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,11 +36,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -91,10 +85,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/39f.c b/mps/test/conerr/39f.c index 326481c090a..e21ea8e39e1 100644 --- a/mps/test/conerr/39f.c +++ b/mps/test/conerr/39f.c @@ -23,9 +23,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -94,10 +88,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/4.c b/mps/test/conerr/4.c index 40dc9e59102..41cdde90d64 100644 --- a/mps/test/conerr/4.c +++ b/mps/test/conerr/4.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -28,6 +28,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/40.c b/mps/test/conerr/40.c index 516b477808d..de21b0068fc 100644 --- a/mps/test/conerr/40.c +++ b/mps/test/conerr/40.c @@ -16,9 +16,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,11 +32,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -85,10 +79,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/40f.c b/mps/test/conerr/40f.c index 6f9d85dde6d..7f403d83424 100644 --- a/mps/test/conerr/40f.c +++ b/mps/test/conerr/40f.c @@ -23,9 +23,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -92,10 +86,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/41.c b/mps/test/conerr/41.c index 44c03b77c40..8bc241a498c 100644 --- a/mps/test/conerr/41.c +++ b/mps/test/conerr/41.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena = (mps_arena_t)1; mps_root_t root; @@ -38,10 +36,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/42.c b/mps/test/conerr/42.c index c6c453a9dec..e8173ae6634 100644 --- a/mps/test/conerr/42.c +++ b/mps/test/conerr/42.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_root_t root; @@ -37,10 +35,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/43.c b/mps/test/conerr/43.c index ce29bc3cb69..7fb906ea48a 100644 --- a/mps/test/conerr/43.c +++ b/mps/test/conerr/43.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_root_t root = (mps_root_t)1; @@ -37,10 +35,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/44.c b/mps/test/conerr/44.c index 5b7df5e1a08..2b1fce55fb4 100644 --- a/mps/test/conerr/44.c +++ b/mps/test/conerr/44.c @@ -15,9 +15,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_root_t root; @@ -41,10 +39,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/44a.c b/mps/test/conerr/44a.c index 96a13d43849..6bdb9cdf77c 100644 --- a/mps/test/conerr/44a.c +++ b/mps/test/conerr/44a.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread = (mps_thr_t)1; @@ -27,11 +25,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); mps_root_destroy(root); comment("Destroyed root."); @@ -46,10 +40,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/45.c b/mps/test/conerr/45.c index 82b73e3287d..8596340dc77 100644 --- a/mps/test/conerr/45.c +++ b/mps/test/conerr/45.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena = (mps_arena_t)1; mps_thr_t thread; @@ -35,10 +33,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/46.c b/mps/test/conerr/46.c index 7c375bfe926..5e3b669f353 100644 --- a/mps/test/conerr/46.c +++ b/mps/test/conerr/46.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -36,10 +34,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/47.c b/mps/test/conerr/47.c index 93bdda8f99e..45cd8a74bda 100644 --- a/mps/test/conerr/47.c +++ b/mps/test/conerr/47.c @@ -13,9 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread = (mps_thr_t)1; @@ -35,10 +33,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/48.c b/mps/test/conerr/48.c index 98fd71caf3a..28eb22d79b1 100644 --- a/mps/test/conerr/48.c +++ b/mps/test/conerr/48.c @@ -14,9 +14,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -37,10 +35,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/49.c b/mps/test/conerr/49.c index 8c7071381d1..1ccd5431544 100644 --- a/mps/test/conerr/49.c +++ b/mps/test/conerr/49.c @@ -11,9 +11,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -37,10 +35,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/5.c b/mps/test/conerr/5.c index 43252ffdfad..ae89ad18882 100644 --- a/mps/test/conerr/5.c +++ b/mps/test/conerr/5.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format; @@ -28,6 +28,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/50.c b/mps/test/conerr/50.c index 586600afea2..3cffb90c405 100644 --- a/mps/test/conerr/50.c +++ b/mps/test/conerr/50.c @@ -13,7 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena = (mps_arena_t)1; mps_ld_s ld; @@ -31,7 +31,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/51.c b/mps/test/conerr/51.c index 53e89493d01..7ce7d5d65f7 100644 --- a/mps/test/conerr/51.c +++ b/mps/test/conerr/51.c @@ -13,7 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -29,7 +29,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/52.c b/mps/test/conerr/52.c index a8d2425e0bb..c36e3d89548 100644 --- a/mps/test/conerr/52.c +++ b/mps/test/conerr/52.c @@ -13,7 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -33,7 +33,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/53.c b/mps/test/conerr/53.c index ac072dfda0d..997df13eeb7 100644 --- a/mps/test/conerr/53.c +++ b/mps/test/conerr/53.c @@ -17,7 +17,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -42,7 +42,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/54.c b/mps/test/conerr/54.c index 3439f22cb71..f2a95b58e0a 100644 --- a/mps/test/conerr/54.c +++ b/mps/test/conerr/54.c @@ -17,7 +17,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -46,7 +46,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/55.c b/mps/test/conerr/55.c index 9f32ccdcad9..e79f18c976e 100644 --- a/mps/test/conerr/55.c +++ b/mps/test/conerr/55.c @@ -13,7 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -38,7 +38,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/56.c b/mps/test/conerr/56.c index 332bec77471..2570ce57455 100644 --- a/mps/test/conerr/56.c +++ b/mps/test/conerr/56.c @@ -13,7 +13,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_ld_s ld; @@ -36,7 +36,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/57.c b/mps/test/conerr/57.c index 7e6707d46ea..ccb0f31e75b 100644 --- a/mps/test/conerr/57.c +++ b/mps/test/conerr/57.c @@ -11,7 +11,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena0; mps_arena_t arena1; @@ -35,7 +35,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/58.c b/mps/test/conerr/58.c index 7feeb5ea765..7355eb69d1a 100644 --- a/mps/test/conerr/58.c +++ b/mps/test/conerr/58.c @@ -11,7 +11,7 @@ END_HEADER #include "mpscamc.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena0; mps_arena_t arena1; @@ -34,7 +34,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/59.c b/mps/test/conerr/59.c index 1c93cd8127c..0db26a403e5 100644 --- a/mps/test/conerr/59.c +++ b/mps/test/conerr/59.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -34,6 +34,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/6.c b/mps/test/conerr/6.c index 33d7b5baf7a..78420d9edd1 100644 --- a/mps/test/conerr/6.c +++ b/mps/test/conerr/6.c @@ -13,9 +13,7 @@ END_HEADER #include "testlib.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -25,11 +23,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); mps_thread_dereg(thread); mps_arena_destroy(arena); comment("Destroy arena."); @@ -37,9 +31,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/60.c b/mps/test/conerr/60.c index de43e0953f6..dab72b49148 100644 --- a/mps/test/conerr/60.c +++ b/mps/test/conerr/60.c @@ -16,7 +16,7 @@ END_HEADER #include "mpsclo.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -68,6 +68,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/61.c b/mps/test/conerr/61.c index f17ee06f778..0f5fa65cbab 100644 --- a/mps/test/conerr/61.c +++ b/mps/test/conerr/61.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscawl.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -60,6 +60,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/62.c b/mps/test/conerr/62.c index 55e86998ad6..2c49053603d 100644 --- a/mps/test/conerr/62.c +++ b/mps/test/conerr/62.c @@ -16,7 +16,7 @@ END_HEADER #include "mpsclo.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -70,6 +70,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/63.c b/mps/test/conerr/63.c index 65ce19823dd..4fec52ff41b 100644 --- a/mps/test/conerr/63.c +++ b/mps/test/conerr/63.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscawl.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -62,6 +62,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/64.c b/mps/test/conerr/64.c index 1a5ccd43af2..c17c3da40c8 100644 --- a/mps/test/conerr/64.c +++ b/mps/test/conerr/64.c @@ -16,7 +16,7 @@ END_HEADER #include "mpsclo.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -75,6 +75,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/65.c b/mps/test/conerr/65.c index 8e31644697e..8ed48c380f2 100644 --- a/mps/test/conerr/65.c +++ b/mps/test/conerr/65.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscawl.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -67,6 +67,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/66.c b/mps/test/conerr/66.c index 2aa1093d106..89a4ecffc2e 100644 --- a/mps/test/conerr/66.c +++ b/mps/test/conerr/66.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscams.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -60,6 +60,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/67.c b/mps/test/conerr/67.c index 3d03f9cb15d..9709c0c43f3 100644 --- a/mps/test/conerr/67.c +++ b/mps/test/conerr/67.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscams.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -62,6 +62,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/68.c b/mps/test/conerr/68.c index 5b2875e5d4e..f21fc567e60 100644 --- a/mps/test/conerr/68.c +++ b/mps/test/conerr/68.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscams.h" #include "myfmt.h" -static void test(void) +static void test(void *stack_pointer) { void *marker = ▮ mps_arena_t arena; @@ -67,6 +67,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/7.c b/mps/test/conerr/7.c index 9ead1898641..784f82ff70a 100644 --- a/mps/test/conerr/7.c +++ b/mps/test/conerr/7.c @@ -13,9 +13,7 @@ END_HEADER #include "testlib.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_thr_t thread; @@ -30,9 +28,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/8.c b/mps/test/conerr/8.c index f43543cb2cb..fe5437444fe 100644 --- a/mps/test/conerr/8.c +++ b/mps/test/conerr/8.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format; @@ -28,6 +28,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/conerr/9.c b/mps/test/conerr/9.c index bbab451086c..e4e5e809748 100644 --- a/mps/test/conerr/9.c +++ b/mps/test/conerr/9.c @@ -11,7 +11,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_fmt_t format; @@ -27,6 +27,6 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/function/1.c b/mps/test/function/1.c index d5a6c11a161..a7319825db5 100644 --- a/mps/test/function/1.c +++ b/mps/test/function/1.c @@ -9,7 +9,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -20,7 +20,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/10.c b/mps/test/function/10.c index 7a29d6c8c2b..358f927686f 100644 --- a/mps/test/function/10.c +++ b/mps/test/function/10.c @@ -16,8 +16,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - static mps_res_t myscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { return MPS_RES_OK; @@ -57,7 +55,7 @@ struct mps_fmt_A_s fmtA = }; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -76,11 +74,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -117,10 +111,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/100.c b/mps/test/function/100.c index 718bcda36b9..e71a8cd7736 100644 --- a/mps/test/function/100.c +++ b/mps/test/function/100.c @@ -13,7 +13,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; static mps_addr_t queue[MAXNUMBER]; @@ -88,7 +87,7 @@ static void dotest(int kind, size_t unitSize, size_t extendBy, } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; @@ -130,10 +129,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/101.c b/mps/test/function/101.c index dfd16450bd2..027a48aefaf 100644 --- a/mps/test/function/101.c +++ b/mps/test/function/101.c @@ -13,7 +13,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; static struct {mps_addr_t addr; size_t size;} queue[MAXNUMBER]; @@ -130,7 +129,7 @@ static void dt(int kind, (int) mins, (int) maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; size_t mins; @@ -167,10 +166,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/103.c b/mps/test/function/103.c index 58e765e397a..6a61ba9ddbb 100644 --- a/mps/test/function/103.c +++ b/mps/test/function/103.c @@ -20,8 +20,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_pool_t poolmvff; mps_arena_t arena; @@ -52,7 +50,7 @@ static void empty(void) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_thr_t thread; @@ -74,10 +72,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -152,10 +147,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/104.c b/mps/test/function/104.c index f5ac595dcfe..821a3c5aa22 100644 --- a/mps/test/function/104.c +++ b/mps/test/function/104.c @@ -42,7 +42,6 @@ static mps_gen_param_s testChain[genCOUNT] = { #define MAGICPOINT ((mycell *) 214208) -void *stackpointer; long int appcount; long int apppadcount; @@ -110,7 +109,7 @@ static void stepper(mps_addr_t addr, mps_fmt_t fmt, mps_pool_t pool, } -static void test(void) +static void test(void *stack_pointer) { mycell *a[4], /* a is a table of exact roots */ *b[4]; /* b is a table of ambiguous roots */ @@ -237,10 +236,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/105.c b/mps/test/function/105.c index c3bf5c69a16..0ec950f9c83 100644 --- a/mps/test/function/105.c +++ b/mps/test/function/105.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -42,10 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); die(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -91,10 +85,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/106.c b/mps/test/function/106.c index 7689773b322..0c38a78417d 100644 --- a/mps/test/function/106.c +++ b/mps/test/function/106.c @@ -21,7 +21,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; mps_ap_t ap; @@ -58,7 +57,7 @@ static locell *conc(locell *x, locell *y) } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -78,10 +77,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtLO), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -115,10 +111,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/107.c b/mps/test/function/107.c index e493c052c90..5bd3f4754dc 100644 --- a/mps/test/function/107.c +++ b/mps/test/function/107.c @@ -21,7 +21,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; mps_ap_t ap; @@ -58,7 +57,7 @@ static locell *conc(locell *x, locell *y) } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -78,10 +77,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtLO), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -116,10 +112,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/108.c b/mps/test/function/108.c index 80cea58c1a7..73f160af3ba 100644 --- a/mps/test/function/108.c +++ b/mps/test/function/108.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -47,10 +44,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -98,10 +92,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/109.c b/mps/test/function/109.c index b92ad2ff0ef..3b9f8fd9664 100644 --- a/mps/test/function/109.c +++ b/mps/test/function/109.c @@ -20,8 +20,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -119,7 +117,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poolamcz; mps_thr_t thread; @@ -138,10 +136,7 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register 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_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -288,10 +283,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/11.c b/mps/test/function/11.c index 9f08936d149..2326880039a 100644 --- a/mps/test/function/11.c +++ b/mps/test/function/11.c @@ -23,10 +23,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -46,10 +43,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -91,10 +85,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/110.c b/mps/test/function/110.c index bbf5aa0dc6d..27717fefab4 100644 --- a/mps/test/function/110.c +++ b/mps/test/function/110.c @@ -24,8 +24,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -123,7 +121,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -142,10 +140,7 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register 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_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -297,10 +292,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/111.c b/mps/test/function/111.c index 04765b741e7..db15c35c363 100644 --- a/mps/test/function/111.c +++ b/mps/test/function/111.c @@ -24,8 +24,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -91,7 +89,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -110,10 +108,7 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register 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_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -215,10 +210,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/112.c b/mps/test/function/112.c index 14ed49da3bc..7c25d1e5fa3 100644 --- a/mps/test/function/112.c +++ b/mps/test/function/112.c @@ -19,12 +19,11 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t poollo; mps_thr_t thread; mps_root_t root0, root1; @@ -39,10 +38,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -84,10 +80,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/113.c b/mps/test/function/113.c index 107ec68578a..35ec4653388 100644 --- a/mps/test/function/113.c +++ b/mps/test/function/113.c @@ -19,9 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -130,10 +124,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/114.c b/mps/test/function/114.c index f2f1b022bbf..9c1ebebbb8a 100644 --- a/mps/test/function/114.c +++ b/mps/test/function/114.c @@ -18,9 +18,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -40,11 +38,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -129,10 +123,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/116.c b/mps/test/function/116.c index 8c87bae4458..ed1daa69378 100644 --- a/mps/test/function/116.c +++ b/mps/test/function/116.c @@ -17,12 +17,10 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_pool_t poolmv; mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_thr_t thread; @@ -46,9 +44,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, - mps_stack_scan_ambig, stackpointer, 0), "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -120,10 +116,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/117.c b/mps/test/function/117.c index 8d66a6e9bdb..2acc7155831 100644 --- a/mps/test/function/117.c +++ b/mps/test/function/117.c @@ -22,12 +22,10 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_thr_t thread; @@ -48,10 +46,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -105,10 +100,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/118.c b/mps/test/function/118.c index a77ec4f8f8b..e83a8f54886 100644 --- a/mps/test/function/118.c +++ b/mps/test/function/118.c @@ -89,7 +89,7 @@ static mps_addr_t make(void) } -static void test(void) +static void test(void *stack_pointer) { mps_addr_t busy_init; mps_ap_t busy_ap; @@ -140,7 +140,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; diff --git a/mps/test/function/119.c b/mps/test/function/119.c index 34434e93057..d8cd7d70134 100644 --- a/mps/test/function/119.c +++ b/mps/test/function/119.c @@ -10,11 +10,9 @@ END_HEADER #include "testlib.h" #include "mpsavm.h" -void *stackpointer; - mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { /* create an arena that can't grow beyond 128 M */ @@ -29,10 +27,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/12.c b/mps/test/function/12.c index d9f2de7fedb..a7cd73a27cb 100644 --- a/mps/test/function/12.c +++ b/mps/test/function/12.c @@ -39,8 +39,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_ap_t ap[NAPS]; mycell *p[NAPS]; size_t s[NAPS]; @@ -48,7 +46,7 @@ int nrefs[NAPS]; int ap_state[NAPS]; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -78,10 +76,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -202,10 +197,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/120.c b/mps/test/function/120.c index cc45b20aa40..c25abd1d86f 100644 --- a/mps/test/function/120.c +++ b/mps/test/function/120.c @@ -23,14 +23,13 @@ END_HEADER #include "mpsavm.h" #include "mpscmvff.h" -void *stackpointer; - mps_arena_t arena; mps_thr_t thread; mps_pool_t pool; mps_pool_t pools[1000]; -static void test(void) { +static void test(void *stack_pointer) +{ int i; mps_addr_t a; mps_res_t res; @@ -130,10 +129,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/121.c b/mps/test/function/121.c index c5780e23ee7..f7a24afdb20 100644 --- a/mps/test/function/121.c +++ b/mps/test/function/121.c @@ -17,7 +17,7 @@ mps_arena_t arena; static char buffer[1024 * 1024]; -static void test(void) +static void test(void *stack_pointer) { mps_res_t res, prev_res = MPS_RES_OK; int i; @@ -61,7 +61,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/122.c b/mps/test/function/122.c index 2e26c497be4..0fce6bef032 100644 --- a/mps/test/function/122.c +++ b/mps/test/function/122.c @@ -26,7 +26,6 @@ static mps_gen_param_s testChain[genCOUNT] = { #define MAGICSIZE (342) -void *stackpointer; long int rootcount; long int speccount; @@ -81,7 +80,7 @@ static void walkroots (mycell *a) mycell *a[4], *b[4]; -static void test(void) +static void test(void *stack_pointer) { mps_chain_t chain; mycell *x; @@ -144,9 +143,7 @@ static void test(void) walkroots(NULL); report("count1", "%ld", rootcount); - cdie(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), "create stack root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); x = allocdumb(apamc, 64, mps_rank_exact()); (void)allocdumb(apamc, 64, mps_rank_exact()); (void)allocdumb(apamc, 64, mps_rank_exact()); @@ -187,10 +184,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/123.c b/mps/test/function/123.c index 0e354e29bed..83082eaf38e 100644 --- a/mps/test/function/123.c +++ b/mps/test/function/123.c @@ -18,11 +18,9 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mycell *a, *b; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -124,10 +122,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/124.c b/mps/test/function/124.c index dae58c55624..14f68b739a8 100644 --- a/mps/test/function/124.c +++ b/mps/test/function/124.c @@ -37,8 +37,6 @@ static mps_gen_param_s testChain[genCOUNT] = { */ -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -61,7 +59,7 @@ static void alloc_back(void) } -static void test(void) +static void test(void *stack_pointer) { mps_chain_t chain; long int i; @@ -74,11 +72,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -150,10 +144,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/125.c b/mps/test/function/125.c index 52f06f91ec9..611619c584d 100644 --- a/mps/test/function/125.c +++ b/mps/test/function/125.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,10 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -98,10 +92,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/126.c b/mps/test/function/126.c index 5611da44128..caffb99af0e 100644 --- a/mps/test/function/126.c +++ b/mps/test/function/126.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -40,10 +37,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -96,10 +90,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/127.c b/mps/test/function/127.c index 8f089c6f320..23cbdeaa4c1 100644 --- a/mps/test/function/127.c +++ b/mps/test/function/127.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; @@ -72,11 +71,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -162,10 +157,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/128.c b/mps/test/function/128.c index cbf04acb0d7..f55d7f3cb4a 100644 --- a/mps/test/function/128.c +++ b/mps/test/function/128.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; @@ -72,11 +71,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -162,10 +157,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/129.c b/mps/test/function/129.c index eb94f3f7e20..3521534ef1b 100644 --- a/mps/test/function/129.c +++ b/mps/test/function/129.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -59,7 +57,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; int inramp; @@ -71,11 +70,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -162,10 +157,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/12p.c b/mps/test/function/12p.c index e5556c75ecb..04bdc59f52d 100644 --- a/mps/test/function/12p.c +++ b/mps/test/function/12p.c @@ -34,8 +34,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - #define PNULL (ranint(100)<25) #define NUMREFS (ranint(20)) @@ -44,7 +42,7 @@ size_t s[NAPS]; int nrefs[NAPS]; int ap_state[NAPS]; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -71,11 +69,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -216,10 +210,7 @@ cells = allocone(ap[0], NCELLS); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/13.c b/mps/test/function/13.c index 9a629ea1792..94dd01f4302 100644 --- a/mps/test/function/13.c +++ b/mps/test/function/13.c @@ -34,8 +34,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - #define PNULL (ranint(100)<25) #define NUMREFS (ranint(20)) @@ -45,7 +43,7 @@ size_t s[NAPS]; int nrefs[NAPS]; int ap_state[NAPS]; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -71,11 +69,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -212,10 +206,7 @@ cells = allocone(ap[0], NCELLS); int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/130.c b/mps/test/function/130.c index f871d5944f8..2d4195d5399 100644 --- a/mps/test/function/130.c +++ b/mps/test/function/130.c @@ -23,7 +23,7 @@ mps_pool_t poolmv; mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_root_t root; @@ -98,7 +98,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/131.c b/mps/test/function/131.c index 0b0ae7be024..da2e856358a 100644 --- a/mps/test/function/131.c +++ b/mps/test/function/131.c @@ -28,7 +28,7 @@ mps_pool_t poolmv; mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_root_t root; @@ -103,7 +103,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/134.c b/mps/test/function/134.c index 8bc25359cb9..78cc7375ad1 100644 --- a/mps/test/function/134.c +++ b/mps/test/function/134.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; @@ -72,11 +71,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -162,10 +157,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/135.c b/mps/test/function/135.c index 3a7eb3ea4ca..7ccf187369b 100644 --- a/mps/test/function/135.c +++ b/mps/test/function/135.c @@ -14,13 +14,12 @@ END_HEADER #include "mpsavm.h" #include "mpscmvff.h" -void *stackpointer; - mps_arena_t arena; mps_thr_t thread; mps_pool_t pool; -static void test(void) { +static void test(void *stack_pointer) +{ int i; mps_addr_t a; @@ -56,10 +55,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/136.c b/mps/test/function/136.c index bd873e899b9..5ad00dcbf46 100644 --- a/mps/test/function/136.c +++ b/mps/test/function/136.c @@ -39,7 +39,6 @@ END_HEADER #define MAXLARGEOBJECTS (100000ul) -void *stackpointer; mps_arena_t arena; static mps_addr_t @@ -152,7 +151,7 @@ static void do_test(size_t extendBy, size_t avgSize, size_t align, } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; int symm; @@ -187,10 +186,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/137.c b/mps/test/function/137.c index 715dae9b4c8..8945097d496 100644 --- a/mps/test/function/137.c +++ b/mps/test/function/137.c @@ -34,14 +34,14 @@ END_HEADER #define EXTENDBY (8*1024) #define MAXLARGE (10*1024) -void *stackpointer; mps_arena_t arena; static mps_addr_t largeObjects[MAXLARGE], smallObjects[NSMALL]; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; unsigned int i; @@ -97,10 +97,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/138.c b/mps/test/function/138.c index d4cfa5d5d4f..51c583534f1 100644 --- a/mps/test/function/138.c +++ b/mps/test/function/138.c @@ -22,7 +22,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -static void test(void) +static void test(void *stack_pointer) { int j; mps_ap_t ap; @@ -80,7 +80,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/139.c b/mps/test/function/139.c index 3ba3c2a3395..4e2d50fb7d0 100644 --- a/mps/test/function/139.c +++ b/mps/test/function/139.c @@ -24,14 +24,14 @@ END_HEADER #define EXTENDBY (8*1024) #define MAXLARGE (1000*1024) -void *stackpointer; mps_arena_t arena; static mps_addr_t largeObjects[MAXLARGE], smallObjects[NSMALL]; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; unsigned int i; @@ -76,10 +76,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/14.c b/mps/test/function/14.c index e77bafeb658..206af9b0e53 100644 --- a/mps/test/function/14.c +++ b/mps/test/function/14.c @@ -23,16 +23,13 @@ END_HEADER #include "newfmt.h" -void *stackpointer; - - #define genCOUNT (3) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -58,10 +55,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -114,10 +108,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/140.c b/mps/test/function/140.c index ae442893a12..d48fb4f2eec 100644 --- a/mps/test/function/140.c +++ b/mps/test/function/140.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; mps_bool_t slotHigh, arenaHigh, firstFit; @@ -153,7 +152,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -182,10 +181,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/144.c b/mps/test/function/144.c index 4343be93fea..1926a65b3d1 100644 --- a/mps/test/function/144.c +++ b/mps/test/function/144.c @@ -14,12 +14,12 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_addr_t a, b; @@ -56,10 +56,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/147.c b/mps/test/function/147.c index 1911f05a54e..8c90c3e03de 100644 --- a/mps/test/function/147.c +++ b/mps/test/function/147.c @@ -15,7 +15,7 @@ END_HEADER #define THIRTY_MEG (30uL*1024ul*1024ul) -static void test(void) +static void test(void *stack_pointer) { int i = 0, f = 0; mps_ap_t sap; @@ -99,7 +99,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/148.c b/mps/test/function/148.c index d78b9631450..1dd43b0402f 100644 --- a/mps/test/function/148.c +++ b/mps/test/function/148.c @@ -36,7 +36,7 @@ static mps_gen_param_s testChain[genCOUNT] = { #define SMALLSIZE (4096) -static void test(void) +static void test(void *stack_pointer) { int i; mps_ap_t ap, sap; @@ -139,7 +139,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/15.c b/mps/test/function/15.c index cf04dd75545..b2c0aac9231 100644 --- a/mps/test/function/15.c +++ b/mps/test/function/15.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,10 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -70,10 +64,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/150.c b/mps/test/function/150.c index 60bf31fe73b..f1d19b34023 100644 --- a/mps/test/function/150.c +++ b/mps/test/function/150.c @@ -26,8 +26,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -141,7 +139,7 @@ static void messagepoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -159,10 +157,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -315,10 +310,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/151.c b/mps/test/function/151.c index 2bf31148570..952329ffabd 100644 --- a/mps/test/function/151.c +++ b/mps/test/function/151.c @@ -16,7 +16,7 @@ END_HEADER #define OBJSIZE (1024*1024*1) #define ITERATIONS (100) -static void test(void) +static void test(void *stack_pointer) { int i = 0; mps_ap_t sap; @@ -78,7 +78,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/152.c b/mps/test/function/152.c index 75984b653af..af197c8f1d6 100644 --- a/mps/test/function/152.c +++ b/mps/test/function/152.c @@ -36,7 +36,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -static void test(void) +static void test(void *stack_pointer) { mps_ap_t ap, sap; mps_arena_t arena; @@ -119,7 +119,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/153.c b/mps/test/function/153.c index 3ed62edf9d9..efee2755651 100644 --- a/mps/test/function/153.c +++ b/mps/test/function/153.c @@ -15,7 +15,7 @@ END_HEADER #define THIRTY_MEG (30uL*1024ul*1024ul) -static void test(void) +static void test(void *stack_pointer) { int i = 0; mps_ap_t sap; @@ -77,7 +77,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/158.c b/mps/test/function/158.c index 7f54823d1db..bdb4864e8f0 100644 --- a/mps/test/function/158.c +++ b/mps/test/function/158.c @@ -15,12 +15,12 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_addr_t a; @@ -44,10 +44,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/159.c b/mps/test/function/159.c index 987824dd737..8a926c13c06 100644 --- a/mps/test/function/159.c +++ b/mps/test/function/159.c @@ -14,12 +14,12 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_addr_t a; @@ -48,10 +48,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/16.c b/mps/test/function/16.c index f3088208377..626ba6c4862 100644 --- a/mps/test/function/16.c +++ b/mps/test/function/16.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -46,10 +43,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -104,10 +98,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/160.c b/mps/test/function/160.c index 13659970748..e5f71efe511 100644 --- a/mps/test/function/160.c +++ b/mps/test/function/160.c @@ -14,12 +14,12 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_addr_t a; @@ -55,10 +55,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/161.c b/mps/test/function/161.c index 64724aea4a0..1a2cdb77f15 100644 --- a/mps/test/function/161.c +++ b/mps/test/function/161.c @@ -16,13 +16,12 @@ END_HEADER #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; mps_pool_t pool; @@ -50,10 +49,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/162.c b/mps/test/function/162.c index 7d5179fb659..51ff7b3851c 100644 --- a/mps/test/function/162.c +++ b/mps/test/function/162.c @@ -14,12 +14,12 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_pool_debug_option_s debugOpts = {(void *)"bibblebo", 8}; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_addr_t a; @@ -49,10 +49,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/163.c b/mps/test/function/163.c index 9b735a076fa..2bc303042fd 100644 --- a/mps/test/function/163.c +++ b/mps/test/function/163.c @@ -34,14 +34,14 @@ END_HEADER #define EXTENDBY (8*1024) #define MAXLARGE (10*1024) -void *stackpointer; mps_arena_t arena; static mps_addr_t largeObjects[MAXLARGE], smallObjects[NSMALL]; -static void test(void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; unsigned int i; @@ -97,10 +97,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/164.c b/mps/test/function/164.c index 368bbffd86e..e8b92b1c933 100644 --- a/mps/test/function/164.c +++ b/mps/test/function/164.c @@ -14,7 +14,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; mps_bool_t slotHigh, arenaHigh, firstFit; @@ -146,7 +145,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -175,10 +174,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/165.c b/mps/test/function/165.c index e168197c82c..9d30a21cb76 100644 --- a/mps/test/function/165.c +++ b/mps/test/function/165.c @@ -33,7 +33,7 @@ mps_arena_t arena; mps_addr_t objs[MAXOBJS]; mps_addr_t sizes[MAXOBJS]; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_thr_t thread; @@ -105,7 +105,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/167.c b/mps/test/function/167.c index aeebec198e5..7f6179ff39e 100644 --- a/mps/test/function/167.c +++ b/mps/test/function/167.c @@ -23,7 +23,7 @@ mps_arena_t arena; mps_addr_t objs[MAXOBJS]; mps_addr_t sizes[MAXOBJS]; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolhi, poollo; mps_thr_t thread; @@ -106,7 +106,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/17.c b/mps/test/function/17.c index a8f665d3ab7..30b06d21c4c 100644 --- a/mps/test/function/17.c +++ b/mps/test/function/17.c @@ -19,7 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -58,7 +58,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/170.c b/mps/test/function/170.c index 459af100b02..efb6adf0252 100644 --- a/mps/test/function/170.c +++ b/mps/test/function/170.c @@ -206,7 +206,7 @@ static void t_alloc(int spare, int spare_total, int commit, int obj_size) { mps_pool_destroy(poolhi); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; int spare, spare_total, commit, obj; @@ -240,7 +240,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/171.c b/mps/test/function/171.c index f00de3e87be..4f61b29b0ba 100644 --- a/mps/test/function/171.c +++ b/mps/test/function/171.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; @@ -72,11 +71,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -162,10 +157,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/18.c b/mps/test/function/18.c index b4d749640d8..eba534e2b2b 100644 --- a/mps/test/function/18.c +++ b/mps/test/function/18.c @@ -22,10 +22,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -41,10 +38,7 @@ static void test(void) "create arena"); die(mps_arena_commit_limit_set(arena, 1ul << 30), "commit_limit_set"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); die(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); cdie(mps_pool_create_k(&pool, arena, mps_class_mvff(), mps_args_none), "pool"); @@ -68,10 +62,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/19.c b/mps/test/function/19.c index 9194524d8c2..691dede067b 100644 --- a/mps/test/function/19.c +++ b/mps/test/function/19.c @@ -22,10 +22,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -42,10 +39,7 @@ static void test(void) "create arena"); die(mps_arena_commit_limit_set(arena, 1ul << 30), "commit_limit_set"); die(mps_thread_reg(&thread, arena), "register thread"); - die(mps_root_create_reg(&root, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); die(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); cdie(mps_pool_create_k(&pool, arena, mps_class_mvff(), mps_args_none), "pool"); @@ -68,10 +62,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/2.c b/mps/test/function/2.c index 7c0c6974919..80bf7abd2db 100644 --- a/mps/test/function/2.c +++ b/mps/test/function/2.c @@ -18,9 +18,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -40,11 +38,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -107,9 +101,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); } diff --git a/mps/test/function/20.c b/mps/test/function/20.c index a0280b3f07f..afab78f1295 100644 --- a/mps/test/function/20.c +++ b/mps/test/function/20.c @@ -14,9 +14,8 @@ END_HEADER #include "mpscmvff.h" #include "newfmt.h" -void *stackpointer; - -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_thr_t thread; @@ -29,9 +28,7 @@ static void test(void) { die(mps_arena_create(&arena, mps_arena_class_vm(), mmqaArenaSIZE), "create"); die(mps_arena_commit_limit_set(arena, 1ul << 30), "commit_limit_set"); die(mps_thread_reg(&thread, arena), "register 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_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_pool_create_k(&pool, arena, mps_class_mvff(), mps_args_none), "pool"); while (mps_alloc(&q, pool, 64*1024)==MPS_RES_OK); @@ -48,10 +45,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/200.c b/mps/test/function/200.c index 1a1812a446e..4e33ec5bf5f 100644 --- a/mps/test/function/200.c +++ b/mps/test/function/200.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; static struct {mps_addr_t addr; size_t size;} queue[MAXNUMBER]; @@ -132,7 +131,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -169,10 +168,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/203.c b/mps/test/function/203.c index 360f6ffd8be..10ffb01c223 100644 --- a/mps/test/function/203.c +++ b/mps/test/function/203.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 100000 -void *stackpointer; mps_arena_t arena; static struct {mps_addr_t addr; size_t size;} queue[MAXNUMBER]; @@ -151,7 +150,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -205,10 +204,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/204.c b/mps/test/function/204.c index 73d087c0adf..8e9f6fa6761 100644 --- a/mps/test/function/204.c +++ b/mps/test/function/204.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; static struct {mps_addr_t addr; size_t size;} queue[MAXNUMBER]; @@ -151,7 +150,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -205,10 +204,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/205.c b/mps/test/function/205.c index ff94d098ca2..62780963bb8 100644 --- a/mps/test/function/205.c +++ b/mps/test/function/205.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; static struct {mps_addr_t addr; size_t size;} queue[MAXNUMBER]; @@ -151,7 +150,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -205,10 +204,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/206.c b/mps/test/function/206.c index f9a40cf7f1d..f61ae72b79c 100644 --- a/mps/test/function/206.c +++ b/mps/test/function/206.c @@ -15,7 +15,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; mps_bool_t slotHigh, arenaHigh, firstFit; @@ -135,7 +134,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; size_t avgSize; @@ -165,10 +164,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/207.c b/mps/test/function/207.c index c68ac5757af..4013cf6bb78 100644 --- a/mps/test/function/207.c +++ b/mps/test/function/207.c @@ -14,7 +14,6 @@ END_HEADER #define MAXNUMBER 1000000 -void *stackpointer; mps_arena_t arena; mps_bool_t slotHigh, arenaHigh, firstFit; @@ -146,7 +145,7 @@ static void dt(int kind, mins, maxs, number, iter, secs); } -static void test(void) +static void test(void *stack_pointer) { mps_thr_t thread; unsigned long mins; @@ -175,10 +174,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/21.c b/mps/test/function/21.c index dee84e417f3..8569dc1d4a1 100644 --- a/mps/test/function/21.c +++ b/mps/test/function/21.c @@ -11,7 +11,8 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_addr_t q; @@ -32,7 +33,7 @@ static void test(void) { } int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/214.c b/mps/test/function/214.c index 018722786ca..08db7f9e9df 100644 --- a/mps/test/function/214.c +++ b/mps/test/function/214.c @@ -12,7 +12,6 @@ END_HEADER #include "mpscmvt.h" #include "mpsavm.h" -void *stackpointer; mps_arena_t arena; static mps_addr_t objs[OBJECTS]; @@ -30,7 +29,8 @@ static mps_res_t mvt_alloc(mps_addr_t *ref, mps_ap_t ap, size_t size) { return MPS_RES_OK; } -static void test (void) { +static void test(void *stack_pointer) +{ mps_thr_t thread; mps_pool_t pool; mps_ap_t ap; @@ -65,10 +65,7 @@ static void test (void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/215.c b/mps/test/function/215.c index 52754ab0a11..b15312ce105 100644 --- a/mps/test/function/215.c +++ b/mps/test/function/215.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; mps_message_t message; @@ -73,11 +72,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -175,10 +170,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/22.c b/mps/test/function/22.c index 3b2ce66f291..e266e6d7b4c 100644 --- a/mps/test/function/22.c +++ b/mps/test/function/22.c @@ -11,7 +11,8 @@ END_HEADER #include "testlib.h" #include "mpscmvff.h" -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_addr_t q, r; @@ -34,7 +35,7 @@ static void test(void) { } int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/223.c b/mps/test/function/223.c index ddb88115d0d..ab0de19af7d 100644 --- a/mps/test/function/223.c +++ b/mps/test/function/223.c @@ -35,8 +35,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; mps_pool_t poolamc; mps_thr_t thread; @@ -58,7 +56,8 @@ static void alloc_back(void) { } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; mps_message_t message; @@ -73,11 +72,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_exact(), 0, &objtab[0], TABSIZE), "create root table"); @@ -174,10 +169,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/224.c b/mps/test/function/224.c index 1e52e07c5da..fd7a268ba32 100644 --- a/mps/test/function/224.c +++ b/mps/test/function/224.c @@ -17,7 +17,7 @@ END_HEADER #define VMSIZE ((size_t) 30*1024*1024) -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,7 +43,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/226.c b/mps/test/function/226.c index 076e4ceb9ea..9031e6c3277 100644 --- a/mps/test/function/226.c +++ b/mps/test/function/226.c @@ -21,8 +21,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; static mycell *obj_table[MAXLDS]; static mycell *addr_table[MAXLDS]; @@ -70,7 +68,8 @@ static void blat(mps_ap_t apamc, unsigned percent) { } } -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t poolmvff, poolawl, poolamc; mps_thr_t thread; mps_root_t root0, root1, root2; @@ -101,11 +100,7 @@ static void test(void) { mps_root_create_table(&root2, arena, mps_rank_exact(), 0, (mps_addr_t *)obj_table, MAXLDS), "create table root"); - cdie( - mps_root_create_reg(&root1, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create register and stack root"); - cdie( + cdie(mps_root_create_thread(&root1, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie( @@ -200,10 +195,7 @@ static void test(void) { } int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/227.c b/mps/test/function/227.c index 35fe35b3d02..7de43c39ea0 100644 --- a/mps/test/function/227.c +++ b/mps/test/function/227.c @@ -34,8 +34,6 @@ END_HEADER #define COLLECT_WORLD */ -void *stackpointer; - mps_arena_t arena1, arena2; mps_pool_t poolamc1, poolamc2; mps_thr_t thread1, thread2; @@ -56,7 +54,8 @@ static void alloc_back(void) { } } -static void test(void) { +static void test(void *stack_pointer) +{ long int i; long int rsize = 0; @@ -72,15 +71,7 @@ static void test(void) { cdie(mps_thread_reg(&thread1, arena1), "register thread"); cdie(mps_thread_reg(&thread2, arena2), "register thread"); - cdie( - mps_root_create_reg(&root1, arena1, mps_rank_ambig(), 0, thread1, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - cdie( - mps_root_create_reg(&root2, arena2, mps_rank_ambig(), 0, thread2, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root1, arena1, thread1, stack_pointer), "thread root"); cdie(mps_root_create_thread(&root2, arena2, thread2, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1a, arena1, mps_rank_exact(), 0, &objtab1[0], TABSIZE), "create root table"); @@ -198,10 +189,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); report("result", "pass"); return 0; } diff --git a/mps/test/function/228.c b/mps/test/function/228.c index baa69a7cd7e..d1b80978d3c 100644 --- a/mps/test/function/228.c +++ b/mps/test/function/228.c @@ -15,7 +15,7 @@ END_HEADER #include "mpscmvff.h" #include "mpsavm.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -35,7 +35,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/229.c b/mps/test/function/229.c index 19ca63d5342..dcc97e8be4c 100644 --- a/mps/test/function/229.c +++ b/mps/test/function/229.c @@ -40,7 +40,7 @@ static void xfree(void *p) } } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; size_t i, j; @@ -68,7 +68,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/23.c b/mps/test/function/23.c index 58559c20d09..3bf7cbfbf83 100644 --- a/mps/test/function/23.c +++ b/mps/test/function/23.c @@ -28,10 +28,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolMVFF, poolAMC; @@ -134,10 +131,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/231.c b/mps/test/function/231.c index c8c29fa44e2..399e9529d17 100644 --- a/mps/test/function/231.c +++ b/mps/test/function/231.c @@ -14,7 +14,7 @@ END_HEADER #include "testlib.h" #include "newfmt.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -34,7 +34,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/232.c b/mps/test/function/232.c index ff16289fc1b..c1826598887 100644 --- a/mps/test/function/232.c +++ b/mps/test/function/232.c @@ -18,7 +18,7 @@ static void check_chunks(mps_arena_t arena, unsigned expected) asserts(chunks == expected, "expected %u chunks, got %u", expected, chunks); } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -53,7 +53,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/233.c b/mps/test/function/233.c index e0fb4296910..5d2a2645c24 100644 --- a/mps/test/function/233.c +++ b/mps/test/function/233.c @@ -11,7 +11,7 @@ END_HEADER #include "mpscmfs.h" #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { size_t i; for (i = 0; i < 20; ++i) { @@ -41,7 +41,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/234.c b/mps/test/function/234.c index 7d160aaef1e..a7468e3dbaa 100644 --- a/mps/test/function/234.c +++ b/mps/test/function/234.c @@ -15,9 +15,7 @@ END_HEADER #include "rankfmt.h" #include "testlib.h" -static void *stackpointer; - -static void test_pool(mps_pool_class_t pool_class) +static void test_pool(void *stack_pointer, mps_pool_class_t pool_class) { mps_arena_t arena; mps_pool_t pool; @@ -30,7 +28,7 @@ static void test_pool(mps_pool_class_t pool_class) cdie(mps_arena_create_k(&arena, mps_arena_class_vm(), mps_args_none), "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_root_create_thread(&root, arena, thread, stackpointer), + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "create thread"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); MPS_ARGS_BEGIN(args) { @@ -61,19 +59,17 @@ static void test_pool(mps_pool_class_t pool_class) mps_arena_destroy(arena); } -static void test(void) +static void test(void *stack_pointer) { - test_pool(mps_class_amc()); - test_pool(mps_class_ams()); - test_pool(mps_class_awl()); - test_pool(mps_class_lo()); + test_pool(stack_pointer, mps_class_amc()); + test_pool(stack_pointer, mps_class_ams()); + test_pool(stack_pointer, mps_class_awl()); + test_pool(stack_pointer, mps_class_lo()); } int main(void) { - void *m; - stackpointer = &m; /* hack to get stack pointer */ - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/235.c b/mps/test/function/235.c index 00ac1fbaa94..740297ab249 100644 --- a/mps/test/function/235.c +++ b/mps/test/function/235.c @@ -12,7 +12,7 @@ END_HEADER #include "mpscmvff.h" #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -70,7 +70,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/24.c b/mps/test/function/24.c index 920d85862be..ebb33e59913 100644 --- a/mps/test/function/24.c +++ b/mps/test/function/24.c @@ -17,8 +17,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - static mps_res_t myscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit) { comment("Scan: %p", base); @@ -59,7 +57,7 @@ struct mps_fmt_A_s fmtA = }; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -78,11 +76,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -120,10 +114,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/25.c b/mps/test/function/25.c index f6450b95153..a340e14b346 100644 --- a/mps/test/function/25.c +++ b/mps/test/function/25.c @@ -14,7 +14,6 @@ END_HEADER #include -void *stackpointer; mps_ap_t ap; @@ -49,7 +48,8 @@ static locell *conc(locell *x, locell *y) { } -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_thr_t thread; @@ -67,11 +67,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtLO), "create format"); @@ -116,10 +112,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/26.c b/mps/test/function/26.c index 5bfba0b6678..0998eda99dd 100644 --- a/mps/test/function/26.c +++ b/mps/test/function/26.c @@ -31,7 +31,8 @@ static mps_res_t trysize(size_t try) { return res; } -static void test(void) { +static void test(void *stack_pointer) +{ size_t inf, sup, try; die(mps_arena_create(&arena, mps_arena_class_vm(), mmqaArenaSIZE), "create"); @@ -55,7 +56,7 @@ static void test(void) { } int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/27.c b/mps/test/function/27.c index 2f30b1a81c6..ede37f50ff7 100644 --- a/mps/test/function/27.c +++ b/mps/test/function/27.c @@ -19,14 +19,12 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_ap_t ap; size_t s; int nrefs; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -84,10 +79,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/28.c b/mps/test/function/28.c index 5cbf8e803f4..48e84050061 100644 --- a/mps/test/function/28.c +++ b/mps/test/function/28.c @@ -18,10 +18,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,10 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -110,10 +104,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/29.c b/mps/test/function/29.c index 94ef6007d02..4b58c17234c 100644 --- a/mps/test/function/29.c +++ b/mps/test/function/29.c @@ -13,7 +13,6 @@ END_HEADER #include "lofmt.h" #include -void *stackpointer; mps_ap_t ap; @@ -48,7 +47,8 @@ static locell *conc(locell *x, locell *y) { } -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t pool; mps_thr_t thread; @@ -66,11 +66,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtLO), "create format"); @@ -116,10 +112,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/3.c b/mps/test/function/3.c index 02400bd0e77..a1f59e38046 100644 --- a/mps/test/function/3.c +++ b/mps/test/function/3.c @@ -22,9 +22,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -44,11 +42,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -107,9 +101,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/function/30.c b/mps/test/function/30.c index 416c41323ff..a84450a3194 100644 --- a/mps/test/function/30.c +++ b/mps/test/function/30.c @@ -14,10 +14,7 @@ END_HEADER #include "mpsavm.h" -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -38,10 +35,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); die(mps_pool_create(&pool, arena, mps_class_awl(), format, getassociated), @@ -99,10 +93,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/31.c b/mps/test/function/31.c index 29be49f6671..d7a62579b00 100644 --- a/mps/test/function/31.c +++ b/mps/test/function/31.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -48,10 +45,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -103,10 +97,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/32.c b/mps/test/function/32.c index 64f0253dcf7..04b34a0a9ef 100644 --- a/mps/test/function/32.c +++ b/mps/test/function/32.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -46,10 +43,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -99,10 +93,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/33.c b/mps/test/function/33.c index 361736b06b6..067e78ca044 100644 --- a/mps/test/function/33.c +++ b/mps/test/function/33.c @@ -19,10 +19,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -98,10 +92,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/34.c b/mps/test/function/34.c index 56a8b391659..489cfb0b3e5 100644 --- a/mps/test/function/34.c +++ b/mps/test/function/34.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -47,10 +44,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -101,10 +95,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/35.c b/mps/test/function/35.c index 1e441c5ec58..51749214b60 100644 --- a/mps/test/function/35.c +++ b/mps/test/function/35.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -122,10 +119,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/36.c b/mps/test/function/36.c index c3f0de5961e..ccf0029ec5f 100644 --- a/mps/test/function/36.c +++ b/mps/test/function/36.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -102,10 +96,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/37.c b/mps/test/function/37.c index 664e9a3dd68..32f17a32558 100644 --- a/mps/test/function/37.c +++ b/mps/test/function/37.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -124,10 +121,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/38.c b/mps/test/function/38.c index 4c8b994c31f..64120805ad2 100644 --- a/mps/test/function/38.c +++ b/mps/test/function/38.c @@ -24,8 +24,6 @@ static mps_gen_param_s testChain[genCOUNT] = { #define MAXLDS 100 -void *stackpointer; - mps_arena_t arena; static mycell *obj_table[MAXLDS]; static mps_ld_t lds[MAXLDS]; @@ -50,7 +48,7 @@ static void checklds(void) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolmvff, poolawl, poolamc; mps_thr_t thread; @@ -79,10 +77,7 @@ static void test(void) (mps_addr_t *)obj_table, MAXLDS), "create table root"); - cdie(mps_root_create_reg(&root1, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create register and stack root"); - + cdie(mps_root_create_thread(&root1, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -175,10 +170,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/39.c b/mps/test/function/39.c index 54b0c2ee383..8b0b4bd03d6 100644 --- a/mps/test/function/39.c +++ b/mps/test/function/39.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -48,10 +45,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -106,10 +100,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/4.c b/mps/test/function/4.c index e730bc77ff3..21b4d6d8790 100644 --- a/mps/test/function/4.c +++ b/mps/test/function/4.c @@ -24,9 +24,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -47,11 +45,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -119,9 +113,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/function/40.c b/mps/test/function/40.c index de0e4dbe462..d41fe21e7dc 100644 --- a/mps/test/function/40.c +++ b/mps/test/function/40.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -91,10 +88,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/41.c b/mps/test/function/41.c index 98ef3a51d46..680c5b92faf 100644 --- a/mps/test/function/41.c +++ b/mps/test/function/41.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -47,10 +44,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -75,7 +69,7 @@ static void test(void) comment("%i of 10.", j); UC; a = allocone(apawl, 5, 1); - a->data.assoc = stackpointer; + a->data.assoc = stack_pointer; setref(b, 0, a); b = a; c = a; @@ -88,7 +82,7 @@ static void test(void) UC; c = allocone(apamc, 1000, 1); c = allocone(apawl, 1000, 1); - c->data.assoc = stackpointer; + c->data.assoc = stack_pointer; if (ranint(8) == 0) d = c; if (ranint(8) == 0) e = c; if (ranint(8) == 0) f = c; @@ -126,10 +120,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/42.c b/mps/test/function/42.c index 85810297675..dcad2bd9cb2 100644 --- a/mps/test/function/42.c +++ b/mps/test/function/42.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -122,10 +116,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/43.c b/mps/test/function/43.c index 106b7b7e10f..c34e6025790 100644 --- a/mps/test/function/43.c +++ b/mps/test/function/43.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -133,10 +127,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/44.c b/mps/test/function/44.c index e99717e0230..b215c62de0b 100644 --- a/mps/test/function/44.c +++ b/mps/test/function/44.c @@ -25,10 +25,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -53,10 +50,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, &exfmt_root, 1), "create exfmt root"); @@ -183,10 +177,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/45.c b/mps/test/function/45.c index 8001b47f362..c13ede7219a 100644 --- a/mps/test/function/45.c +++ b/mps/test/function/45.c @@ -28,8 +28,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_ap_t ap[NAPS]; mycell *p[NAPS]; size_t s[NAPS]; @@ -37,7 +35,7 @@ int nrefs[NAPS]; int ap_state[NAPS]; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -69,10 +67,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -203,10 +198,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/46.c b/mps/test/function/46.c index 715ba899090..1a8b2cdcca3 100644 --- a/mps/test/function/46.c +++ b/mps/test/function/46.c @@ -18,7 +18,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; long int appcount; long int apppadcount; @@ -36,7 +35,7 @@ static void test_apply(mps_addr_t addr, void *V, size_t S) { } } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc; @@ -58,11 +57,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, &exfmt_root, 1), "create exfmt root"); @@ -166,10 +161,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/47.c b/mps/test/function/47.c index d7b0822448d..5e20fe7d2ae 100644 --- a/mps/test/function/47.c +++ b/mps/test/function/47.c @@ -17,10 +17,8 @@ END_HEADER #define MAXLDS 100 -void *stackpointer; - - -static void test(void) { +static void test(void *stack_pointer) +{ mps_arena_t arena; mps_pool_t poolmvff, poolawl; mps_thr_t thread; @@ -44,10 +42,7 @@ static void test(void) { (mps_addr_t *)&exfmt_root, 1), "create exfmt root"); - cdie(mps_root_create_reg(&root1, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create register and stack root"); - + cdie(mps_root_create_thread(&root1, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -112,10 +107,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/48.c b/mps/test/function/48.c index cdc1c66737f..cac91292ec2 100644 --- a/mps/test/function/48.c +++ b/mps/test/function/48.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -132,10 +126,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/49.c b/mps/test/function/49.c index b7db41d475d..ffdbc5778f8 100644 --- a/mps/test/function/49.c +++ b/mps/test/function/49.c @@ -22,8 +22,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -121,7 +119,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -139,10 +137,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -294,10 +289,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/5.c b/mps/test/function/5.c index 7a91636ee30..2250626a802 100644 --- a/mps/test/function/5.c +++ b/mps/test/function/5.c @@ -20,9 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,11 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -106,10 +100,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/50.c b/mps/test/function/50.c index 741f865eb98..6d12449b592 100644 --- a/mps/test/function/50.c +++ b/mps/test/function/50.c @@ -25,8 +25,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -124,7 +122,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -142,10 +140,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -298,10 +293,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/51.c b/mps/test/function/51.c index bdf1a87ad70..3eda038c38a 100644 --- a/mps/test/function/51.c +++ b/mps/test/function/51.c @@ -26,8 +26,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; @@ -93,7 +91,7 @@ static void finalpoll(mycell **ref, int faction) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolamcz, poolams, poolawl, poollo; mps_thr_t thread; @@ -111,10 +109,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -244,10 +239,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/52.c b/mps/test/function/52.c index d0c757a3059..3f847ddadf5 100644 --- a/mps/test/function/52.c +++ b/mps/test/function/52.c @@ -23,10 +23,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -102,10 +99,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/53.c b/mps/test/function/53.c index 6012a05befc..8bb5d4554bd 100644 --- a/mps/test/function/53.c +++ b/mps/test/function/53.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -121,10 +115,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/54.c b/mps/test/function/54.c index f2c712ac15a..f4eb16bbce0 100644 --- a/mps/test/function/54.c +++ b/mps/test/function/54.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -46,10 +43,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -121,10 +115,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/55.c b/mps/test/function/55.c index a5a4d3e5f07..a37f49d3f8c 100644 --- a/mps/test/function/55.c +++ b/mps/test/function/55.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -46,10 +43,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -121,10 +115,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/56.c b/mps/test/function/56.c index 697b2e04b6c..dbe4a616c0b 100644 --- a/mps/test/function/56.c +++ b/mps/test/function/56.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -118,10 +112,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/57.c b/mps/test/function/57.c index dbaab342bd9..74f095791c1 100644 --- a/mps/test/function/57.c +++ b/mps/test/function/57.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -114,10 +108,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/6.c b/mps/test/function/6.c index bbbe1217b3e..d399f20ca8a 100644 --- a/mps/test/function/6.c +++ b/mps/test/function/6.c @@ -19,9 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -94,10 +89,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/60.c b/mps/test/function/60.c index 25eb6da8118..3b850fb5c92 100644 --- a/mps/test/function/60.c +++ b/mps/test/function/60.c @@ -17,9 +17,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc1, poolawl2; @@ -41,11 +39,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -113,10 +107,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/61.c b/mps/test/function/61.c index 37b66fa5ea3..33df8098026 100644 --- a/mps/test/function/61.c +++ b/mps/test/function/61.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc1, poolamc2; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -96,10 +90,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/62.c b/mps/test/function/62.c index 1ea9ff432b3..4624376a3bd 100644 --- a/mps/test/function/62.c +++ b/mps/test/function/62.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc1, poolamc2; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -95,10 +89,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/63.c b/mps/test/function/63.c index 1e9b63693e3..af12b6dc29c 100644 --- a/mps/test/function/63.c +++ b/mps/test/function/63.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc1; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -87,10 +81,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/64.c b/mps/test/function/64.c index 390567b7117..7c17c0144a6 100644 --- a/mps/test/function/64.c +++ b/mps/test/function/64.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); @@ -120,10 +114,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/65.c b/mps/test/function/65.c index 3305d96cd72..62faa09c8d3 100644 --- a/mps/test/function/65.c +++ b/mps/test/function/65.c @@ -23,7 +23,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; long int appcount; long int apppadcount; long int cutoff_id; @@ -51,7 +50,7 @@ static void test_apply(mps_addr_t addr, void *V, size_t S) } -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc; @@ -203,10 +202,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/66.c b/mps/test/function/66.c index 46902f8397c..546b02dfcf2 100644 --- a/mps/test/function/66.c +++ b/mps/test/function/66.c @@ -20,8 +20,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; static mycell *obj_table[MAXLDS]; static mps_ld_t lds[MAXLDS]; @@ -43,7 +41,8 @@ static void checklds(void) { } } -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t poolmvff, poolawl, poolamc; mps_thr_t thread; mps_root_t root0, root1, root2; @@ -76,11 +75,7 @@ static void test(void) { (mps_addr_t *)obj_table, MAXLDS), "create table root"); - cdie( - mps_root_create_reg(&root1, arena, mps_rank_ambig(), 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create register and stack root"); - + cdie(mps_root_create_thread(&root1, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -185,10 +180,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/67.c b/mps/test/function/67.c index dbb19b7bed8..c9b3e9dc08f 100644 --- a/mps/test/function/67.c +++ b/mps/test/function/67.c @@ -26,10 +26,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -115,10 +112,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/68.c b/mps/test/function/68.c index f33cdded728..748c28bf1cd 100644 --- a/mps/test/function/68.c +++ b/mps/test/function/68.c @@ -17,9 +17,7 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc; @@ -44,11 +42,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, &exfmt_root, 1), "create exfmt root"); @@ -110,9 +104,6 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/function/69.c b/mps/test/function/69.c index 23d151b01aa..cb97ce044b9 100644 --- a/mps/test/function/69.c +++ b/mps/test/function/69.c @@ -19,12 +19,11 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t pool; mps_root_t rootA, rootB; @@ -108,10 +107,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/7.c b/mps/test/function/7.c index 583ca3e6f4b..96830ed7764 100644 --- a/mps/test/function/7.c +++ b/mps/test/function/7.c @@ -10,7 +10,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_arena_t arena1; @@ -29,7 +29,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/70.c b/mps/test/function/70.c index e6a15216860..f47f9b5cf37 100644 --- a/mps/test/function/70.c +++ b/mps/test/function/70.c @@ -10,7 +10,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -31,7 +31,7 @@ int main(void) { comment("Started"); mmqa_pause(10); - easy_tramp(test); + run_test(test); comment("Left trampoline"); mmqa_pause(10); pass(); diff --git a/mps/test/function/71.c b/mps/test/function/71.c index 4c206f7000c..f28954902a1 100644 --- a/mps/test/function/71.c +++ b/mps/test/function/71.c @@ -9,7 +9,7 @@ END_HEADER #include "testlib.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; @@ -27,7 +27,7 @@ static void test(void) int main(void) { - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/72.c b/mps/test/function/72.c index c1d3c158f2d..1d39d0ec831 100644 --- a/mps/test/function/72.c +++ b/mps/test/function/72.c @@ -15,14 +15,12 @@ END_HEADER #include "mpscamc.h" #include "exfmt.h" -void *stackpointer; - #define genCOUNT (3) static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -106,10 +104,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/73.c b/mps/test/function/73.c index 9d97209060f..84f4bd40ddf 100644 --- a/mps/test/function/73.c +++ b/mps/test/function/73.c @@ -13,12 +13,11 @@ END_HEADER #include "mpsavm.h" -void *stackpointer; - mps_arena_t arena; -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t poolawl; mps_thr_t thread; mps_root_t root0, root1; @@ -33,10 +32,7 @@ static void test(void) { cdie(mps_thread_reg(&thread, arena), "register 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_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -83,10 +79,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/74.c b/mps/test/function/74.c index b92295fa3e7..9811ac97f01 100644 --- a/mps/test/function/74.c +++ b/mps/test/function/74.c @@ -13,12 +13,11 @@ END_HEADER #include "mpsavm.h" -void *stackpointer; - mps_arena_t arena; -static void test(void) { +static void test(void *stack_pointer) +{ mps_pool_t poollo; mps_thr_t thread; mps_root_t root0, root1; @@ -33,10 +32,7 @@ static void test(void) { cdie(mps_thread_reg(&thread, arena), "register 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_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -83,10 +79,7 @@ static void test(void) { int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/75.c b/mps/test/function/75.c index 289ebb29417..39559738deb 100644 --- a/mps/test/function/75.c +++ b/mps/test/function/75.c @@ -19,12 +19,10 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc; mps_thr_t thread; @@ -40,10 +38,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t *)&exfmt_root, 1), "create table root"); @@ -86,10 +81,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/76.c b/mps/test/function/76.c index cd0a1875403..1d11511e111 100644 --- a/mps/test/function/76.c +++ b/mps/test/function/76.c @@ -21,14 +21,12 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_arena_t arena; int final_count = 0; -static void test(void) +static void test(void *stack_pointer) { mps_pool_t poolamc, poolawl, poollo; mps_thr_t thread; @@ -46,10 +44,7 @@ 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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root0, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -143,10 +138,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/77.c b/mps/test/function/77.c index ac8cfbbedd0..19973e2ae6f 100644 --- a/mps/test/function/77.c +++ b/mps/test/function/77.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -111,10 +105,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/78.c b/mps/test/function/78.c index 8c53f0035fb..ee7ab96e456 100644 --- a/mps/test/function/78.c +++ b/mps/test/function/78.c @@ -22,10 +22,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poollo; @@ -45,10 +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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -115,10 +109,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/79.c b/mps/test/function/79.c index 78857b4c3be..c8eca9d4c17 100644 --- a/mps/test/function/79.c +++ b/mps/test/function/79.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -111,10 +105,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/8.c b/mps/test/function/8.c index f4ba9c9056b..426e0740b4e 100644 --- a/mps/test/function/8.c +++ b/mps/test/function/8.c @@ -14,7 +14,7 @@ END_HEADER #include "mpsavm.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_res_t res; @@ -42,7 +42,7 @@ static void test(void) int main(void) { if (MPS_WORD_WIDTH <= 32) { - easy_tramp(test); + run_test(test); } else { /* Can't exhaust 64-bit address space by allocating, so fake a pass. */ report("arena", "%d", ARENAS); diff --git a/mps/test/function/80.c b/mps/test/function/80.c index 2d373206f73..a9d6050e8cc 100644 --- a/mps/test/function/80.c +++ b/mps/test/function/80.c @@ -21,10 +21,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolawl; @@ -44,10 +41,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -111,10 +105,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/81.c b/mps/test/function/81.c index 4443612896a..b066694888f 100644 --- a/mps/test/function/81.c +++ b/mps/test/function/81.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -43,10 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie(mps_root_create_table(&root1, arena, mps_rank_ambig(), 0, (mps_addr_t*)&exfmt_root, 1), "create table root"); @@ -93,10 +87,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/83.c b/mps/test/function/83.c index baad036e364..b230c9c0e4f 100644 --- a/mps/test/function/83.c +++ b/mps/test/function/83.c @@ -28,12 +28,10 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_addr_t temp_root; -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool1, pool2; @@ -123,10 +121,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/9.c b/mps/test/function/9.c index 9b9f41b00f7..b22de20a653 100644 --- a/mps/test/function/9.c +++ b/mps/test/function/9.c @@ -19,10 +19,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t pool; @@ -37,11 +34,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_fmt_create_A(&format, arena, &fmtA), "create format"); @@ -69,10 +62,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/96.c b/mps/test/function/96.c index 287e49459dd..dd44b51a381 100644 --- a/mps/test/function/96.c +++ b/mps/test/function/96.c @@ -20,8 +20,6 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - mps_pool_t poolmvff; mps_arena_t arena; @@ -45,7 +43,7 @@ static void empty(void) } -static void test(void) +static void test(void *stack_pointer) { mps_pool_t pool; mps_thr_t thread; @@ -68,10 +66,7 @@ static void test(void) die(mps_thread_reg(&thread, arena), "register 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_thread(&root, arena, thread, stack_pointer), "thread root"); base = &exfmt_root; addr = base; cdie( @@ -139,10 +134,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/97.c b/mps/test/function/97.c index 1ccb6996483..127d86de6f3 100644 --- a/mps/test/function/97.c +++ b/mps/test/function/97.c @@ -41,7 +41,6 @@ END_HEADER static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; long int appcount; long int apppadcount; @@ -107,7 +106,7 @@ static void stepper(mps_addr_t addr, mps_fmt_t fmt, mps_pool_t pool, } } -static void test(void) +static void test(void *stack_pointer) { /* a is a table of exact roots b a table of ambiguous roots @@ -254,10 +253,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/function/98.c b/mps/test/function/98.c index 68704bc3ad5..f4db5c80bd0 100644 --- a/mps/test/function/98.c +++ b/mps/test/function/98.c @@ -13,7 +13,7 @@ END_HEADER #include "testlib.h" #include "mpsavm.h" -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_res_t res; @@ -34,7 +34,7 @@ static void test(void) int main(void) { if (MPS_WORD_WIDTH <= 32) { - easy_tramp(test); + run_test(test); } else { /* Can't exhaust 64-bit address space by allocating, so fake a pass. */ report("arena", "%d", ARENAS); diff --git a/mps/test/function/99.c b/mps/test/function/99.c index c776c17bcc1..8a576a6187b 100644 --- a/mps/test/function/99.c +++ b/mps/test/function/99.c @@ -20,10 +20,7 @@ static mps_gen_param_s testChain[genCOUNT] = { { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; mps_pool_t poolamc, poolamcz; @@ -43,10 +40,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, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); - + cdie(mps_root_create_thread(&root, arena, thread, stack_pointer), "thread root"); cdie( mps_root_create_table(&root1,arena,mps_rank_ambig(),0,&exfmt_root,1), "create table root"); @@ -111,10 +105,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; /* hack to get stack pointer */ - - easy_tramp(test); + run_test(test); pass(); return 0; } diff --git a/mps/test/misc/0.c b/mps/test/misc/0.c index cfd04fd6dcd..91b4cd1ffa6 100644 --- a/mps/test/misc/0.c +++ b/mps/test/misc/0.c @@ -13,9 +13,7 @@ END_HEADER #include "mps.h" #include "testlib.h" -void *stackpointer; - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; int *p; @@ -28,10 +26,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/misc/1.c b/mps/test/misc/1.c index a8477ca1f62..30c6bb2d57d 100644 --- a/mps/test/misc/1.c +++ b/mps/test/misc/1.c @@ -13,10 +13,7 @@ END_HEADER #include "testlib.h" #include "mpsavm.h" -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; int *p; @@ -30,10 +27,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/misc/2.c b/mps/test/misc/2.c index 7686fa9fb24..d49df584c76 100644 --- a/mps/test/misc/2.c +++ b/mps/test/misc/2.c @@ -13,10 +13,7 @@ END_HEADER #include "testlib.h" #include "mpsavm.h" -void *stackpointer; - - -static void test(void) +static void test(void *stack_pointer) { mps_arena_t arena; char *p; @@ -31,10 +28,7 @@ static void test(void) int main(void) { - void *m; - stackpointer=&m; - - easy_tramp(test); + run_test(test); return 0; } diff --git a/mps/test/test/script/version b/mps/test/test/script/version index c2389cae686..f6467b49612 100644 --- a/mps/test/test/script/version +++ b/mps/test/test/script/version @@ -2,7 +2,7 @@ # This file should be updated whenever the test harness changes. # Edit with care! -$HARNESS_VERSION="3.5"; +$HARNESS_VERSION="3.6"; # Version history: # [Recorded history begins with version 2.0] @@ -34,3 +34,4 @@ $HARNESS_VERSION="3.5"; # _succeeds_ # 3.4 -- Added P= (pathname equality) operator # 3.5 -- Platform detection based on uname; Linux and macOS stuff +# 3.6 -- Replace easy_tramp with run_test since MPS no longer needs trampoline. diff --git a/mps/test/test/testlib/testlib.c b/mps/test/test/testlib/testlib.c index 77fc3ab44a4..3ce8a44e371 100644 --- a/mps/test/test/testlib/testlib.c +++ b/mps/test/test/testlib/testlib.c @@ -225,8 +225,7 @@ void asserts(int expr, const char *format, ...) /* routines for easy use of the MPS */ -/* my own assertion handler, insalled by easy_tramp -*/ +/* my own assertion handler, insalled by run_test */ static void mmqa_assert_handler(const char *cond, const char *id, const char *file, unsigned line) @@ -276,65 +275,23 @@ static void mmqa_lib_fail(const char *file, unsigned line, const char *message) mmqa_assert_handler(message, "", file, line); } -/* easy_tramp - simplified trampoline, for those who don't want to - pass anything into or out of it -- it takes - a function with no arguments returning nothing -*/ +/* run_test -- run test case with MMQA assertion handler installed. + * + * The test case takes a pointer to the cold end of the stack and + * returns nothing. + */ -static void *call_f(void *p, size_t s) +void run_test(mmqa_test_function_t test) { - void (**f)(void) = p; + void *stack_pointer = &stack_pointer; #ifdef MMQA_DEFINED_mps_lib_assert_fail_install mps_lib_assert_fail_install(mmqa_lib_fail); #endif - (**f)(); - return NULL; + test(stack_pointer); } - -#if defined(MMQA_PROD_epcore) - -static void easy_tramp2(void (*f)(void)) -{ - call_f(&f, (size_t) 0); -} - -#else - -static void easy_tramp2(void (*f)(void)) -{ - void *result; - - mps_tramp(&result, call_f, &f, (size_t)0); -} - -#endif - - -#ifdef MPS_OS_W3 - -void easy_tramp(void (*f)(void)) -{ - __try { - easy_tramp2(f); - } __except(mySEHFilter(GetExceptionInformation())) { - error("Exception handler messed up."); - } -} - -#else - -void easy_tramp(void (*f)(void)) -{ - easy_tramp2(f); -} - -#endif - - /* mmqa_pause(n) waits for n seconds */ diff --git a/mps/test/test/testlib/testlib.h b/mps/test/test/testlib/testlib.h index 095ad075559..9b4242aaa95 100644 --- a/mps/test/test/testlib/testlib.h +++ b/mps/test/test/testlib/testlib.h @@ -82,12 +82,9 @@ void asserts(int expr, const char *format, ...); void myabort(void); -/* Easy way of entering the trampoline, for when you don't - want to pass any information in or out. If you have a - function void foo(void), just go easy_tramp(foo). -*/ - -void easy_tramp(void (*f)(void)); +/* Run test case with MMQA assertion handler installed. */ +typedef void (*mmqa_test_function_t)(void *stack_pointer); +void run_test(mmqa_test_function_t test); /* Pause for n seconds