broadcom/genxml: Support unpacking fixed-point fractional values.

This was an oversight in the original XML support, because unpacking
wasn't used much.  The new XML-based CL dumper will want it, though.

2 files changed, 25 insertions, 4 deletions

diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py
index d9ead68749e..528ff8fa439 100644
--- a/src/broadcom/cle/gen_pack_header.py
+++ b/src/broadcom/cle/gen_pack_header.py
@@ -326,6 +326,11 @@ class Group(object):
             if field.type != "mbo":
                 convert = None
 
+                args = []
+                args.append('cl')
+                args.append(str(start + field.start))
+                args.append(str(start + field.end))
+
                 if field.type == "address":
                     convert = "__gen_unpack_address"
                 elif field.type == "uint":
@@ -339,17 +344,17 @@ class Group(object):
                 elif field.type == "offset":
                     convert = "__gen_unpack_offset"
                 elif field.type == 'ufixed':
+                    args.append(str(field.fractional_size))
                     convert = "__gen_unpack_ufixed"
                 elif field.type == 'sfixed':
+                    args.append(str(field.fractional_size))
                     convert = "__gen_unpack_sfixed"
                 else:
                     print("/* unhandled field %s, type %s */\n" % (name, field.type))
                     s = None
 
-                print("   values->%s = %s(cl, %s, %s);" % \
-                      (field.name, convert, \
-                       start + field.start, start + field.end))
-
+                print("   values->%s = %s(%s);" % \
+                      (field.name, convert, ', '.join(args)))
 
 class Value(object):
     def __init__(self, attrs):
diff --git a/src/broadcom/cle/v3d_packet_helpers.h b/src/broadcom/cle/v3d_packet_helpers.h
index d01ff6ef0ad..c86cad85266 100644
--- a/src/broadcom/cle/v3d_packet_helpers.h
+++ b/src/broadcom/cle/v3d_packet_helpers.h
@@ -177,6 +177,22 @@ __gen_unpack_sint(const uint8_t *restrict cl, uint32_t start, uint32_t end)
 }
 
 static inline float
+__gen_unpack_sfixed(const uint8_t *restrict cl, uint32_t start, uint32_t end,
+                    uint32_t fractional_size)
+{
+        int32_t bits = __gen_unpack_sint(cl, start, end);
+        return (float)bits / (1 << fractional_size);
+}
+
+static inline float
+__gen_unpack_ufixed(const uint8_t *restrict cl, uint32_t start, uint32_t end,
+                    uint32_t fractional_size)
+{
+        int32_t bits = __gen_unpack_uint(cl, start, end);
+        return (float)bits / (1 << fractional_size);
+}
+
+static inline float
 __gen_unpack_float(const uint8_t *restrict cl, uint32_t start, uint32_t end)
 {
    assert(start % 8 == 0);