diff options
| author | Peter Maydell | 2018-03-27 11:27:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-03-27 11:27:34 +0200 |
| commit | f58d9620aa4a514b1227074ff56eefd1334a6225 (patch) | |
| tree | 7bac3be6205ea76075d0823029f91f5867f33305 /scripts | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | scripts/decodetree: Fix insnmask not marked as global in main() (diff) | |
| download | qemu-f58d9620aa4a514b1227074ff56eefd1334a6225.tar.gz qemu-f58d9620aa4a514b1227074ff56eefd1334a6225.tar.xz qemu-f58d9620aa4a514b1227074ff56eefd1334a6225.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20180326' into staging
Fix a decodetree problem with 16-bit insns
# gpg: Signature made Mon 26 Mar 2018 15:35:04 BST
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-dt-20180326:
scripts/decodetree: Fix insnmask not marked as global in main()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/decodetree.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 41301c84aa..277f9a9bba 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -972,6 +972,7 @@ def main(): global input_file global insnwidth global insntype + global insnmask decode_function = 'decode' decode_scope = 'static ' |