lib: stdio/qsort: Refactor, fixes GCC-4.6.4.
* lib/stdlib/qsort.c (qswap): Refactor. (qpart): Add "lo" parametor, use "hi" instead of count. Refactor. (qsort): Move to... (_qsort): ...this, and refactor. (qsort): New function.
This commit is contained in:
parent
7b3d0c7aa6
commit
16282f8ecd
|
@ -19,62 +19,62 @@
|
||||||
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
|
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdlib.h>
|
/* See: https://en.wikipedia.org/wiki/Quicksort */
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
void
|
#include <stdlib.h>
|
||||||
qswap (void *a, void *b, size_t size)
|
|
||||||
|
static void
|
||||||
|
qswap (char *a, char *b, size_t size)
|
||||||
{
|
{
|
||||||
char *pa = a;
|
while (size-- > 0)
|
||||||
char *pb = b;
|
{
|
||||||
do
|
char tmp = *a;
|
||||||
{
|
*a++ = *b;
|
||||||
char tmp = *pa;
|
*b++ = tmp;
|
||||||
*pa++ = *pb;
|
}
|
||||||
*pb++ = tmp;
|
|
||||||
} while (--size > 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
static size_t
|
||||||
qpart (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
|
qpart (char *base, size_t lo, size_t hi, size_t size,
|
||||||
|
int (*compare) (void const *, void const *))
|
||||||
{
|
{
|
||||||
void *p = base + count * size;
|
char *pivot = base + hi * size;
|
||||||
size_t i = 0;
|
size_t i = lo;
|
||||||
for (size_t j = 0; j < count; j++)
|
|
||||||
|
for (size_t j = lo; j < hi; j++)
|
||||||
{
|
{
|
||||||
int c = compare (base + j * size, p);
|
char *pj = base + j * size;
|
||||||
if (c < 0)
|
if (pj != pivot && compare (pj, pivot) < 0)
|
||||||
{
|
{
|
||||||
#if 1 //__x86_64__
|
void *pi = base + i * size;
|
||||||
qswap (base + i * size, base + j * size, size);
|
qswap (pi, pj, size);
|
||||||
#else
|
|
||||||
int p1 = base + i * size;
|
|
||||||
int p2 = base + j * size;
|
|
||||||
qswap (p1, p2, size);
|
|
||||||
#endif
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
else if (c == 0)
|
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
if (compare (base + count * size, base + i * size) < 0)
|
|
||||||
qswap (base + i * size, base + count * size, size);
|
char *pi = base + i * size;
|
||||||
|
qswap (pi, pivot, size);
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
qsort (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
|
_qsort (void *base, size_t lo, size_t hi, size_t size,
|
||||||
|
int (*compare) (void const *, void const *))
|
||||||
{
|
{
|
||||||
if (count > 1)
|
if (lo >= hi)
|
||||||
{
|
return;
|
||||||
int p = qpart (base, count - 1, size, compare);
|
size_t pi = qpart (base, lo, hi, size, compare);
|
||||||
qsort (base, p, size, compare);
|
if (pi > 0)
|
||||||
#if 1 //__x86_64__
|
_qsort (base, lo, pi - 1, size, compare);
|
||||||
qsort (base + p * size, count - p, size, compare);
|
_qsort (base, pi + 1, hi, size, compare);
|
||||||
#else
|
}
|
||||||
int p1 = base + p * size;
|
|
||||||
int p2 = count - p;
|
void
|
||||||
qsort (p1, p2, size, compare);
|
qsort (void *base, size_t count, size_t size,
|
||||||
#endif
|
int (*compare) (void const *, void const *))
|
||||||
}
|
{
|
||||||
|
if (count <= 1)
|
||||||
|
return;
|
||||||
|
_qsort (base, 0, count - 1, size, compare);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue