b239b0b2d5
- sw_64: Added sw64 architecture related updates - virtio-crypto: verify src&dst buffer length for sym request - vhost-vdpa: do not cleanup the vdpa/vhost-net structures if peer nic is present - qga: Fix suspend on Linux guests without systemd - tests: vhost-user-test: release mutex on protocol violation - qapi: support updating expected test output via make - block: Fix misleading hexadecimal format - block/rbd: fix write zeroes with growing images - block/nbd.c: Fixed IO request coroutine not being wakeup when kill NBD server - block/nfs: Fix 32-bit Windows build - qapi/qdev: Tidy up device_add documentation - hw/xen/xen_pt: fix uninitialized variable - migration/ram: Fix error handling in ram_write_tracking_start() - docs/about/build-platforms: Refine the distro support policy - xen-block: Avoid leaks on new error path - QGA VSS: Add wrapper to send log to debugger and stderr - chardev/char-socket: set s->listener = NULL in char_socket_finalize - qapi/block: Tidy up block-latency-histogram-set documentation - disas/riscv Fix ctzw disassemble - vfio: Fix vfio_get_dev_region() trace event - migration/ram: Fix populate_read_range() - Check and report for incomplete 'global' option format Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 6872e7bf919dd5f2852c07850899cdb510eccfdf Mon Sep 17 00:00:00 2001
|
|
From: xiaowanghe <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 1 Aug 2023 23:46:43 -0700
|
|
Subject: [PATCH] disas/riscv Fix ctzw disassemble
|
|
|
|
cherry picked from commit 270629024df1f9f4e704ce8325f958858c5cbff7
|
|
|
|
Due to typo in opcode list, ctzw is disassembled as clzw instruction.
|
|
|
|
Signed-off-by: Ivan Klokov <ivan.klokov@syntacore.com>
|
|
Fixes: 02c1b569a15b ("disas/riscv: Add Zb[abcs] instructions")
|
|
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
|
|
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
|
|
Message-ID: <20230217151459.54649-1-ivan.klokov@syntacore.com>
|
|
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
|
|
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
---
|
|
disas/riscv.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/disas/riscv.c b/disas/riscv.c
|
|
index 793ad14c27..6768ec8188 100644
|
|
--- a/disas/riscv.c
|
|
+++ b/disas/riscv.c
|
|
@@ -1189,7 +1189,7 @@ const rv_opcode_data opcode_data[] = {
|
|
{ "max", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 },
|
|
{ "maxu", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 },
|
|
{ "clzw", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 },
|
|
- { "clzw", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 },
|
|
+ { "ctzw", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 },
|
|
{ "cpopw", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 },
|
|
{ "slli.uw", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 },
|
|
{ "add.uw", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 },
|
|
--
|
|
2.41.0.windows.1
|
|
|