diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2018-04-17 17:03:52 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2018-04-17 17:03:52 +0200 |
| commit | b63085295d8495ff640f5eaff8b8ad52fc5c43d1 (patch) | |
| tree | fb854f158307f9a5185e92959e63df470566d538 /test/mppa | |
| parent | b17acc2e5f9c31a93164897c64c698fe8e490765 (diff) | |
| download | compcert-kvx-b63085295d8495ff640f5eaff8b8ad52fc5c43d1.tar.gz compcert-kvx-b63085295d8495ff640f5eaff8b8ad52fc5c43d1.zip | |
MPPA - More shifts
Diffstat (limited to 'test/mppa')
| -rw-r--r-- | test/mppa/sort/merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/mppa/sort/merge.c b/test/mppa/sort/merge.c index 63f662ac..b2d41ce3 100644 --- a/test/mppa/sort/merge.c +++ b/test/mppa/sort/merge.c @@ -13,7 +13,7 @@ int min(int a, int b){ return (a < b)?a:b; } -void BottomUpMerge(const uint64_t *A, int iLeft, int iRight, int iEnd, int64_t *B) +void BottomUpMerge(const uint64_t *A, int iLeft, int iRight, int iEnd, uint64_t *B) { int i = iLeft, j = iRight; for (int k = iLeft; k < iEnd; k++) { @@ -59,6 +59,8 @@ int merge_sort(uint64_t *res, const uint64_t *T){ A[i] = T[i]; BottomUpMergeSort(A, B); + + return 0; } #ifdef __UNIT_TEST_MERGE__ |