From 4fc31e7d33606f249bf984378cd49f0dcba6e325 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 15 Feb 2020 15:06:44 -0800 Subject: [PATCH] freedreno/registers: teach gen_header.py about a3xx_regid This is a builtin type (treated as uint, but with special type-aware decoding) in envytools/cffdump. Lets teach gen_header.py about it and drop the enum hack in the xml so I don't have to keep deleting the enum when I sync the xml back to the freedreno envytools tree. Signed-off-by: Rob Clark Part-of: --- src/freedreno/registers/adreno_common.xml | 4 ---- src/freedreno/registers/gen_header.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/freedreno/registers/adreno_common.xml b/src/freedreno/registers/adreno_common.xml index 7c078a091cd..9d0a240c243 100644 --- a/src/freedreno/registers/adreno_common.xml +++ b/src/freedreno/registers/adreno_common.xml @@ -280,10 +280,6 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd"> Common between A3xx and A4xx: --> - - - - diff --git a/src/freedreno/registers/gen_header.py b/src/freedreno/registers/gen_header.py index 887656fd5d8..7e3bcd4f7d8 100644 --- a/src/freedreno/registers/gen_header.py +++ b/src/freedreno/registers/gen_header.py @@ -39,7 +39,7 @@ class Field(object): self.shr = shr self.type = type - builtin_types = [ None, "boolean", "uint", "hex", "int", "fixed", "ufixed", "float", "address", "waddress" ] + builtin_types = [ None, "a3xx_regid", "boolean", "uint", "hex", "int", "fixed", "ufixed", "float", "address", "waddress" ] if low < 0 or low > 31: raise parser.error("low attribute out of range: %d" % low) @@ -61,7 +61,7 @@ class Field(object): elif self.type == "boolean": type = "bool" val = var_name - elif self.type == "uint" or self.type == "hex": + elif self.type == "uint" or self.type == "hex" or self.type == "a3xx_regid": type = "uint32_t" val = var_name elif self.type == "int": -- 2.30.2