# HG changeset patch # User Tatsuki IHA # Date 1517061927 -32400 # Node ID 1566caacdaaeae06a2408354afac225f4e60443f # Parent e5e3025f503a78e88102101cfa2c6ddc04ea9263 Fix bitonicSort diff -r e5e3025f503a -r 1566caacdaae src/parallel_execution/examples/bitonicSort/makeArray.cbc --- a/src/parallel_execution/examples/bitonicSort/makeArray.cbc Sat Jan 27 22:59:38 2018 +0900 +++ b/src/parallel_execution/examples/bitonicSort/makeArray.cbc Sat Jan 27 23:05:27 2018 +0900 @@ -11,19 +11,10 @@ if (output->loopCounter == GET_LEN(output->array)){ printf("created Array\n"); output->loopCounter = 0; - goto output1->start(next(...)); + goto output1->start(next(output1, ...)); } output->array[output->loopCounter].value = rand() % 1000; //printf("%d\n", output->array[output->loopCounter]->value); output->loopCounter++; goto makeArray(); } - -__code makeArray_stub(struct Context* context) { - SortArray** O_output = (struct SortArray**)&context->data[context->odg]; - Timer** O_output1 = (struct Timer**)&context->data[context->odg+1]; - goto makeArray(context, - context->next, - O_output, - O_output1); -} diff -r e5e3025f503a -r 1566caacdaae src/parallel_execution/examples/bitonicSort/printArray.cbc --- a/src/parallel_execution/examples/bitonicSort/printArray.cbc Sat Jan 27 22:59:38 2018 +0900 +++ b/src/parallel_execution/examples/bitonicSort/printArray.cbc Sat Jan 27 23:05:27 2018 +0900 @@ -16,7 +16,7 @@ } if (inputArray->array[inputArray->loopCounter-1].value > inputArray->array[inputArray->loopCounter].value) { printf("wrong result\n"); - goto meta(context, next); + goto next(...); } goto printArray1(); } diff -r e5e3025f503a -r 1566caacdaae src/parallel_execution/examples/twice/createArray.cbc --- a/src/parallel_execution/examples/twice/createArray.cbc Sat Jan 27 22:59:38 2018 +0900 +++ b/src/parallel_execution/examples/twice/createArray.cbc Sat Jan 27 23:05:27 2018 +0900 @@ -14,8 +14,6 @@ if (i == GET_LEN(output->array)){ printf("created Array\n"); loopCounter->i = 0; - *O_output = output; - *O_output1 = output1; goto output1->start(next(output, output1, ...)); } output->array[i] = i;