From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2085.outbound.protection.outlook.com [40.107.22.85]) by sourceware.org (Postfix) with ESMTPS id 5E2F03858017 for ; Fri, 27 Jan 2023 13:14:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E2F03858017 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jOCHzKil+YR74/Ym+JUi6N8nHKw8bClYcvIWvoBXH3n9J/Un27AOTSquU6LxcUIcDlz5Xih1OkQC+ReBKIOfip7tXbqZ8MB4JyQ8iFftrjFfBi4Tu5JcO3zkJe6NJbx/M6rYU3tUq3DlXAvujhlj5iZQROKafvPJKqK2wo6zacTb5L6yBeD6Yo+WYRq/cCuQe6DI8r/3CmE+QC3wdd5kn1s15OZLMdMG8KZ+P8x5N3FWS7qnJG2DPtrT/t4E2nhk5nzgDfn5NAxmy10Dh5ZU4nRDCKeoa9PgzeDPz5907JCnzQdEeMSyb7fUGHAX23YkSlEPOl7SvNqhtDZwD8BBQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vzX2h83uIVU7CLTcZsmsHreBjyLwFh0gRp59MO9Cfvo=; b=WbFHdbs22rxwFbj+laku+OhVbi+o6gqnJd3Atc64VToaH7k1PfnXHWPr1c7o9Y1NCs0ZRVHAwa9Xw6n1p/kJbBYl3k6ByWGpOzxDLffCPR0uuXXw74NhpRtYZu75D6Tc5B20YWIQ3hgWKSVQt30OAELNFNR7t+VteHq2+xek/IZT3xMaJXJh1AGUDuxaZHnIebiZA8/Fk4JrWCZi3Yu7mnpH6dajXZTD0CsAxDjUyF9vuPMyWDyWcyiOpbNfzBwCSpIQldmzePEPzbaPHutDkkaq3Yr9hgwuf/0+ZXIiyXDQ6laIl2Jw8IZMuewbHeqsGyySKrkmrt5H7qXLWS4mMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vzX2h83uIVU7CLTcZsmsHreBjyLwFh0gRp59MO9Cfvo=; b=XcZGTao5pmMuoAg3ywCce3GEfuFrmbwcH+bB6XplCvNXjm8AwbOhE4+QaNjr7mZAbpyFWbqzCbsxIsXEuZWBwrG7lLLXibjqDDLcDVyBcRRtUIwFvzGEWfWTTIWc4pDHH+3w5hSK2XkFBJJPSvBKjCG2KQW1YGLFkpMVy5o/xqQT+0zxno6Jb2xtWu1s+QP1jE8iVi5tH0hg0vtp/AB/KJ8wlGdDRUs9HmophDfg8z+kKC1tymc8aad/U7YGc2wz6zPZDZaADUo4e856mZ8jj2W8BsuV7HxdV6xYjfDrvxpvUZKOKFZp5A6tUpKfNoNjZqHPCE/HcjYLTOi/Pwaz3g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PAXPR04MB8816.eurprd04.prod.outlook.com (2603:10a6:102:20f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.23; Fri, 27 Jan 2023 13:14:47 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2991:58a4:e308:4389]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2991:58a4:e308:4389%7]) with mapi id 15.20.6043.022; Fri, 27 Jan 2023 13:14:46 +0000 Message-ID: Date: Fri, 27 Jan 2023 14:14:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu From: Jan Beulich Subject: [PATCH] RISC-V: don't disassemble unrecognized insns as .byte Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::19) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PAXPR04MB8816:EE_ X-MS-Office365-Filtering-Correlation-Id: dc83cb20-4da6-42f4-c140-08db00687657 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rDPQ6yvt8WY+mDd4d6PNWMptd1GruLYwDhseNwbXxAMcge26h1Tf2cn4+5k647FpBwCcJUc+Cm1lQut1HiIhk9rM6EwIsruhjfbdNVArpQBOsydM3Yz+GSbRfed7n0ud3hmlHk30lx0EZguKoE6FYzfUp6JUQgGnDnGKvAqIMVdHtaqnqsRLPGOpvhflBMWFy0qYMn+d/Ap8mYfGXUpMBgEvm+rYKZr2sOm89dwllBJmg1rrUH94YPa5ZjgL+1rn8dT9GM4YbLsPjDzh3cZODY0K4BSHj2tEpH8RQPzkBeMASzSuokNdpExkEKU5+n4v31oMh+gabzPFEz3XnGY4XiX+IS/IgJUk1iig4C3MQulAScJifN2LxihVT2cCTkq/jQ+1DAr2HwfvM9A9DjC8YkPMKv84GjU+/GAM8l7pKkAueXDb4DYNVdz1NYG8nPiJWo5aQwVFlgsQ3fphvex+qt/Fj3/AXgwbkGWCY8R+5K+qB1lyfeE/41+M27819smerlDQrmehpEKBv7PoawPG0z4zar5KZ2nOYfUeu4jlC8iENj+TDab4Ej2wWx47Ifh2V1ktQXGy7LlooqPjbp7WgiHH7CbpOfwZc8M6rGQK5GS3p9wEksnyhaSJL3U5cYXzlMvAotMgJWQT2ptA+z+gF0GrSYukrNRqzsnuu1rZ221oqPzmfGP45dVF6NalR6fAAEFoVpLlNLFytagcyI1EIZB8VcxipVD7p1Qv3LOeb/vHjKQRD3c26PS/3Ia9eRaTsAGbrmctmA7spCPwYt1kYw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(376002)(396003)(136003)(346002)(366004)(39860400002)(451199018)(31696002)(83380400001)(41300700001)(86362001)(2616005)(54906003)(36756003)(6486002)(478600001)(316002)(26005)(186003)(6512007)(6506007)(6916009)(66556008)(4326008)(66476007)(8676002)(66946007)(31686004)(38100700002)(2906002)(8936002)(5660300002)(142923001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QTlLNWxORjNCRHhlckdPdGZ5TDhkVjgwN2k1bkdiMVB5V3VnOTQzU3MvdGJZ?= =?utf-8?B?a0tmb3NIQjZYUk9MRlNLSlFTYTNXYzJET1NCWFlzR0kwYUcwaFpaNEJhclM0?= =?utf-8?B?TDRFWEI2aS9IR3cvbk51Vld1TUNNMXNoc0NOVE5LeXNWSkI4TWNVTXlwLzVD?= =?utf-8?B?eHd2aE9qaVBzbEFTTWFMbXloLzNHVFNoZUQzM2RmTytKR1JZUWJkWE9EZEx3?= =?utf-8?B?R0ptNXVycENDWFQvUUw4NHk2OVNEUHhrK1QrbGtzQ1RTTWVmQ0JPQUIrNnZq?= =?utf-8?B?K1ROK2F6MlJERWRENTNOYTk2MlQ4eVA1VXBuSnJ0Q3Y4QTJmM3dtbWtEbTJj?= =?utf-8?B?dlYrYTZGZ0UvRHM0ckY3YVJSblU4U1Y5NXNsSGE2dEI0T09teTNZQXBTbHo5?= =?utf-8?B?cGJQNjMyUEt5T3NCMUZValM5L1BkeDJoSjFDcmx1OHppeU9OU0p5elBNUklU?= =?utf-8?B?ZlNEZFgzTEVkaGhYVWhsRHFScWhNNjV1R0w1d3kxN291ZXZzNkdIdmphV0ox?= =?utf-8?B?YUJ4S0NsS3NiQXE0VkNtVFFMWitUNG5Ba2QyZEpHVml0M3IxUG8rd1VEVGdL?= =?utf-8?B?enVWMHdvVFU0UHVZcE9oa2VNcHVPbEI3Ri92S0k3alY5OWQ2OWZrTGJMbzRw?= =?utf-8?B?MG5hNkZXbEQvZVF3UzlxbFlXTEtJV2lzdDdDcXErUG9XcnFCWTdQOEYwalQ1?= =?utf-8?B?OHp5RGxuQmxnU0lTMTYyMHpHbE9nWU5uQ1g1OVBxVW04NzdnZmdTSk5DblFr?= =?utf-8?B?RnZ5bzJuY01va1pOK3U2V2czRk15WEVRUkVYVng0bi8wMDhadmphQUdPR0VI?= =?utf-8?B?dm1lT3ZSQi9vWXVuTmNXaHdiZUF6MlhJWmtXbWZnczA0cU1COU52QXlqTzVE?= =?utf-8?B?VDN2MDZCZ1R1eUU0WWEwOWdVY1BKRWVVN3BOUUZQZCtodzlmY0JrNWQ1MmND?= =?utf-8?B?ZFNCUDdabERFR1VlUjgwM3RVWGk0ZjhTRDhCT201VHRJeU9yc2ZMOTBHNnFG?= =?utf-8?B?S3Mybnllc2VoRUJ5czNlckxPMURCeUdqZy84UXBrYjVLVTJxU2MwTW5ZYkNh?= =?utf-8?B?R0xMWERXVTFvVFFNaDY2Q3hIb28veENvVkg0Q0FEaUtvZmNtTFlnMmVrb0xO?= =?utf-8?B?UW93QTNMcW5yNWtTK1c1OXpHK0ZnZzBKSXVtbUVvSzBOanFuZFI3NFVweVN1?= =?utf-8?B?SDNlZ3hpZE02NDljbkV5WkhNcVFYRHhaVDBobSt4U0FCMVUyQVZGWmVWWE1h?= =?utf-8?B?bHFpbklWMGVsR2xRUlBYSlYxc05oK292WTU3SDA1djVjTU5HcXFyUUVBKytt?= =?utf-8?B?eDBDNS83cGxtcjc2SWhjYXNhNDRFTVZtSjJWSFovV3ErTmhvSUdmSktjb3RQ?= =?utf-8?B?VzRIclE1RnhiMVhCRi8yMlYwT1ExemVyY3k3di81QVdWcGVoZ1dKWTVXekpU?= =?utf-8?B?RGtNeTVFaUFjQVl0NiszNkVEZnVqUlY1V3BaQXRDMHNma21mMXY2QWFSM0Js?= =?utf-8?B?NmQ3L1JYTTZSb3JOQzFqZENwc2NKRWlGaWFMUWZWL05VNUt2Y244bk1aVFg4?= =?utf-8?B?TTZuQ1RrNG12U293cGZxUzYyQXRiTlRkMHBINFZMdnpXVjRKeUN0WHZvS0t3?= =?utf-8?B?dDdmMnFKSW56bkNSdHk1Qi9PMmpKN2ZraDY2OGxmUVR2NmVpU2YrdDZPd0Zm?= =?utf-8?B?RGF2bWprb1lSYW1SVC8wbWpTVXBENFYwSjNqNFB6Sml3WXBtdEYwb0QwNUVa?= =?utf-8?B?aFhiNGRmUGYvMmdJVlNwUW9ZZlpXR3MrOGdCM1U4OEZaN2xBSVU3ME90WExu?= =?utf-8?B?NlFLQk4wRHV2YWNFUGgrK245M1o5QkxqT1FQZHd3YVRyb3pEeURVaWN0R1hB?= =?utf-8?B?RVFuRExkenBhY2pTNUlsWVZkTzd3Q0w0R2lLQUc5ZHlGSTlNcTBsZ2pqRXVD?= =?utf-8?B?NnE2MjN4ejdxREJiL0gyS1d5ZDRqNXp3RTRIa0lHOGFnTDcyMWkwOVk1UnVS?= =?utf-8?B?bCs0SEo1RG1mNE1YODIzck1TTUNVWVRjQmdkRElzWG5pM3NtNk1kQVZjRGZ0?= =?utf-8?B?YkRvT0lyM0NsakFBanJYUGtnVXF0NWlBQ2VXSUtXcnkycnVvam56RFpMalNp?= =?utf-8?Q?QH1ZphuKCaHQIMK4riyI2y3rN?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc83cb20-4da6-42f4-c140-08db00687657 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 13:14:46.7149 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bWtBcmEIVXgiCxTWXz0mXL9H9IzGiY0rNJbcDc14Y57yoIh6+EItyoIdQqOrOq/aQiFyxUJ8WdByoZg0oZeaMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8816 X-Spam-Status: No, score=-3028.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Insn width granularity being 16 bits, produce 16 bits of data per output element for the non-special-cased insn widths. Besides being slightly more natural (in particular having the first element carry everything that's needed for determining insn length), this is also slightly more compact. --- I think output would be even more neat if .byte were suppressed when generic code already prints the raw insn (or maybe something like was printed instead). As to the special case code for 2-, 4-, and 8-byte insns: Any thoughts towards zero-padding the numbers there as well? That would make yet more noticable what the insn width is; in particular - see e.g. ".8byte 0x3f" in full disassembly of the testcases modified here - it would avoid the value looking like it was for a more narrow one. Taking it yet one step further - how about printing unknown insns as ".insn ...", matching what gas would consume? --- a/gas/testsuite/gas/riscv/insn-na.d +++ b/gas/testsuite/gas/riscv/insn-na.d @@ -76,11 +76,11 @@ Disassembly of section .text: [^:]+:[ ]+007f 0000 0000 0000 0000[ ]+[._a-z].* [^:]+:[ ]+0000107f 00000000 00000000[ ]+[._a-z].* [^:]+:[ ]+607f 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000[ ]+[._a-z].* -[^:]+:[ ]+007f 0000 0000 0000 8000[ ]+\.byte[ ]+0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 -[^:]+:[ ]+007f 0000 0000 0000 8000[ ]+\.byte[ ]+0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 -[^:]+:[ ]+607f 89ab 4567 0123 3210 7654 ba98 fedc 0000 0000 0000[ ]+\.byte[ ]+0x7f, 0x60, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -[^:]+:[ ]+607f 89ab 4567 0123 3210 7654 ba98 fedc 0000 0000 0000[ ]+\.byte[ ]+0x7f, 0x60, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 00dc[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0x00 -[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 00dc[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0x00 -[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 fedc[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe -[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 fedc[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe +[^:]+:[ ]+007f 0000 0000 0000 8000[ ]+\.2byte[ ]+0x007f, 0x0000, 0x0000, 0x0000, 0x8000 +[^:]+:[ ]+007f 0000 0000 0000 8000[ ]+\.2byte[ ]+0x007f, 0x0000, 0x0000, 0x0000, 0x8000 +[^:]+:[ ]+607f 89ab 4567 0123 3210 7654 ba98 fedc 0000 0000 0000[ ]+\.2byte[ ]+0x607f, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc, 0x0000, 0x0000, 0x0000 +[^:]+:[ ]+607f 89ab 4567 0123 3210 7654 ba98 fedc 0000 0000 0000[ ]+\.2byte[ ]+0x607f, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc, 0x0000, 0x0000, 0x0000 +[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 00dc[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0x00dc +[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 00dc[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0x00dc +[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 fedc[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc +[^:]+:[ ]+607f 33cc 55aa cdef 89ab 4567 0123 3210 7654 ba98 fedc[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc --- a/gas/testsuite/gas/riscv/insn.d +++ b/gas/testsuite/gas/riscv/insn.d @@ -95,25 +95,25 @@ Disassembly of section .text: [^:]+:[ ]+607f 0000 0000 0000[ ]+[._a-z].* [^:]+:[ ]+0000 0000 0000 0000 ? [^:]+:[ ]+0000 0000 0000 ? -[^:]+:[ ]+007f 0000 0000 0000[ ]+\.byte[ ]+0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 +[^:]+:[ ]+007f 0000 0000 0000[ ]+\.2byte[ ]+0x007f, 0x0000, 0x0000, 0x0000, 0x8000 [^:]+:[ ]+8000 ? -[^:]+:[ ]+007f 0000 0000 0000[ ]+\.byte[ ]+0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 +[^:]+:[ ]+007f 0000 0000 0000[ ]+\.2byte[ ]+0x007f, 0x0000, 0x0000, 0x0000, 0x8000 [^:]+:[ ]+8000 ? -[^:]+:[ ]+607f 89ab 4567 0123[ ]+\.byte[ ]+0x7f, 0x60, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +[^:]+:[ ]+607f 89ab 4567 0123[ ]+\.2byte[ ]+0x607f, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc, 0x0000, 0x0000, 0x0000 [^:]+:[ ]+3210 7654 ba98 fedc ? [^:]+:[ ]+0000 0000 0000 ? -[^:]+:[ ]+607f 89ab 4567 0123[ ]+\.byte[ ]+0x7f, 0x60, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +[^:]+:[ ]+607f 89ab 4567 0123[ ]+\.2byte[ ]+0x607f, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc, 0x0000, 0x0000, 0x0000 [^:]+:[ ]+3210 7654 ba98 fedc ? [^:]+:[ ]+0000 0000 0000 ? -[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0x00 +[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0x00dc [^:]+:[ ]+89ab 4567 0123 3210 ? [^:]+:[ ]+7654 ba98 00dc ? -[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0x00 +[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0x00dc [^:]+:[ ]+89ab 4567 0123 3210 ? [^:]+:[ ]+7654 ba98 00dc ? -[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe +[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc [^:]+:[ ]+89ab 4567 0123 3210 ? [^:]+:[ ]+7654 ba98 fedc ? -[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.byte[ ]+0x7f, 0x60, 0xcc, 0x33, 0xaa, 0x55, 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe +[^:]+:[ ]+607f 33cc 55aa cdef[ ]+\.2byte[ ]+0x607f, 0x33cc, 0x55aa, 0xcdef, 0x89ab, 0x4567, 0x0123, 0x3210, 0x7654, 0xba98, 0xfedc [^:]+:[ ]+89ab 4567 0123 3210 ? [^:]+:[ ]+7654 ba98 fedc ? --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -800,16 +800,16 @@ riscv_disassemble_insn (bfd_vma memaddr, { int i; (*info->fprintf_styled_func) - (info->stream, dis_style_assembler_directive, ".byte"); + (info->stream, dis_style_assembler_directive, ".2byte"); (*info->fprintf_styled_func) (info->stream, dis_style_text, "\t"); - for (i = 0; i < insnlen; ++i) + for (i = 0; i < insnlen; i += 2) { if (i > 0) (*info->fprintf_styled_func) (info->stream, dis_style_text, ", "); + word = bfd_get_bits (packet + i, 16, false); (*info->fprintf_styled_func) (info->stream, dis_style_immediate, - "0x%02x", - (unsigned int) (*packet++)); + "0x%04x", (unsigned int) word); } } break;