diff options
| author | Bill McSpadden <bill@riscv.org> | 2024-05-23 09:22:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 09:22:09 -0500 |
| commit | a4e6cef876949b5e8a9db92da28484fadf64b307 (patch) | |
| tree | 443577a2ba9f87db1ffe80a1f0a89603125be29b | |
| parent | 66ebcc76bfc332f2cc8a643316efc71ff6423920 (diff) | |
| parent | 27c1d55b7ae67aa25034d49709dd835eb485c004 (diff) | |
| download | sail-riscv-a4e6cef876949b5e8a9db92da28484fadf64b307.zip sail-riscv-a4e6cef876949b5e8a9db92da28484fadf64b307.tar.gz sail-riscv-a4e6cef876949b5e8a9db92da28484fadf64b307.tar.bz2 | |
Merge pull request #473 from Timmmm/user/timh/remove_duplicate_mem_reads
Remove duplicate type declarations for mem_read
| -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) = { |