diff options
author | Willy Tarreau <w@1wt.eu> | 2022-02-07 17:23:37 +0100 |
---|---|---|
committer | Paul E. McKenney <paulmck@kernel.org> | 2022-04-21 02:05:44 +0200 |
commit | ac90226d53051c1ae0f0e1b71596fb038ddb6cf6 (patch) | |
tree | c1e367909f5e071d9bb4427ef39f6530f439260f /tools/include/nolibc/stdlib.h | |
parent | tools/nolibc/sys: make open() take a vararg on the 3rd argument (diff) | |
download | linux-ac90226d53051c1ae0f0e1b71596fb038ddb6cf6.tar.xz linux-ac90226d53051c1ae0f0e1b71596fb038ddb6cf6.zip |
tools/nolibc/stdlib: avoid a 64-bit shift in u64toh_r()
The build of printf() on mips requires libgcc for functions __ashldi3 and
__lshrdi3 due to 64-bit shifts when scanning the input number. These are
not really needed in fact since we scan the number 4 bits at a time. Let's
arrange the loop to perform two 32-bit shifts instead on 32-bit platforms.
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/include/nolibc/stdlib.h')
-rw-r--r-- | tools/include/nolibc/stdlib.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h index 82a4cf606d3c..db47362a750f 100644 --- a/tools/include/nolibc/stdlib.h +++ b/tools/include/nolibc/stdlib.h @@ -200,14 +200,18 @@ int u64toh_r(uint64_t in, char *buffer) int dig; do { - dig = in >> pos; - in -= (uint64_t)dig << pos; + if (sizeof(long) >= 8) { + dig = (in >> pos) & 0xF; + } else { + /* 32-bit platforms: avoid a 64-bit shift */ + uint32_t d = (pos >= 32) ? (in >> 32) : in; + dig = (d >> (pos & 31)) & 0xF; + } + if (dig > 9) + dig += 'a' - '0' - 10; pos -= 4; - if (dig || digits || pos < 0) { - if (dig > 9) - dig += 'a' - '0' - 10; + if (dig || digits || pos < 0) buffer[digits++] = '0' + dig; - } } while (pos >= 0); buffer[digits] = 0; |