Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2227602/?format=api
{ "id": 2227602, "url": "http://patchwork.ozlabs.org/api/patches/2227602/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260424023606.2556830-7-brian.cain@oss.qualcomm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260424023606.2556830-7-brian.cain@oss.qualcomm.com>", "list_archive_url": null, "date": "2026-04-24T02:36:03", "name": "[PULL,6/9] Hexagon (target/hexagon) Disassembly of invalid packets", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b25074d475855135875429165d1a9ba1451d4f4a", "submitter": { "id": 89839, "url": "http://patchwork.ozlabs.org/api/people/89839/?format=api", "name": "Brian Cain", "email": "brian.cain@oss.qualcomm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260424023606.2556830-7-brian.cain@oss.qualcomm.com/mbox/", "series": [ { "id": 501280, "url": "http://patchwork.ozlabs.org/api/series/501280/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501280", "date": "2026-04-24T02:36:05", "name": "[PULL,1/9] Hexagon (target/hexagon) Properly handle Hexagon CPU version", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/501280/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2227602/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2227602/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256\n header.s=qcppdkim1 header.b=X9voPpt1;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.a=rsa-sha256 header.s=google header.b=Yj8cLDpL;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g1xtm5lWyz1yJF\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 24 Apr 2026 12:37:03 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wG6PB-0006lv-Ao; Thu, 23 Apr 2026 22:36:33 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <brian.cain@oss.qualcomm.com>)\n id 1wG6P4-0006ks-Cb\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 22:36:29 -0400", "from mx0a-0031df01.pphosted.com ([205.220.168.131])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <brian.cain@oss.qualcomm.com>)\n id 1wG6P2-0008Kc-BC\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 22:36:26 -0400", "from pps.filterd (m0279867.ppops.net [127.0.0.1])\n by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63NIQ96s3804217\n for <qemu-devel@nongnu.org>; Fri, 24 Apr 2026 02:36:23 GMT", "from mail-dy1-f197.google.com (mail-dy1-f197.google.com\n [74.125.82.197])\n by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dqkqfu171-1\n (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n for <qemu-devel@nongnu.org>; Fri, 24 Apr 2026 02:36:22 +0000 (GMT)", "by mail-dy1-f197.google.com with SMTP id\n 5a478bee46e88-2de07c12745so16310147eec.1\n for <qemu-devel@nongnu.org>; Thu, 23 Apr 2026 19:36:22 -0700 (PDT)", "from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com.\n [129.46.96.20]) by smtp.gmail.com with ESMTPSA id\n 5a478bee46e88-2e539fa6134sm31240868eec.3.2026.04.23.19.36.20\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 23 Apr 2026 19:36:20 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h=\n cc:content-transfer-encoding:content-type:date:from:in-reply-to\n :message-id:mime-version:references:subject:to; s=qcppdkim1; bh=\n +3JTTBjcxtihqjfyfYNLDWBSXnwmgBGHqzUfIU57z/E=; b=X9voPpt1NSgjd9LY\n EUphR2H7sPAQE+Hy4z8N5VeOP6AUymTneYeint7wYkg45FCiCe/oXL2tGYHRWmSS\n TlqZLB9HTFU8s7xZp0jXKawwr6FHZ20RihQe9O//Fr0Gl5OgOEw8R2jeCalNk89Q\n YckaYc/YNfFEDCXikkqw5/LMZGwgAjn/C1ebbxCABAX1dMVXTvRmUThP6hK/ltDj\n MjFgk4bG+eIGsYoTuUYNz4Tw/u3T0xrRc2l7ybqP7rY9FVWSMDj2I3LTncneMqfl\n yLAspz3tjG2YsvdX6drhZmxsqOft8+BrPKjHJP/2q4fOWrAQXxoUHbpmCNtMVN0Z\n uAhbQw==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=oss.qualcomm.com; s=google; t=1776998182; x=1777602982; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=+3JTTBjcxtihqjfyfYNLDWBSXnwmgBGHqzUfIU57z/E=;\n b=Yj8cLDpL4VQ0gpg3+UFsOaMRjvaC7X2wCojWNkGPg5LYNoxNGAeuwabmczpH5JbYFF\n H1Zbtzts+A8+ISLVK8JH65CTo3T2tRDNOhMKOssueDJu0k3Gr8ACwd15SMB2afp6HphT\n l3bIgG3vHveepbJfgoM68gMmejFy4owIGdwJJtOnw7/dWOdde/w6qw6LXCMU2wxhEPZI\n vVeB3FynWBmPDCv/YxVqzpo0Mjl6NC/wNsPYqIt2u5KwZzs1BkshWDc7C6CXYKfH06+0\n 5rvfs7oIX8y2BzM5PtOf5NtI1o65Jg0J/mbmwWnDlvlJLO7c30jhMWxl7uLE9uYCQKmR\n 6gqw==" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776998182; x=1777602982;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=+3JTTBjcxtihqjfyfYNLDWBSXnwmgBGHqzUfIU57z/E=;\n b=PIENAZtlRMpuxP2xmTVaDjYXufQwUgE+bp+vdhSC0rIOEfEbU2hyte5K+yLJC6Y7Xa\n p5vCmzViOIoBeAEV2C+IdQLWK4Qczy9mudiqV0pfQeQ1RBXFCBvEi94W7GiUEFB2RSLP\n DhNRSlR7Wkgm4SyeaTHIlKEN91Kn61Nbpn+h27FLr3pF99ic2WbHkhXsrZo0nzu7ZVJq\n xw9Re4BZJSd3FBHClhI/696aMoYKsFHq8du5gicaQS88UgD+P/1PCiv6FJmaZTt+ZdGO\n 4+rs/Z8eLt2tUVfJZqYXRZfarGbnKfg9YrHL/SowT5OMrv6ZGMivrLqxJMKCaCWEcFje\n 0BOg==", "X-Gm-Message-State": "AOJu0Yzchz6/wc/mDF7R6o4HsnXLoDcBZh9xwlnQApoBE0UPskk9dQVe\n GQEHCrsy/cn7IYcR3aZg4VlVb2sHdo7sxcSECc/V+fLEBhDcgW9kpbr2g8cYfdg93o57uJ6gO4u\n +ShnKjLqfRMytBHGgbfxXQtD75aRMzLgWUXJ1KyOkK9FN2CCQh+ZbiJPOK7IDlCa3IQ==", "X-Gm-Gg": "AeBDiev+gXMGZO+SSAftgfJyIoE2fSjRTd1PuXg2fgQ+/5UOIFnVl0aLMeIIIQUj1Zp\n ZtzVnPLV3mnNU551srHbWB7uiKXfcd/H+S3yOYHR95lvN3zUkoPHe3e6OEpr6M5nexvlXHO6MKh\n Y+Afsoiud+4MdrlD6L6ufksgZQxFqCvW71zOR644Pn1ldEdfZ8Yl7COwCdbjEbNO5MMShamZJRn\n 2atb5WO/G2R/Z8+tcsWm5KBCjdCItJ9zvctf14UnLsQNY6V5hmMgg0aj7Njq88b3/EQLcI9ngLk\n 5FE8e15B6Uho+nFTWMRQLDFZRLirMVR2BIT9rWz5/cEG9JCRxiIVdNYA6SvUZn+GjY5nM0T5aGB\n WkKHD5vRX+iDd2YGlaJkZRjDjX8yFsYLWhi2W2nVZANoVmXzo4foKMhsmgRHV1AZhYjm8S5ttAr\n RsCOjj", "X-Received": [ "by 2002:a05:693c:2a10:b0:2e6:e916:7105 with SMTP id\n 5a478bee46e88-2e6e9167856mr9979241eec.13.1776998181891;\n Thu, 23 Apr 2026 19:36:21 -0700 (PDT)", "by 2002:a05:693c:2a10:b0:2e6:e916:7105 with SMTP id\n 5a478bee46e88-2e6e9167856mr9979232eec.13.1776998181266;\n Thu, 23 Apr 2026 19:36:21 -0700 (PDT)" ], "From": "Brian Cain <brian.cain@oss.qualcomm.com>", "To": "qemu-devel@nongnu.org, stefanha@redhat.com", "Cc": "brian.cain@oss.qualcomm.com, Taylor Simpson <ltaylorsimpson@gmail.com>,\n Matheus Tavares Bernardino <matheus.bernardino@oss.qualcomm.com>,\n Anton Johansson <anjo@rev.ng>,\n Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>", "Subject": "[PULL 6/9] Hexagon (target/hexagon) Disassembly of invalid packets", "Date": "Thu, 23 Apr 2026 19:36:03 -0700", "Message-Id": "<20260424023606.2556830-7-brian.cain@oss.qualcomm.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20260424023606.2556830-1-brian.cain@oss.qualcomm.com>", "References": "<20260424023606.2556830-1-brian.cain@oss.qualcomm.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "X-Proofpoint-GUID": "Gcqhm9UrsQWW0gWmsb7bXiaT3WNLgUsf", "X-Proofpoint-ORIG-GUID": "Gcqhm9UrsQWW0gWmsb7bXiaT3WNLgUsf", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNDI0MDAyMCBTYWx0ZWRfX1WHMRxcjTLGt\n xv4copfDMlw2zeb4T687HDbQZg9NrLFbEqHq1WWT7ZnJeemNd4SyZvuF5tNbalu082O/Eqk/jW0\n sQ2g/t4cXLGmYlaHwgxS15iYhE1cfGMdp+fWkkddUtcQH213oQ/rWWQ1/oKIVKeyzPEvcnAdY8b\n brO+qoO7U0Je51LMk84yNv1i62l0d7MHZGGtOItcGiec0U1zGeYKGDW8FJ/Bgyy7eQ54uzQtXWN\n ho/gO9fECe68gC81Dv0DsVOI8IRo2sWdz6OHacW08t/g7pKqEexDvE+46UK40/PhcD1WpTW0JQH\n NL+iqxmIrJFijr5Iso/vFhqeO+IVT72GBobw7+xhFzHKUsJopRf0ojBV8EX3ZS4ncako2ZMtX3A\n VUZXdmiasvwCicfeiSYebNv2DCCxhmxF/cykVmHAnZ2maoi0s8jDfuw2YfsP3L+a3i267+l0FaM\n xWmTRp1l/8FobbOWSrQ==", "X-Authority-Analysis": "v=2.4 cv=ablRWxot c=1 sm=1 tr=0 ts=69ead726 cx=c_pps\n a=Uww141gWH0fZj/3QKPojxA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17\n a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10\n a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22\n a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=Mls7scvPt5bN7SzHJssA:9 a=QEXdDO2ut3YA:10\n a=PxkB5W3o20Ba91AHUih5:22", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-23_03,2026-04-21_02,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n bulkscore=0 phishscore=0 priorityscore=1501 suspectscore=0 adultscore=0\n impostorscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240020", "Received-SPF": "pass client-ip=205.220.168.131;\n envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com", "X-Spam_score_int": "-27", "X-Spam_score": "-2.8", "X-Spam_bar": "--", "X-Spam_report": "(-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Taylor Simpson <ltaylorsimpson@gmail.com>\n\nWe pass the Hexagon CPU definition to disassemble_hexagon. This allows\ndecode_packet to know if the opcodes are supported.\n\nNote that we print valid instructions in a packet when one or more is\ninvalid. Rather than this\n0x0002128c: 0x1eae4fec\t{\t<invalid>\n0x00021290: 0x1c434c04\t\t<invalid>\n0x00021294: 0x1e03edf0\t\t<invalid> }\n\nWe print this\n0x0002128c: 0x1eae4fec\t{\t<invalid>\n0x00021290: 0x1c434c04\t\tV4.w = vadd(V12.w,V3.w)\n0x00021294: 0x1e03edf0\t\tV16 = V13 }\n\nCo-authored-by: Matheus Tavares Bernardino <matheus.bernardino@oss.qualcomm.com>\nCo-authored-by: Brian Cain <brian.cain@oss.qualcomm.com>\nSigned-off-by: Taylor Simpson <ltaylorsimpson@gmail.com>\nReviewed-by: Anton Johansson <anjo@rev.ng>\nSigned-off-by: Brian Cain <brian.cain@oss.qualcomm.com>\n---\n target/hexagon/cpu_bits.h | 4 +++-\n target/hexagon/printinsn.h | 3 ++-\n disas/hexagon.c | 3 ++-\n target/hexagon/cpu.c | 2 ++\n target/hexagon/decode.c | 25 +++++++++++++++++++++----\n target/hexagon/printinsn.c | 9 +++++++--\n 6 files changed, 37 insertions(+), 9 deletions(-)", "diff": "diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h\nindex 19beca81c0c..aaac6b9ea64 100644\n--- a/target/hexagon/cpu_bits.h\n+++ b/target/hexagon/cpu_bits.h\n@@ -19,6 +19,7 @@\n #define HEXAGON_CPU_BITS_H\n \n #include \"qemu/bitops.h\"\n+#include \"cpu-qom.h\"\n \n #define PCALIGN 4\n #define PCALIGN_MASK (PCALIGN - 1)\n@@ -65,6 +66,7 @@ static inline bool is_packet_end(uint32_t endocing)\n return ((bits == 0x3) || (bits == 0x0));\n }\n \n-int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc, GString *buf);\n+int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc, GString *buf,\n+ const HexagonCPUDef *hex_def);\n \n #endif\ndiff --git a/target/hexagon/printinsn.h b/target/hexagon/printinsn.h\nindex 2ecd1731d03..6f84ef93c3b 100644\n--- a/target/hexagon/printinsn.h\n+++ b/target/hexagon/printinsn.h\n@@ -18,10 +18,11 @@\n #ifndef HEXAGON_PRINTINSN_H\n #define HEXAGON_PRINTINSN_H\n \n+#include \"cpu-qom.h\"\n #include \"insn.h\"\n \n void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,\n- target_ulong pc);\n+ target_ulong pc, const HexagonCPUDef *hex_def);\n void snprint_a_pkt_debug(GString *buf, Packet *pkt);\n \n #endif\ndiff --git a/disas/hexagon.c b/disas/hexagon.c\nindex c1a4ffc5f6b..36b8321c26a 100644\n--- a/disas/hexagon.c\n+++ b/disas/hexagon.c\n@@ -31,6 +31,7 @@\n \n int print_insn_hexagon(bfd_vma memaddr, struct disassemble_info *info)\n {\n+ const HexagonCPUDef *hex_def = (const HexagonCPUDef *)info->target_info;\n uint32_t words[PACKET_WORDS_MAX];\n bool found_end = false;\n GString *buf;\n@@ -58,7 +59,7 @@ int print_insn_hexagon(bfd_vma memaddr, struct disassemble_info *info)\n }\n \n buf = g_string_sized_new(PACKET_BUFFER_LEN);\n- len = disassemble_hexagon(words, i, memaddr, buf);\n+ len = disassemble_hexagon(words, i, memaddr, buf, hex_def);\n (*info->fprintf_func)(info->stream, \"%s\", buf->str);\n g_string_free(buf, true);\n \ndiff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c\nindex 23ac91e7b47..2c53f2c2836 100644\n--- a/target/hexagon/cpu.c\n+++ b/target/hexagon/cpu.c\n@@ -297,8 +297,10 @@ static void hexagon_cpu_reset_hold(Object *obj, ResetType type)\n static void hexagon_cpu_disas_set_info(const CPUState *cs,\n disassemble_info *info)\n {\n+ const HexagonCPU *cpu = HEXAGON_CPU(cs);\n info->print_insn = print_insn_hexagon;\n info->endian = BFD_ENDIAN_LITTLE;\n+ info->target_info = HEXAGON_CPU_GET_CLASS(cpu)->hex_def;\n }\n \n static void hexagon_cpu_realize(DeviceState *dev, Error **errp)\ndiff --git a/target/hexagon/decode.c b/target/hexagon/decode.c\nindex b8a1cd5b12b..c4cf430e5a2 100644\n--- a/target/hexagon/decode.c\n+++ b/target/hexagon/decode.c\n@@ -828,19 +828,36 @@ int decode_packet(DisasContext *ctx, int max_words, const uint32_t *words,\n \n /* Used for \"-d in_asm\" logging */\n int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc,\n- GString *buf)\n+ GString *buf, const HexagonCPUDef *hex_def)\n {\n+ HexagonCPUDef any_def = {\n+ .hex_version = HEX_VER_ANY, /* Allow decode to accept anything */\n+ };\n DisasContext ctx;\n Packet pkt;\n \n memset(&ctx, 0, sizeof(DisasContext));\n+ ctx.hex_def = &any_def;\n ctx.pkt = &pkt;\n \n if (decode_packet(&ctx, nwords, words, &pkt, true) > 0) {\n- snprint_a_pkt_disas(buf, &pkt, words, pc);\n+ snprint_a_pkt_disas(buf, &pkt, words, pc, hex_def);\n return pkt.encod_pkt_size_in_bytes;\n } else {\n- g_string_assign(buf, \"<invalid>\");\n- return 0;\n+ for (int i = 0; i < nwords; i++) {\n+ g_string_append_printf(buf, \"0x\" TARGET_FMT_lx \"\\t\", words[i]);\n+ if (i == 0) {\n+ g_string_append(buf, \"{\");\n+ }\n+ g_string_append(buf, \"\\t\");\n+ g_string_append(buf, \"<invalid>\");\n+ if (i < nwords - 1) {\n+ pc += 4;\n+ g_string_append_printf(buf, \"\\n0x\" TARGET_FMT_lx \": \",\n+ (target_ulong)pc);\n+ }\n+ }\n+ g_string_append(buf, \" }\");\n+ return nwords * sizeof(uint32_t);\n }\n }\ndiff --git a/target/hexagon/printinsn.c b/target/hexagon/printinsn.c\nindex 4865cdd133b..22b305f018e 100644\n--- a/target/hexagon/printinsn.c\n+++ b/target/hexagon/printinsn.c\n@@ -21,6 +21,7 @@\n #include \"insn.h\"\n #include \"reg_fields.h\"\n #include \"internal.h\"\n+#include \"decode.h\"\n \n static const char *sreg2str(unsigned int reg)\n {\n@@ -51,7 +52,7 @@ static void snprintinsn(GString *buf, Insn *insn)\n }\n \n void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,\n- target_ulong pc)\n+ target_ulong pc, const HexagonCPUDef *hex_def)\n {\n bool has_endloop0 = false;\n bool has_endloop1 = false;\n@@ -83,7 +84,11 @@ void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,\n }\n \n g_string_append(buf, \"\\t\");\n- snprintinsn(buf, &(pkt->insn[i]));\n+ if (opcode_supported(pkt->insn[i].opcode, hex_def)) {\n+ snprintinsn(buf, &(pkt->insn[i]));\n+ } else {\n+ g_string_append(buf, \"<invalid>\");\n+ }\n \n if (i < pkt->num_insns - 1) {\n /*\n", "prefixes": [ "PULL", "6/9" ] }