diff options
| author | Andrew Waterman <andrew@sifive.com> | 2023-02-03 12:40:17 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2023-02-04 15:20:08 -0800 |
| commit | c790cfd3b7e87f69b6c43018f1ccdbf188188d49 (patch) | |
| tree | 506594666880f04091dd97dd0d957b020957a155 /riscv/processor.h | |
| parent | 4eaaf47c3a55b5439c87857be5501f7c3414035a (diff) | |
| download | spike-plctlab-plct-zce-fix2.zip spike-plctlab-plct-zce-fix2.tar.gz spike-plctlab-plct-zce-fix2.tar.bz2 | |
Contain C/Zc*-enable logic entirely within misa_csr_tplctlab-plct-zce-fix2
For DRY purposes, processor_t::set_extension_enable checks
isa_t::extension_enabled, rather than relying on the caller to do so.
Diffstat (limited to 'riscv/processor.h')
| -rw-r--r-- | riscv/processor.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/riscv/processor.h b/riscv/processor.h index 4caea61..ca22d59 100644 --- a/riscv/processor.h +++ b/riscv/processor.h @@ -216,15 +216,6 @@ public: bool any_custom_extensions() const { return !custom_extensions.empty(); } - // Only the extensions supported in isa string can be changeable - bool extension_changeable(unsigned char ext) const { - return isa->extension_enabled(ext) && - (ext == EXT_ZCF || ext == EXT_ZCD || - (ext == EXT_ZCA && isa->extension_enabled('C') && - !(isa->extension_enabled(EXT_ZCB) || - isa->extension_enabled(EXT_ZCMP) || - isa->extension_enabled(EXT_ZCMT)))); - } bool extension_enabled(unsigned char ext) const { return extension_enabled(isa_extension_t(ext)); } @@ -244,14 +235,11 @@ public: if (ext >= 'A' && ext <= 'Z') return state.misa->extension_enabled_const(ext); else { - assert(!extension_changeable(ext)); return isa->extension_enabled(ext); } } - // Only the changeable extensions can be disabled/enabled void set_extension_enable(unsigned char ext, bool enable) { - if (extension_changeable(ext)) - extension_enable_table[ext] = enable; + extension_enable_table[ext] = enable && isa->extension_enabled(ext); } void set_impl(uint8_t impl, bool val) { impl_table[impl] = val; } bool supports_impl(uint8_t impl) const { |