Browse Source

decodetree: Add support for 64-bit instructions

Allow '64' to be specified for the instruction width command line params
and use the appropriate extract and deposit functions in that case.

This will be used to implement the new 64-bit Power ISA 3.1 instructions.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Luis Pires <luis.pires@eldorado.org.br>
Message-Id: <CP2PR80MB3668E123E2EFDB0ACD3A46F1DA759@CP2PR80MB3668.lamprd80.prod.outlook.com>
[rth: Drop the change to the field type; use bitop_width instead of separate
variables for extract/deposit; use "ull" for 64-bit constants.]
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Luis Fernando Fujita Pires 4 years ago
parent
commit
60c425f328
1 changed files with 14 additions and 7 deletions
  1. 14 7
      scripts/decodetree.py

+ 14 - 7
scripts/decodetree.py

@@ -27,6 +27,7 @@
 import getopt
 import getopt
 
 
 insnwidth = 32
 insnwidth = 32
+bitop_width = 32
 insnmask = 0xffffffff
 insnmask = 0xffffffff
 variablewidth = False
 variablewidth = False
 fields = {}
 fields = {}
@@ -112,7 +113,9 @@ def whexC(val):
     """Return a hex string for val padded for insnwidth,
     """Return a hex string for val padded for insnwidth,
        and with the proper suffix for a C constant."""
        and with the proper suffix for a C constant."""
     suffix = ''
     suffix = ''
-    if val >= 0x80000000:
+    if val >= 0x100000000:
+        suffix = 'ull'
+    elif val >= 0x80000000:
         suffix = 'u'
         suffix = 'u'
     return whex(val) + suffix
     return whex(val) + suffix
 
 
@@ -199,11 +202,9 @@ def __str__(self):
         return str(self.pos) + ':' + s + str(self.len)
         return str(self.pos) + ':' + s + str(self.len)
 
 
     def str_extract(self):
     def str_extract(self):
-        if self.sign:
-            extr = 'sextract32'
-        else:
-            extr = 'extract32'
-        return f'{extr}(insn, {self.pos}, {self.len})'
+        global bitop_width
+        s = 's' if self.sign else ''
+        return f'{s}extract{bitop_width}(insn, {self.pos}, {self.len})'
 
 
     def __eq__(self, other):
     def __eq__(self, other):
         return self.sign == other.sign and self.mask == other.mask
         return self.sign == other.sign and self.mask == other.mask
@@ -224,6 +225,7 @@ def __str__(self):
         return str(self.subs)
         return str(self.subs)
 
 
     def str_extract(self):
     def str_extract(self):
+        global bitop_width
         ret = '0'
         ret = '0'
         pos = 0
         pos = 0
         for f in reversed(self.subs):
         for f in reversed(self.subs):
@@ -231,7 +233,7 @@ def str_extract(self):
             if pos == 0:
             if pos == 0:
                 ret = ext
                 ret = ext
             else:
             else:
-                ret = f'deposit32({ret}, {pos}, {32 - pos}, {ext})'
+                ret = f'deposit{bitop_width}({ret}, {pos}, {bitop_width - pos}, {ext})'
             pos += f.len
             pos += f.len
         return ret
         return ret
 
 
@@ -1270,6 +1272,7 @@ def main():
     global insntype
     global insntype
     global insnmask
     global insnmask
     global decode_function
     global decode_function
+    global bitop_width
     global variablewidth
     global variablewidth
     global anyextern
     global anyextern
 
 
@@ -1299,6 +1302,10 @@ def main():
             if insnwidth == 16:
             if insnwidth == 16:
                 insntype = 'uint16_t'
                 insntype = 'uint16_t'
                 insnmask = 0xffff
                 insnmask = 0xffff
+            elif insnwidth == 64:
+                insntype = 'uint64_t'
+                insnmask = 0xffffffffffffffff
+                bitop_width = 64
             elif insnwidth != 32:
             elif insnwidth != 32:
                 error(0, 'cannot handle insns of width', insnwidth)
                 error(0, 'cannot handle insns of width', insnwidth)
         else:
         else: