From: Eric Anholt <eric@anholt.net>
Date: Thu, 13 Jul 2017 19:40:58 +0000 (-0700)
Subject: broadcom/genxml: Support address fields with <32 bits
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82fdc106066002c5ed3a96a6aee01a8dc43dd7a5;p=mesa.git

broadcom/genxml: Support address fields with <32 bits

I was writing the XML such that the address field overlapped various flags
in the alignment bits, which caused pain when trying to unpack for decode.
Instead, keep the XML matching the docs (address fields don't overlap),
and just infer the appropriate shift value during decode.

During pack, the address is just applied to the appropriate bits
already, ignoring the sub-byte start/end fields.
---

diff --git a/src/broadcom/cle/v3d_decoder.c b/src/broadcom/cle/v3d_decoder.c
index 66f74af306f..ac33d87191c 100644
--- a/src/broadcom/cle/v3d_decoder.c
+++ b/src/broadcom/cle/v3d_decoder.c
@@ -792,7 +792,7 @@ v3d_field_iterator_next(struct v3d_field_iterator *iter)
         case V3D_TYPE_ADDRESS:
         case V3D_TYPE_OFFSET:
                 snprintf(iter->value, sizeof(iter->value), "0x%08"PRIx64,
-                         __gen_unpack_uint(iter->p, s, e));
+                         __gen_unpack_uint(iter->p, s, e) << (31 - (e - s)));
                 break;
         case V3D_TYPE_STRUCT:
                 snprintf(iter->value, sizeof(iter->value), "<struct %s>",