Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 99d3123e7ab9ecf412fde9af4e2b084aac7c5dc1) +++ uspace/lib/c/Makefile (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -76,4 +76,5 @@ generic/errno.c \ generic/gsort.c \ + generic/inttypes.c \ generic/loc.c \ generic/mem.c \ @@ -197,4 +198,5 @@ test/main.c \ test/mem.c \ + test/inttypes.c \ test/io/table.c \ test/stdio/scanf.c \ Index: uspace/lib/c/generic/inttypes.c =================================================================== --- uspace/lib/c/generic/inttypes.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) +++ uspace/lib/c/generic/inttypes.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2018 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include + +/** Compute the absolute value of an intmax_t. + * + * If the result cannot be represented, the behavior is undefined. + * + * @param j Greatest-width integer + * @return The absolute value of @a j + */ +intmax_t imaxabs(intmax_t j) +{ + intmax_t aj; + + if (j < 0) { + aj = -j; + assert(aj >= 0); + } else { + aj = j; + } + + return aj; +} + +/** Compute quotient and remainder of greatest-width integer division. + * + * @param numer Numerator + * @param denom Denominator + * @return Structure containing quotient and remainder + */ +imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom) +{ + imaxdiv_t d; + + d.quot = numer / denom; + d.rem = numer % denom; + + return d; +} + +/** @} + */ Index: uspace/lib/c/include/inttypes.h =================================================================== --- uspace/lib/c/include/inttypes.h (revision 99d3123e7ab9ecf412fde9af4e2b084aac7c5dc1) +++ uspace/lib/c/include/inttypes.h (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -43,4 +43,6 @@ #ifndef __HELENOS_DISABLE_INTMAX__ +intmax_t imaxabs(intmax_t); +imaxdiv_t imaxdiv(intmax_t, intmax_t); intmax_t strtoimax(const char *__restrict__ nptr, char **__restrict__ endptr, int base); Index: uspace/lib/c/test/inttypes.c =================================================================== --- uspace/lib/c/test/inttypes.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) +++ uspace/lib/c/test/inttypes.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2018 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + * @brief Test greatest-width integer types + */ + +#include +#include + +PCUT_INIT; + +PCUT_TEST_SUITE(inttypes); + +PCUT_TEST(decls) +{ + /* Make sure intmax_t is defined */ + intmax_t i; + (void) i; + + /* Make sure imaxdiv_t is defined */ + imaxdiv_t d; + (void) d; +} + +/** llabs function of positive number */ +PCUT_TEST(imaxabs_pos) +{ + intmax_t i; + + i = imaxabs(1); + PCUT_ASSERT_TRUE(i == 1); +} + +/** llabs function of negative number */ +PCUT_TEST(imaxabs_neg) +{ + intmax_t i; + + i = imaxabs(-1); + PCUT_ASSERT_TRUE(i == 1); +} + +/** Greatest-width integer division */ +PCUT_TEST(imaxdiv) +{ + imaxdiv_t d; + + d = imaxdiv(41, 7); + PCUT_ASSERT_INT_EQUALS(5, d.quot); + PCUT_ASSERT_INT_EQUALS(6, d.rem); +} + +PCUT_EXPORT(inttypes); Index: uspace/lib/c/test/main.c =================================================================== --- uspace/lib/c/test/main.c (revision 99d3123e7ab9ecf412fde9af4e2b084aac7c5dc1) +++ uspace/lib/c/test/main.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -34,4 +34,5 @@ PCUT_IMPORT(circ_buf); PCUT_IMPORT(fibril_timer); +PCUT_IMPORT(inttypes); PCUT_IMPORT(mem); PCUT_IMPORT(odict); Index: uspace/lib/c/test/stdlib.c =================================================================== --- uspace/lib/c/test/stdlib.c (revision 99d3123e7ab9ecf412fde9af4e2b084aac7c5dc1) +++ uspace/lib/c/test/stdlib.c (revision 9912f492e2fb139a10c05399ed342a71bef48acf) @@ -32,5 +32,5 @@ /** * @file - * @brief Test formatted input (scanf family) + * @brief Test General utilities (stdlib.h) */