From nobody Wed Nov 5 10:36:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533733769743472.7887897241758; Wed, 8 Aug 2018 06:09:29 -0700 (PDT) Received: from localhost ([::1]:43643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnODE-0004Tu-NV for importer@patchew.org; Wed, 08 Aug 2018 09:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnNka-0004Vx-Bb for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnNkX-0006rs-N3 for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:39:40 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnNkX-0006q9-Eo for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:39:37 -0400 Received: by mail-wr1-x42e.google.com with SMTP id r16-v6so1865389wrt.11 for ; Wed, 08 Aug 2018 05:39:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x82-v6sm12682336wmd.11.2018.08.08.05.39.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 05:39:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 64E1F3E0619; Wed, 8 Aug 2018 13:39:34 +0100 (BST) 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=NfB+spkOifa3a7y5U9IVxta48XMAdJfKSFRw8wrslHE=; b=U8J6waLLUD130oGVM03Uk+/1D+NSOLzaTeKKMsRPkkKCgJ510bHz6YrhPGsGF5J2zJ 0IkrggYkorJQm+X82jgoOfE7rqjzB6DfsOjpp7ow9g0Xu6OxXe/Ke9cwQZVzPy54YXxL snlAtW7Mda9Io3m/N9RqvW5OMOBl/2i2bOgIU= 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=NfB+spkOifa3a7y5U9IVxta48XMAdJfKSFRw8wrslHE=; b=ammcnEVQLr1W1U2o5kdHcNdscSajpbx0lTNx2OihUelRoTvrJuOyyj7LuZxTF8XAzI Ni6gF1GjWs2FQyKhQYQU35OszMPqGBSeQS/Mq2CYVj2uB3Yf5F1gZpDGLYkCu+UzIuMc IRR5WMSh79WFDxWLZte5lJ6fXTnzIJFHoupBvf+DYeAk96PxaD10t1NlfG32DEKGmHnG 8W71aBcypB+cQVVuvdSiHhx1Bm+wNZQ9CyJkJrFqeo7zmK8Z7Do4c3i0NtNWLaO3ACW+ eozLaotlUPaCyY1LrwvUFbgQFfxSR4SlreXzj/SkFQl1W9NJPz1ugxRBzfqNov2WFNfX rNZA== X-Gm-Message-State: AOUpUlGktQ2iE4RV5IY3sGQdR6FRDM4JSZei0eENAHqMH4g2GDzc4mXK YjhYQlfer/sGOOYFqJL4pSfN3g== X-Google-Smtp-Source: AA+uWPzsqInwvbsBr9zlBdNzp0pbHNy18CPXCtZT6opEy0KoyZMNXMyfQrM/o8O/EpA2N6+12djzQg== X-Received: by 2002:adf:9485:: with SMTP id 5-v6mr1888358wrr.82.1533731976288; Wed, 08 Aug 2018 05:39:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 13:39:31 +0100 Message-Id: <20180808123934.17450-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180808123934.17450-1-alex.bennee@linaro.org> References: <20180808123934.17450-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [RFC PATCH 1/4] scripts/decodetree.py: add a disassembly generator (HACK!) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, richard.henderson@linaro.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Given our issues with failing disassembly we could try and re-use the decode tree data to output what instruction is being decoded. This will be used if registered as a fall-back for when the "proper" disassembler fails to decode an instruction. Signed-off-by: Alex Benn=C3=A9e Acked-by: Eduardo Habkost --- scripts/decodetree.py | 52 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 277f9a9bba..f4b4318c96 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -169,6 +169,7 @@ input_file =3D '' output_file =3D None output_fd =3D None insntype =3D 'uint32_t' +disassemble =3D False =20 re_ident =3D '[a-zA-Z][a-zA-Z0-9_]*' =20 @@ -467,6 +468,7 @@ class Pattern(General): =20 def output_code(self, i, extracted, outerbits, outermask): global translate_prefix + global disassemble ind =3D str_indent(i) arg =3D self.base.base.name output(ind, '/* line ', str(self.lineno), ' */\n') @@ -474,8 +476,34 @@ 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, ' =3D ', f.str_extract(), ';\= n') - output(ind, 'return ', translate_prefix, '_', self.name, - '(ctx, &u.f_', arg, ', insn);\n') + output(ind, 'return ', translate_prefix, '_', self.name) + if disassemble: + output("(dstr, maxd, ") + else: + output("(ctx, ") + + output('&u.f_', arg) + + if disassemble: + output(");\n") + else: + output(', insn);\n') + + def output_formatter(self): + global translate_prefix + arg =3D self.base.base.name + output('/* line ', str(self.lineno), ' */\n') + output('typedef ', self.base.base.struct_name(), + ' arg_', self.name, ';\n') + output(translate_scope, 'bool ', translate_prefix, '_', self.name, + '(char *ptr, size_t n, arg_', self.name, ' *a)\n') + output("{\n") + output(str_indent(4), 'snprintf(ptr, n, "', self.name) + # fill in arguments here + output('"); \n') + output(str_indent(4), "return true;\n") + output("}\n") + # end Pattern =20 =20 @@ -973,11 +1001,12 @@ def main(): global insnwidth global insntype global insnmask + global disassemble =20 decode_function =3D 'decode' decode_scope =3D 'static ' =20 - long_opts =3D ['decode=3D', 'translate=3D', 'output=3D', 'insnwidth=3D= '] + long_opts =3D ['decode=3D', 'translate=3D', 'output=3D', 'insnwidth=3D= ', 'disassemble'] try: (opts, args) =3D getopt.getopt(sys.argv[1:], 'o:w:', long_opts) except getopt.GetoptError as err: @@ -998,6 +1027,8 @@ def main(): insnmask =3D 0xffff elif insnwidth !=3D 32: error(0, 'cannot handle insns of width', insnwidth) + elif o =3D=3D '--disassemble': + disassemble =3D True else: assert False, 'unhandled option' =20 @@ -1031,7 +1062,10 @@ def main(): if i.base.base !=3D p.base.base: error(0, i.name, ' has conflicting argument sets') else: - i.output_decl() + if disassemble: + i.output_formatter() + else: + i.output_decl() out_pats[i.name] =3D i output('\n') =20 @@ -1039,8 +1073,14 @@ def main(): f =3D formats[n] f.output_extract() =20 - output(decode_scope, 'bool ', decode_function, - '(DisasContext *ctx, ', insntype, ' insn)\n{\n') + output(decode_scope, 'bool ', decode_function) + + if disassemble: + output("(char *dstr, size_t maxd, ") + else: + output('(DisasContext *ctx, ') + + output(insntype, ' insn)\n{\n') =20 i4 =3D str_indent(4) output(i4, 'union {\n') --=20 2.17.1