Skip to content

Commit 5f8a8b3

Browse files
authored
feat(diff): support Sstc extension and set csr init (#55)
* feat(diff): support Sstc extension * fix(csr): set xtimecmp and m/henvcfg init when Sstc extension enable
1 parent 37bfda6 commit 5f8a8b3

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

difftest/difftest-def.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
"_zfa_zfh_zvfh" \
8181
"_svinval_sscofpmf" \
8282
"_svpbmt" \
83-
"_zicbom_zicboz"
83+
"_zicbom_zicboz" \
84+
"_sstc"
8485

8586
#define CONFIG_MEMORY_SIZE (16 * 1024 * 1024 * 1024UL)
8687
#define CONFIG_FLASH_BASE 0x10000000UL

riscv/csr_init.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
271271
(proc->extension_enabled(EXT_ZICFISS) ? MENVCFG_SSE : 0) |
272272
(proc->extension_enabled(EXT_SSDBLTRP) ? MENVCFG_DTE : 0);
273273
const reg_t menvcfg_init = (proc->extension_enabled(EXT_ZICBOM) ? MENVCFG_CBCFE | MENVCFG_CBIE : 0) |
274-
(proc->extension_enabled(EXT_ZICBOZ) ? MENVCFG_CBZE : 0);
274+
(proc->extension_enabled(EXT_ZICBOZ) ? MENVCFG_CBZE : 0) |
275+
(proc->extension_enabled(EXT_SSTC) ? MENVCFG_STCE : 0);
275276
menvcfg = std::make_shared<envcfg_csr_t>(proc, CSR_MENVCFG, menvcfg_mask, menvcfg_init);
276277
if (xlen == 32) {
277278
add_user_csr(CSR_MENVCFG, std::make_shared<rv32_low_csr_t>(proc, CSR_MENVCFG, menvcfg));
@@ -298,7 +299,8 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
298299
(proc->extension_enabled(EXT_ZICFISS) ? HENVCFG_SSE : 0) |
299300
(proc->extension_enabled(EXT_SSDBLTRP) ? HENVCFG_DTE : 0);
300301
const reg_t henvcfg_init = (proc->extension_enabled(EXT_ZICBOM) ? HENVCFG_CBCFE | HENVCFG_CBIE : 0) |
301-
(proc->extension_enabled(EXT_ZICBOZ) ? HENVCFG_CBZE : 0);
302+
(proc->extension_enabled(EXT_ZICBOZ) ? HENVCFG_CBZE : 0) |
303+
(proc->extension_enabled(EXT_SSTC) ? HENVCFG_STCE : 0);
302304
henvcfg = std::make_shared<henvcfg_csr_t>(proc, CSR_HENVCFG, henvcfg_mask, henvcfg_init, menvcfg);
303305
if (xlen == 32) {
304306
add_hypervisor_csr(CSR_HENVCFG, std::make_shared<rv32_low_csr_t>(proc, CSR_HENVCFG, henvcfg));

riscv/csrs.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ bool henvcfg_csr_t::unlogged_write(const reg_t val) noexcept {
17401740
}
17411741

17421742
stimecmp_csr_t::stimecmp_csr_t(processor_t* const proc, const reg_t addr, const reg_t imask):
1743-
basic_csr_t(proc, addr, 0), intr_mask(imask) {
1743+
basic_csr_t(proc, addr, 0xffffffffffffffff), intr_mask(imask) {
17441744
}
17451745

17461746
bool stimecmp_csr_t::unlogged_write(const reg_t val) noexcept {

0 commit comments

Comments
 (0)