From nobody Sat Oct 25 08:57:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520370763954230.73939533994587; Tue, 6 Mar 2018 13:12:43 -0800 (PST) Received: from localhost ([::1]:58225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJt0-0004Hi-9B for importer@patchew.org; Tue, 06 Mar 2018 16:12:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJSx-0006FG-CY for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etJSw-0003Se-Jt for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:43 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:41090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etJSw-0003SV-Di for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:42 -0500 Received: by mail-pl0-x242.google.com with SMTP id d9-v6so5072318plo.8 for ; Tue, 06 Mar 2018 12:45:42 -0800 (PST) Received: from localhost.localdomain (125-237-39-90-fibre.bb.spark.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id y6sm39123791pfg.71.2018.03.06.12.45.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 12:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f/kpHWaiJEW07g1suh3Kp9em8EjjFqsjhj0bzpVX76Q=; b=HakNxCGSgy/XniDseSfh84VXJ1keX/MDkR4pNVcFcxH2PfWfnddADZ0QCs6H4DwXsV 7kfK0GCS87M9mTnHdUCC9TbH+gH2fVp0Z3G4J24k5I+D/92/uS95oXE5Ifw8+wGKL9Cd tR7CxudxKCtrNsYW+FQbAH6iVuCJaD6CUB8lOzm8qrkMeW6dCKC3zuqfiXKwUs7Qbw5z nlyag3wCUCUqOEkHgpsOUiheWyIa1HEOAZcsHD5xrFx2DFJl+u2wHhUnQC89BgeeRctH zbQmyAomJKAX3nqg2yie6eF3mH0o1yjTqmqoSyXxLh4b9+kL9cr8mudLWLvcQ6Hh+C7C +cMw== 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; bh=f/kpHWaiJEW07g1suh3Kp9em8EjjFqsjhj0bzpVX76Q=; b=sQv/6uY+EpbIjDQG/eSvnWB3v4Qne7wO7TznDWkoQ/eZDrQc6As8Bh8MGdsWJlAF3K qSk2AuiVfA80pgVPX+40bP4/raZCCpX/uh7icOT12pV8xARqGVRonFQ8c5ADWAp9xBYa cre14uVFIxwBVsOQuZ8u+50IapK55TaQPiVgvbVCcIIP2sa3q4710VLmflQiWEVMFBQw LjLXN9HY++UabgC8xHzIETaqW0FAbWEuUtIm4UihqxjhqYrtB0kJ7KvJOgzgeldrrhzV rGOs9TDHQoy7fVQ2leWRaOUxUMAY5m8EaGXLoZXEGzgF1DfWsnMg6DdfI8EljW2187y+ FyfQ== X-Gm-Message-State: AElRT7Eau2n/oJOhsbF5pDMv0yog71XofOqOPd2AEMKMHDW/FeBrAgi3 DS/UQe22BkyNiv77g5qgoEP7GPNRI5E= X-Google-Smtp-Source: AG47ELvE6AI238xmoEMjZjR9n6bzQ5LcVURQQqxjGm+xGert7QSp4iRf1shnjli11vdcKfqIbR/K8A== X-Received: by 2002:a17:902:8a92:: with SMTP id p18-v6mr11105544plo.286.1520369141417; Tue, 06 Mar 2018 12:45:41 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 09:43:44 +1300 Message-Id: <1520369037-37977-10-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1520369037-37977-1-git-send-email-mjc@sifive.com> References: <1520369037-37977-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v1 09/22] RISC-V: Include hexidecimal instruction in 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: Bastian Koppelmann , Michael Clark , Palmer Dabbelt , Sagar Karandikar , RISC-V Patches disassembly Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This was added to help debug issues using -d in_asm. It is useful to see the instruction bytes, as one can detect if one is trying to execute ASCII or device-tree magic. Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- disas/riscv.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index 3c17501..4580308 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -2769,25 +2769,6 @@ static void format_inst(char *buf, size_t buflen, si= ze_t tab, rv_decode *dec) char tmp[64]; const char *fmt; =20 - if (dec->op =3D=3D rv_op_illegal) { - size_t len =3D inst_length(dec->inst); - switch (len) { - case 2: - snprintf(buf, buflen, "(0x%04" PRIx64 ")", dec->inst); - break; - case 4: - snprintf(buf, buflen, "(0x%08" PRIx64 ")", dec->inst); - break; - case 6: - snprintf(buf, buflen, "(0x%012" PRIx64 ")", dec->inst); - break; - default: - snprintf(buf, buflen, "(0x%016" PRIx64 ")", dec->inst); - break; - } - return; - } - fmt =3D opcode_data[dec->op].format; while (*fmt) { switch (*fmt) { @@ -3004,6 +2985,11 @@ disasm_inst(char *buf, size_t buflen, rv_isa isa, ui= nt64_t pc, rv_inst inst) format_inst(buf, buflen, 16, &dec); } =20 +#define INST_FMT_2 "%04" PRIx64 " " +#define INST_FMT_4 "%08" PRIx64 " " +#define INST_FMT_6 "%012" PRIx64 " " +#define INST_FMT_8 "%016" PRIx64 " " + static int print_insn_riscv(bfd_vma memaddr, struct disassemble_info *info, rv_isa is= a) { @@ -3031,6 +3017,21 @@ print_insn_riscv(bfd_vma memaddr, struct disassemble= _info *info, rv_isa isa) } } =20 + switch (len) { + case 2: + (*info->fprintf_func)(info->stream, INST_FMT_2, inst); + break; + case 4: + (*info->fprintf_func)(info->stream, INST_FMT_4, inst); + break; + case 6: + (*info->fprintf_func)(info->stream, INST_FMT_6, inst); + break; + default: + (*info->fprintf_func)(info->stream, INST_FMT_8, inst); + break; + } + disasm_inst(buf, sizeof(buf), isa, memaddr, inst); (*info->fprintf_func)(info->stream, "%s", buf); =20 --=20 2.7.0