diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
| commit | 834b9273d5cdab68180dc8c84d641aaa4344b057 (patch) | |
| tree | c6be3eb86a2fa267d85f16122592b6e3c868fd98 /scripts/decodetree.py | |
| parent | 4dad0a9aa818698e0735c8352bf7925a1660df6f (diff) | |
| parent | 639b090df52a4952262615328a3fdfae81234ea8 (diff) | |
| download | focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.tar.gz focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial patches 20200919 # gpg: Signature made Sat 19 Sep 2020 19:43:35 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.2-pull-request: contrib/: fix some comment spelling errors qapi/: fix some comment spelling errors disas/: fix some comment spelling errors linux-user/: fix some comment spelling errors util/: fix some comment spelling errors scripts/: fix some comment spelling errors docs/: fix some comment spelling errors migration/: fix some comment spelling errors qemu/: fix some comment spelling errors scripts/git.orderfile: Display meson files along with buildsys ones hw/timer/hpet: Fix debug format strings hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw meson: remove empty else and duplicated gio deps manual: escape backslashes in "parsed-literal" blocks ui/spice-input: Remove superfluous forward declaration hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition hw/gpio/max7310: Remove impossible check Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/decodetree.py')
| -rw-r--r-- | scripts/decodetree.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/decodetree.py b/scripts/decodetree.py index c02de9865b..60fd3b5e5f 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -94,7 +94,7 @@ def str_indent(c): def str_fields(fields): - """Return a string uniquely identifing FIELDS""" + """Return a string uniquely identifying FIELDS""" r = '' for n in sorted(fields.keys()): r += '_' + n @@ -814,7 +814,7 @@ def parse_generic(lineno, parent_pat, name, toks): arg = None fmt = None for t in toks: - # '&Foo' gives a format an explcit argument set. + # '&Foo' gives a format an explicit argument set. if re.fullmatch(re_arg_ident, t): tt = t[1:] if arg: @@ -903,7 +903,7 @@ def parse_generic(lineno, parent_pat, name, toks): elif not (is_format and width == 0) and width != insnwidth: error(lineno, 'definition has {0} bits'.format(width)) - # Do not check for fields overlaping fields; one valid usage + # Do not check for fields overlapping fields; one valid usage # is to be able to duplicate fields via import. fieldmask = 0 for f in flds.values(): |