diff options
| author | Alan Modra <amodra@gmail.com> | 2023-08-23 08:34:12 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-08-23 11:03:52 +0930 |
| commit | 990f9a1d13e3e6fa9443d23fdd146528d4f21159 (patch) | |
| tree | 44aa5f6324a0f61f67c4f851e1bbde6e635208f6 /gas | |
| parent | 847fb383d83039b194f68d9e09974a3de4095eb5 (diff) | |
| download | binutils-990f9a1d13e3e6fa9443d23fdd146528d4f21159.zip binutils-990f9a1d13e3e6fa9443d23fdd146528d4f21159.tar.gz binutils-990f9a1d13e3e6fa9443d23fdd146528d4f21159.tar.bz2 | |
kvx: ubsan: integer overflow
This fixes a few places where ubsan complains about signed integer
overflow when running the testsuite, and that clz(0) is undefined.
When fixing the clz problem, I also noticed that we'd get complaints
if pval is ever LLONG_MIN. Fix that by using unsigned arithmetic.
* config/kvx-parse.c (get_token_class): Avoid signed overflow.
Don't clz(0).
* config/tc-kvx.c (PARALLEL_BIT): Avoid signed overflow.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/config/kvx-parse.c | 6 | ||||
| -rw-r--r-- | gas/config/tc-kvx.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gas/config/kvx-parse.c b/gas/config/kvx-parse.c index ec3f912..fe0e2ae 100644 --- a/gas/config/kvx-parse.c +++ b/gas/config/kvx-parse.c @@ -515,9 +515,9 @@ get_token_class (struct token_s *token, struct token_classes *classes, int insn_ ? token->val : strtoull (tok + (tok[0] == '-') + (tok[0] == '+'), NULL, 0); long long val = uval; - long long pval = val < 0 ? -val : val; - int neg_power2_p = val < 0 && !(pval & (pval - 1)); - unsigned int len = 8 * sizeof (pval) - __builtin_clzll (pval); + long long pval = val < 0 ? -uval : uval; + int neg_power2_p = val < 0 && !(uval & (uval - 1)); + unsigned len = pval ? 8 * sizeof (pval) - __builtin_clzll (pval) : 0; for (; class[cur].class_id != -1 && ((unsigned int) (class[cur].sz < 0 ? - class[cur].sz - !neg_power2_p : class[cur].sz) < len || (exp.X_op == O_symbol && !has_relocation_of_size (str_hash_find (env.reloc_hash, TOKEN_NAME (class[cur].class_id)))) diff --git a/gas/config/tc-kvx.c b/gas/config/tc-kvx.c index 3cf6b27..0e67ead 100644 --- a/gas/config/tc-kvx.c +++ b/gas/config/tc-kvx.c @@ -49,7 +49,7 @@ static void supported_cores (char buf[], size_t buflen); #define STRNEQ(x,y,n) !strncmp(((x) ? (x) : ""), ((y) ? (y) : ""),(n)) /* The PARALLEL_BIT is set to 0 when an instruction is the last of a bundle. */ -#define PARALLEL_BIT (1 << 31) +#define PARALLEL_BIT (1u << 31) /*TB begin*/ int size_type_function = 1; |