diff options
| author | Jerry Zhao <jerryz123@berkeley.edu> | 2023-03-27 10:30:02 -0700 |
|---|---|---|
| committer | Jerry Zhao <jerryz123@berkeley.edu> | 2023-03-29 00:49:32 -0700 |
| commit | 9641cf5b5a16328f8e97dc61869d5b55d7370871 (patch) | |
| tree | eca0f357f4ec2be8d58d10640e2e7c709e3a452a | |
| parent | 41934578a4b58861e75c3cfa17a600349dce5a7d (diff) | |
| download | riscv-isa-sim-9641cf5b5a16328f8e97dc61869d5b55d7370871.zip riscv-isa-sim-9641cf5b5a16328f8e97dc61869d5b55d7370871.tar.gz riscv-isa-sim-9641cf5b5a16328f8e97dc61869d5b55d7370871.tar.bz2 | |
Stop unconditionally adding zicntr_zihpm to extensions
| -rw-r--r-- | riscv/isa_parser.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/riscv/isa_parser.cc b/riscv/isa_parser.cc index caf91ea..2a8e33f 100644 --- a/riscv/isa_parser.cc +++ b/riscv/isa_parser.cc @@ -32,10 +32,6 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv) isa_string = strtolower(str); const char* all_subsets = "mafdqchpv"; - // enable zicntr and zihpm unconditionally for backward compatibility - extension_table[EXT_ZICNTR] = true; - extension_table[EXT_ZIHPM] = true; - if (isa_string.compare(0, 4, "rv32") == 0) max_xlen = 32; else if (isa_string.compare(0, 4, "rv64") == 0) @@ -229,9 +225,11 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv) extension_table[EXT_ZICBOZ] = true; } else if (ext_str == "zicbop") { } else if (ext_str == "zicntr") { + extension_table[EXT_ZICNTR] = true; } else if (ext_str == "zicond") { extension_table[EXT_ZICOND] = true; } else if (ext_str == "zihpm") { + extension_table[EXT_ZIHPM] = true; } else if (ext_str == "sstc") { extension_table[EXT_SSTC] = true; } else if (ext_str[0] == 'x') { |