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.

diff --git a/gas/config/kvx-parse.c b/gas/config/kvx-parse.c
index ec3f912c4769a231e7431b193abbf157afbc1331..fe0e2aee737637c2de6747033b4977fde722bfcb 100644 (file)
--- 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 3cf6b27976db56a490e84b9d4953799896a749de..0e67ead4449d8f995902d5945810c8529bad48ff 100644 (file)
--- 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;