From 9882cd202b458601c6eb7cb1cb016146df7d20d3 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Thu, 22 Jan 2026 15:03:02 -0800 Subject: [PATCH] Zicfiss depends on Zaamo So, no need to check for Zaamo in the instruction definitions --- disasm/isa_parser.cc | 1 + riscv/insns/ssamoswap_d.h | 1 - riscv/insns/ssamoswap_w.h | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/disasm/isa_parser.cc b/disasm/isa_parser.cc index 104a4dc9..a2bfc857 100644 --- a/disasm/isa_parser.cc +++ b/disasm/isa_parser.cc @@ -394,6 +394,7 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv) extension_table[EXT_ZICFILP] = true; } else if (ext_str == "zicfiss") { extension_table[EXT_ZICFISS] = true; + extension_table[EXT_ZAAMO] = true; } else if (ext_str == "smmpm") { extension_table[EXT_SMMPM] = true; } else if (ext_str == "smnpm") { diff --git a/riscv/insns/ssamoswap_d.h b/riscv/insns/ssamoswap_d.h index 4169ac3e..0aa30cc1 100644 --- a/riscv/insns/ssamoswap_d.h +++ b/riscv/insns/ssamoswap_d.h @@ -1,5 +1,4 @@ require_extension(EXT_ZICFISS); -require_extension(EXT_ZAAMO); require_rv64; DECLARE_XENVCFG_VARS(SSE); diff --git a/riscv/insns/ssamoswap_w.h b/riscv/insns/ssamoswap_w.h index d971ebec..7abc3a36 100644 --- a/riscv/insns/ssamoswap_w.h +++ b/riscv/insns/ssamoswap_w.h @@ -1,5 +1,4 @@ require_extension(EXT_ZICFISS); -require_extension(EXT_ZAAMO); DECLARE_XENVCFG_VARS(SSE); require_envcfg(SSE);