diff options
| author | Tim Hutt <timothy.hutt@codasip.com> | 2024-05-14 14:53:45 +0100 |
|---|---|---|
| committer | Tim Hutt <timothy.hutt@codasip.com> | 2024-05-15 17:37:19 +0100 |
| commit | 27c1d55b7ae67aa25034d49709dd835eb485c004 (patch) | |
| tree | 7b676fff398a31c78c32e0fd5ff646516452d1f6 | |
| parent | e1242d851d6b27b357bfb31d46c8f08e18fb768b (diff) | |
| download | sail-riscv-27c1d55b7ae67aa25034d49709dd835eb485c004.zip sail-riscv-27c1d55b7ae67aa25034d49709dd835eb485c004.tar.gz sail-riscv-27c1d55b7ae67aa25034d49709dd835eb485c004.tar.bz2 | |
Remove duplicate type declarations for mem_read
These used to be different because they had different effects annotations, but those have since been removed and now they are the same.
| -rw-r--r-- | model/riscv_mem.sail | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/model/riscv_mem.sail b/model/riscv_mem.sail index ccf4d2f..82227ad 100644 --- a/model/riscv_mem.sail +++ b/model/riscv_mem.sail @@ -136,18 +136,10 @@ val rvfi_read : forall 'n, 'n > 0. (xlenbits, int('n), MemoryOpResult((bits(8 * function rvfi_read (addr, width, result) = () $endif -/* NOTE: The rreg effect is due to MMIO. */ -$ifdef RVFI_DII val mem_read : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), xlenbits, int('n), bool, bool, bool) -> MemoryOpResult(bits(8 * 'n)) val mem_read_priv : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), Privilege, xlenbits, int('n), bool, bool, bool) -> MemoryOpResult(bits(8 * 'n)) val mem_read_meta : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), xlenbits, int('n), bool, bool, bool, bool) -> MemoryOpResult((bits(8 * 'n), mem_meta)) val mem_read_priv_meta : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), Privilege, xlenbits, int('n), bool, bool, bool, bool) -> MemoryOpResult((bits(8 * 'n), mem_meta)) -$else -val mem_read : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), xlenbits, int('n), bool, bool, bool) -> MemoryOpResult(bits(8 * 'n)) -val mem_read_priv : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), Privilege, xlenbits, int('n), bool, bool, bool) -> MemoryOpResult(bits(8 * 'n)) -val mem_read_meta : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), xlenbits, int('n), bool, bool, bool, bool) -> MemoryOpResult((bits(8 * 'n), mem_meta)) -val mem_read_priv_meta : forall 'n, 0 < 'n <= max_mem_access . (AccessType(ext_access_type), Privilege, xlenbits, int('n), bool, bool, bool, bool) -> MemoryOpResult((bits(8 * 'n), mem_meta)) -$endif /* The most generic memory read operation */ function mem_read_priv_meta (typ, priv, paddr, width, aq, rl, res, meta) = { |