Use uint64_t for aarch64 tdep VQ

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1e74a7601a05865f2ffc7d0eb2d32c8af3c4be6a..f3b616fef464bba0a9cf8fde539298b39e474a3c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-04  Alan Hayward  <alan.hayward@arm.com>
+
+       * aarch64-tdep.c (aarch64_get_tdesc_vq): Use uint64_t for VQ.
+       * aarch64-tdep.h (struct gdbarch_tdep): Likewise.
+
 2018-06-04  Alan Hayward  <alan.hayward@arm.com>
 
        * aarch64-linux-nat.c (aarch64_linux_read_description): Support SVE.

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 6674b7654e591f0e4e99cf623392a7e9fc50e4c6..0172e4ccd17759f57de003dc9c9298fceb675902 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -2875,7 +2875,7 @@ aarch64_read_description (uint64_t vq)
 
 /* Return the VQ used when creating the target description TDESC.  */
 
-static long
+static uint64_t
 aarch64_get_tdesc_vq (const struct target_desc *tdesc)
 {
   const struct tdesc_feature *feature_sve;
@@ -2888,7 +2888,8 @@ aarch64_get_tdesc_vq (const struct target_desc *tdesc)
   if (feature_sve == nullptr)
     return 0;
 
-  long vl = tdesc_register_size (feature_sve, aarch64_sve_register_names[0]);
+  uint64_t vl = tdesc_register_size (feature_sve,
+                                    aarch64_sve_register_names[0]);
   return sve_vq_from_vl (vl);
 }
 

diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h
index b6b9b30e715291fb0512f214a88ce49445fb290b..598a0aafa2f7aae94066b72ae4140ed341750449 100644 (file)
--- a/gdb/aarch64-tdep.h
+++ b/gdb/aarch64-tdep.h
@@ -75,7 +75,7 @@ struct gdbarch_tdep
   int (*aarch64_syscall_record) (struct regcache *regcache, unsigned long svc_number);
 
   /* The VQ value for SVE targets, or zero if SVE is not supported.  */
-  long vq;
+  uint64_t vq;
 
   /* Returns true if the target supports SVE.  */
   bool has_sve () const