diff --git a/src/freedreno/isa/isa.py b/src/freedreno/isa/isa.py
index 995823ab1cf..d7d148443e5 100644
--- a/src/freedreno/isa/isa.py
+++ b/src/freedreno/isa/isa.py
@@ -458,6 +458,12 @@ class ISA(object):
                 for field_name, field in case.fields.items():
                     if field.type == 'float':
                         assert field.get_size() == 32 or field.get_size() == 16
+
+                    if not isinstance(field, BitSetDerivedField):
+                        assert field.high < bitset.get_size(), \
+                            "{}.{}: invalid bit range: [{}, {}] is not in [{}, {}]".format(
+                            bitset_name, field_name, field.low, field.high, 0, bitset.get_size() - 1)
+
                     if field.type in builtin_types:
                         continue
                     if field.type in self.enums:
@@ -481,4 +487,4 @@ class ISA(object):
 
         # TODO we should probably be able to look at the contexts where
         # an expression is evaluated and verify that it doesn't have any
-        # <var/> references that would be unresolved at evaluation time
\ No newline at end of file
+        # {VARNAME} references that would be unresolved at evaluation time
\ No newline at end of file