aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2018-03-02 10:45:35 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-02 11:03:45 +0000
commit768055980b5f4a65d1bc2b6a7c1ece98adf7e262 (patch)
treeedd3743249cc1bd55f7a5ca199459fed4d76e62f /scripts
parent08b2f15e67d9d9b3bda09e5bd3d89979bfc4f6b8 (diff)
downloadqemu-768055980b5f4a65d1bc2b6a7c1ece98adf7e262.zip
qemu-768055980b5f4a65d1bc2b6a7c1ece98adf7e262.tar.gz
qemu-768055980b5f4a65d1bc2b6a7c1ece98adf7e262.tar.bz2
decodetree: Propagate return value from translate subroutines
Allow the translate subroutines to return false for invalid insns. At present we can of course invoke an invalid insn exception from within the translate subroutine, but in the short term this consolidates code. In the long term it would allow the decodetree language to support overlapping patterns for ISA extensions. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180227232618.2908-1-richard.henderson@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/decodetree.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 6a33f8f..41301c8 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -461,7 +461,7 @@ class Pattern(General):
global translate_prefix
output('typedef ', self.base.base.struct_name(),
' arg_', self.name, ';\n')
- output(translate_scope, 'void ', translate_prefix, '_', self.name,
+ output(translate_scope, 'bool ', translate_prefix, '_', self.name,
'(DisasContext *ctx, arg_', self.name,
' *a, ', insntype, ' insn);\n')
@@ -474,9 +474,8 @@ class Pattern(General):
output(ind, self.base.extract_name(), '(&u.f_', arg, ', insn);\n')
for n, f in self.fields.items():
output(ind, 'u.f_', arg, '.', n, ' = ', f.str_extract(), ';\n')
- output(ind, translate_prefix, '_', self.name,
+ output(ind, 'return ', translate_prefix, '_', self.name,
'(ctx, &u.f_', arg, ', insn);\n')
- output(ind, 'return true;\n')
# end Pattern