RE: [PATCH] decodetree: Allow empty input files for var width

Luis Fernando Fujita Pires posted 1 patch 3 years ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/CP2PR80MB36681CD897FF21F090FAB4D9DA4F9@CP2PR80MB3668.lamprd80.prod.outlook.com

Maintainers: Cleber Rosa <crosa@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>

scripts/decodetree.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Expand all Fold all

RE: [PATCH] decodetree: Allow empty input files for var width

Posted by Luis Fernando Fujita Pires 3 years ago

Please ignore this. I'll resend as part of a patch series.

Luis Pires
Instituto de Pesquisas ELDORADO
Departamento de Computação Embarcada
Aviso Legal - Disclaimer


-----Original Message-----
From: Luis Pires <luis.pires@eldorado.org.br> 
Sent: terça-feira, 13 de abril de 2021 15:10
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org; Luis Fernando Fujita Pires <luis.pires@eldorado.org.br>
Subject: [PATCH] decodetree: Allow empty input files for var width

This was broken when varinsnwidth was specified.

Signed-off-by: Luis Pires <luis.pires@eldorado.org.br>
---
 scripts/decodetree.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 3450a2a08d..fef5eeaf42 100644
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -1177,11 +1177,12 @@ def output_code(self, i, extracted, outerbits, outermask):
         ind = str_indent(i)
 
         # If we need to load more bytes, do so now.
-        if extracted < self.width:
-            output(ind, 'insn = ', decode_function,
-                   '_load_bytes(ctx, insn, {0}, {1});\n'
-                   .format(extracted // 8, self.width // 8));
-            extracted = self.width
+        if self.width is not None:
+            if extracted < self.width:
+                output(ind, 'insn = ', decode_function,
+                       '_load_bytes(ctx, insn, {0}, {1});\n'
+                       .format(extracted // 8, self.width // 8));
+                extracted = self.width
         output(ind, 'return insn;\n')
 # end SizeLeaf
 
--
2.25.1