Use uint64_t for SVE VQ

Previously VQ was of type long. Using uint64_t ensures it always matches the
same type as the VG register.
Note that in the Linux kernel, VQ is 16bits. We cast it up to 64bits
immediately after reading to ensure we always use the same type throughout
the code.

gdb/
	* aarch64-tdep.c (aarch64_read_description): Use uint64_t for VQ.
	* aarch64-tdep.h (aarch64_read_description): Likewise.
	* arch/aarch64.c (aarch64_create_target_description): Likewise.
	* arch/aarch64.h (aarch64_create_target_description): Likewise.
	* features/aarch64-sve.c (create_feature_aarch64_sve): Likewise.
	* nat/aarch64-sve-linux-ptrace.c(aarch64_sve_get_vq): Likewise.
	* nat/aarch64-sve-linux-ptrace.h (aarch64_sve_get_vq): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9895d2fcc3dce9b50f99da2f87af70c7c9793910..0096382e47a1c44b354571184a0069dff50e785a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2018-06-01  Alan Hayward  <alan.hayward@arm.com>
+
+       * aarch64-tdep.c (aarch64_read_description): Use uint64_t for VQ.
+       * aarch64-tdep.h (aarch64_read_description): Likewise.
+       * arch/aarch64.c (aarch64_create_target_description): Likewise.
+       * arch/aarch64.h (aarch64_create_target_description): Likewise.
+       * features/aarch64-sve.c (create_feature_aarch64_sve): Likewise.
+       * nat/aarch64-sve-linux-ptrace.c(aarch64_sve_get_vq): Likewise.
+       * nat/aarch64-sve-linux-ptrace.h (aarch64_sve_get_vq): Likewise.
+
 2018-06-02  Simon Marchi  <simon.marchi@ericsson.com>
 
        * value.c (value_fetch_lazy_bitfield): New.

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 1cd2015e08f9510d3df04217beb6aef7238017ff..f8e77a8ba9490b900a0ee43dfd4cda113437c4f1 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -2856,10 +2856,10 @@ aarch64_displaced_step_hw_singlestep (struct gdbarch *gdbarch,
    (It is not possible to set VQ to zero on an SVE system).  */
 
 const target_desc *
-aarch64_read_description (long vq)
+aarch64_read_description (uint64_t vq)
 {
   if (vq > AARCH64_MAX_SVE_VQ)
-    error (_("VQ is %ld, maximum supported value is %d"), vq,
+    error (_("VQ is %" PRIu64 ", maximum supported value is %d"), vq,
           AARCH64_MAX_SVE_VQ);
 
   struct target_desc *tdesc = tdesc_aarch64_list[vq];

diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h
index c9fd7b357839135c5ca939bd6b9d85703b1adc0a..e41a5972d2e98b8e82bf2404e4bf8dfaf6711234 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);
 };
 
-const target_desc *aarch64_read_description (long vq);
+const target_desc *aarch64_read_description (uint64_t vq);
 
 extern int aarch64_process_record (struct gdbarch *gdbarch,
                                struct regcache *regcache, CORE_ADDR addr);

diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c
index 495057488dc21505684a3069f7b0d8f4c9012daf..9b191315bc72467732e42ebee4f42bb2ebec117b 100644 (file)
--- a/gdb/arch/aarch64.c
+++ b/gdb/arch/aarch64.c
@@ -26,7 +26,7 @@
 /* See arch/aarch64.h.  */
 
 target_desc *
-aarch64_create_target_description (long vq)
+aarch64_create_target_description (uint64_t vq)
 {
   target_desc *tdesc = allocate_target_description ();
 

diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
index 30f5360380f6e59df9bed4bcce5c864242320a00..9040d8d4c868cb77fec5176ada1e4d6586795b29 100644 (file)
--- a/gdb/arch/aarch64.h
+++ b/gdb/arch/aarch64.h
@@ -26,7 +26,7 @@
    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
    an SVE Z register.  */
 
-target_desc *aarch64_create_target_description (long vq);
+target_desc *aarch64_create_target_description (uint64_t vq);
 
 /* Register numbers of various important registers.
    Note that on SVE, the Z registers reuse the V register numbers and the V

diff --git a/gdb/features/aarch64-sve.c b/gdb/features/aarch64-sve.c
index a020e4d3935438e55b616767b2d3cd13dedeaf9c..71be67c3fbbe3874bd3847fd6f6534da2938d45f 100644 (file)
--- a/gdb/features/aarch64-sve.c
+++ b/gdb/features/aarch64-sve.c
@@ -23,7 +23,7 @@
 
 static int
 create_feature_aarch64_sve (struct target_desc *result, long regnum,
-                           int scale)
+                           uint64_t scale)
 {
   struct tdesc_feature *feature;
   tdesc_type *element_type, *field_type;

diff --git a/gdb/nat/aarch64-sve-linux-ptrace.c b/gdb/nat/aarch64-sve-linux-ptrace.c
index 3a1dbae7099552907b71cb4efe8feb0e032dde49..119656b8864fe76f59ec4b934c01c9c1686d7711 100644 (file)
--- a/gdb/nat/aarch64-sve-linux-ptrace.c
+++ b/gdb/nat/aarch64-sve-linux-ptrace.c
@@ -27,7 +27,7 @@
 
 /* See nat/aarch64-sve-linux-ptrace.h.  */
 
-unsigned long
+uint64_t
 aarch64_sve_get_vq (int tid)
 {
   struct iovec iovec;

diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h
index a32ddf16768fa1985400ee05c37025b0be14b604..61f841466c8279c14322894e4cedbe3b6e39db4b 100644 (file)
--- a/gdb/nat/aarch64-sve-linux-ptrace.h
+++ b/gdb/nat/aarch64-sve-linux-ptrace.h
@@ -32,7 +32,7 @@
 /* Read VQ for the given tid using ptrace.  If SVE is not supported then zero
    is returned (on a system that supports SVE, then VQ cannot be zero).  */
 
-extern unsigned long aarch64_sve_get_vq (int tid);
+uint64_t aarch64_sve_get_vq (int tid);
 
 /* Structures and defines taken from sigcontext.h.  */