From patchwork Fri Apr 30 01:15:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 429733 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2107782jao; Thu, 29 Apr 2021 18:25:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdEoSk449t/fCHbTyfj/DbHQqdtqrgCfvgQl/YGuvDyAp3/lUkBp2CSNOu9oaUe3v9z5zK X-Received: by 2002:a92:d650:: with SMTP id x16mr2043571ilp.223.1619745943341; Thu, 29 Apr 2021 18:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619745943; cv=none; d=google.com; s=arc-20160816; b=fZJVkizQUJ6LlgoQaqH8h7nyjugCATJJpB15sYPHpq9VkUgGWS7x2531yV0QKHgrWM IpQuiKxbdcDCEv13tDKuluRFOQ7TtqZTesjIKr4n+8GnGQtjwjnUfwhL+NlKoUsoFkCY zyP6Md2Qs+25cHmxy8UmBgIFF+rpMkY/GUoBxas9Lcyoct3GAkyRUi+joz77+uVq+eqG OJ2ZhARuUXA8tZgaZkUsAd0D8Wc24Hlkfcd8hjdlaZ+RPJjffY33L81zr9fd63LpqsUt 7fKa1RzBXcTe5N5ASgBFI9+sWoZEA88u/v1A//tkq+s9XT6uarm3YDs0Gzn2vlV/imXu mQ/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=F3do9fOW6bZifHO74UJfwOcPcNtNFJadWBeu2w1t6Fk=; b=k3HWCIfVf/cbgUF65vKUW+ghHDXS81nZD0DSNmfc2g/sxnk8usIv0FQ0cPv7H4KB3B SD90YgSBgCvWkj6xn9yhaaKrUvWyxs5t0lJHQlZx1mfxtSYGRFSw6aA88IOhPyur4tth eqVKBa1KrUM1CA4i8QJaal/hkJW4vtwd4StxGuPgtFnkvKcizW6Xa/ne8qZ7pwsC5YWg JmsJA/AmU172l4EDQpZCEGYB/mGjdlRQXTtvzG8FY9SdosSavJF4r3GdUVhnhpWTCKht TgWcaPO3g1rYnzfllEPzj75kUoaeWJXP+4rOdv18YQ2FMVgYQ+ol933rRl6vjA2vz7iS cLGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=whQKnCJ9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12si438923jad.105.2021.04.29.18.25.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Apr 2021 18:25:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=whQKnCJ9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcHuY-0003No-Q6 for patch@linaro.org; Thu, 29 Apr 2021 21:25:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcHlF-0002r1-Dr for qemu-devel@nongnu.org; Thu, 29 Apr 2021 21:16:05 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:45844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcHkz-0007UG-KI for qemu-devel@nongnu.org; Thu, 29 Apr 2021 21:16:04 -0400 Received: by mail-pj1-x1036.google.com with SMTP id gc22-20020a17090b3116b02901558435aec1so881250pjb.4 for ; Thu, 29 Apr 2021 18:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F3do9fOW6bZifHO74UJfwOcPcNtNFJadWBeu2w1t6Fk=; b=whQKnCJ9oeFcUmkkYtcBfXvPn8GQ3+Va1bKg8tYs7FE8U8eY5P+BEdOH7SBDIazLGn bkDVQXBPnLQg7Uhc7NL7WYsB7RBroAfaZVVUEa3SwWPd5zWH73FK2WaCEGcL+0Rjb8se +XBKlTPrPAnJsjnWvpcjRp14ANEV/C9Pzbn7aQ/ZA19EYIPO5BRP920COQ15gkU5duhd Gq6AkJcO9sEMliHdLjCnlBQ909Ev7MeS2JuF2lLkXgqNNYVmIU0BSgEWeC6qYuOZpdoM nGbUlU8pn4t361lLUIK2fOLW+0yWQAlCcuazbyXjEPsP17+gHsN0rWL2WbEqY5d8jz2Q PGlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F3do9fOW6bZifHO74UJfwOcPcNtNFJadWBeu2w1t6Fk=; b=LEq9234jtV+am4bfOVYRiWl73bSiKyPZTzhvZZa9BwGo3qLWoWug09oVUWgoIAh2rw Sd63d/WRhgan4P9G8w3dijtsCnRA3CWUXF7clE1Q2dtGOyyNK7W9dbZ7q6wf3RcYiGm9 XQlHxfVbPM59RBL0esYSfw0yW2s/f9U4gwIBiBxqRQXHLa9lRhiNOP5jNFAklEFPZvjx YGYidNtdAQFCURmi4aIuwt1dTLFmQNs9Xa6U0UuVsZQi8FLflTVJY/QinL0pRAXq3ZPc jHrxwYQGv3bN7PXApbbImcyaD8I10nTlco5RcGYs+V38flm8HtbiwWJXMciBCJdSuy7q jFQQ== X-Gm-Message-State: AOAM533cAgx8BNTGktwng9rxJDPKl6xBu1ezCORmZc25ginI+S/q1lPc +a+qLoK/39cR0AmoriROf0PzZIEr2fPi+Q== X-Received: by 2002:a17:902:b406:b029:ec:fbf2:4114 with SMTP id x6-20020a170902b406b02900ecfbf24114mr2611906plr.32.1619745346061; Thu, 29 Apr 2021 18:15:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id 1sm161277pjx.46.2021.04.29.18.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 18:15:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/30] decodetree: More use of f-strings Date: Thu, 29 Apr 2021 18:15:15 -0700 Message-Id: <20210430011543.1017113-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210430011543.1017113-1-richard.henderson@linaro.org> References: <20210430011543.1017113-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f4bug@amsat.org, luis.pires@eldorado.org.br, qemu-ppc@nongnu.org, lagarcia@br.ibm.com, bruno.larsen@eldorado.org.br, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- scripts/decodetree.py | 50 ++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 27 deletions(-) -- 2.25.1 Reviewed-by: Luis Pires Reviewed-by: Philippe Mathieu-Daudé diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 0861e5d503..d5da101167 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -59,9 +59,9 @@ def error_with_file(file, lineno, *args): prefix = '' if file: - prefix += '{0}:'.format(file) + prefix += f'{file}:' if lineno: - prefix += '{0}:'.format(lineno) + prefix += f'{lineno}:' if prefix: prefix += ' ' print(prefix, end='error: ', file=sys.stderr) @@ -203,7 +203,7 @@ def str_extract(self): extr = 'sextract32' else: extr = 'extract32' - return '{0}(insn, {1}, {2})'.format(extr, self.pos, self.len) + return f'{extr}(insn, {self.pos}, {self.len})' def __eq__(self, other): return self.sign == other.sign and self.mask == other.mask @@ -227,11 +227,11 @@ def str_extract(self): ret = '0' pos = 0 for f in reversed(self.subs): + ext = f.str_extract() if pos == 0: - ret = f.str_extract() + ret = ext else: - ret = 'deposit32({0}, {1}, {2}, {3})' \ - .format(ret, pos, 32 - pos, f.str_extract()) + ret = f'deposit32({ret}, {pos}, {32 - pos}, {ext})' pos += f.len return ret @@ -675,11 +675,11 @@ def parse_field(lineno, name, toks): subtoks = t.split(':') sign = False else: - error(lineno, 'invalid field token "{0}"'.format(t)) + error(lineno, f'invalid field token "{t}"') po = int(subtoks[0]) le = int(subtoks[1]) if po + le > insnwidth: - error(lineno, 'field {0} too large'.format(t)) + error(lineno, f'field {t} too large') f = Field(sign, po, le) subs.append(f) width += le @@ -724,9 +724,9 @@ def parse_arguments(lineno, name, toks): anyextern = True continue if not re.fullmatch(re_C_ident, t): - error(lineno, 'invalid argument set token "{0}"'.format(t)) + error(lineno, f'invalid argument set token "{t}"') if t in flds: - error(lineno, 'duplicate argument "{0}"'.format(t)) + error(lineno, f'duplicate argument "{t}"') flds.append(t) if name in arguments: @@ -895,14 +895,14 @@ def parse_generic(lineno, parent_pat, name, toks): flen = flen[1:] shift = int(flen, 10) if shift + width > insnwidth: - error(lineno, 'field {0} exceeds insnwidth'.format(fname)) + error(lineno, f'field {fname} exceeds insnwidth') f = Field(sign, insnwidth - width - shift, shift) flds = add_field(lineno, flds, fname, f) fixedbits <<= shift fixedmask <<= shift undefmask <<= shift else: - error(lineno, 'invalid token "{0}"'.format(t)) + error(lineno, f'invalid token "{t}"') width += shift if variablewidth and width < insnwidth and width % 8 == 0: @@ -914,7 +914,7 @@ def parse_generic(lineno, parent_pat, name, toks): # We should have filled in all of the bits of the instruction. elif not (is_format and width == 0) and width != insnwidth: - error(lineno, 'definition has {0} bits'.format(width)) + error(lineno, f'definition has {width} bits') # Do not check for fields overlapping fields; one valid usage # is to be able to duplicate fields via import. @@ -932,8 +932,7 @@ def parse_generic(lineno, parent_pat, name, toks): if arg: for f in flds.keys(): if f not in arg.fields: - error(lineno, 'field {0} not in argument set {1}' - .format(f, arg.name)) + error(lineno, f'field {f} not in argument set {arg.name}') else: arg = infer_argument_set(flds) if name in formats: @@ -960,13 +959,12 @@ def parse_generic(lineno, parent_pat, name, toks): arg = fmt.base for f in flds.keys(): if f not in arg.fields: - error(lineno, 'field {0} not in argument set {1}' - .format(f, arg.name)) + error(lineno, f'field {f} not in argument set {arg.name}') if f in fmt.fields.keys(): - error(lineno, 'field {0} set by format and pattern'.format(f)) + error(lineno, f'field {f} set by format and pattern') for f in arg.fields: if f not in flds.keys() and f not in fmt.fields.keys(): - error(lineno, 'field {0} not initialized'.format(f)) + error(lineno, f'field {f} not initialized') pat = Pattern(name, lineno, fmt, fixedbits, fixedmask, undefmask, fieldmask, flds, width) parent_pat.pats.append(pat) @@ -1097,7 +1095,7 @@ def parse_file(f, parent_pat): elif re.fullmatch(re_pat_ident, name): parse_generic(start_lineno, parent_pat, name, toks) else: - error(lineno, 'invalid token "{0}"'.format(name)) + error(lineno, f'invalid token "{name}"') toks = [] if nesting != 0: @@ -1131,9 +1129,8 @@ def output_code(self, i, extracted, outerbits, outermask): # If we need to load more bytes to test, 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)); + output(ind, f'insn = {decode_function}_load_bytes', + f'(ctx, insn, {extracted // 8}, {self.width // 8});\n') extracted = self.width # Attempt to aid the compiler in producing compact switch statements. @@ -1184,9 +1181,8 @@ def output_code(self, i, extracted, outerbits, outermask): # 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)); + output(ind, f'insn = {decode_function}_load_bytes', + f'(ctx, insn, {extracted // 8}, {self.width // 8});\n') extracted = self.width output(ind, 'return insn;\n') # end SizeLeaf @@ -1220,7 +1216,7 @@ def build_size_tree(pats, width, outerbits, outermask): for p in pats: pnames.append(p.name + ':' + p.file + ':' + str(p.lineno)) error_with_file(pats[0].file, pats[0].lineno, - 'overlapping patterns size {0}:'.format(width), pnames) + f'overlapping patterns size {width}:', pnames) bins = {} for i in pats: