diff options
| author | Bill McSpadden <bill@riscv.org> | 2024-06-03 12:24:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 12:24:47 -0500 |
| commit | b15c0d3bdc0e65eb54929ec120da5d9647879d13 (patch) | |
| tree | 30a982ce043ee8a6dec3d4ffcf8e295c56a44cdb /model/riscv_insts_aext.sail | |
| parent | e1663e985e2bc6c6311b6e81c296f6c4fd794e2d (diff) | |
| parent | 9194dd51e58ee6767d4494a04fdddb4635c6bfdc (diff) | |
| download | sail-riscv-b15c0d3bdc0e65eb54929ec120da5d9647879d13.zip sail-riscv-b15c0d3bdc0e65eb54929ec120da5d9647879d13.tar.gz sail-riscv-b15c0d3bdc0e65eb54929ec120da5d9647879d13.tar.bz2 | |
Merge pull request #468 from Timmmm/user/timh/cheri_width_bytes
Change ext_data_get_addr to use bytes for width
Diffstat (limited to 'model/riscv_insts_aext.sail')
| -rw-r--r-- | model/riscv_insts_aext.sail | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/model/riscv_insts_aext.sail b/model/riscv_insts_aext.sail index 2e0eb9c..4264997 100644 --- a/model/riscv_insts_aext.sail +++ b/model/riscv_insts_aext.sail @@ -64,7 +64,7 @@ function clause execute(LOADRES(aq, rl, rs1, width, rd)) = { /* Get the address, X(rs1) (no offset). * Extensions might perform additional checks on address validity. */ - match ext_data_get_addr(rs1, zeros(), Read(Data), width) { + match ext_data_get_addr(rs1, zeros(), Read(Data), size_bytes(width)) { Ext_DataAddr_Error(e) => { ext_handle_data_check_error(e); RETIRE_FAIL }, Ext_DataAddr_OK(vaddr) => { let aligned : bool = @@ -120,7 +120,7 @@ function clause execute (STORECON(aq, rl, rs2, rs1, width, rd)) = { /* Get the address, X(rs1) (no offset). * Extensions might perform additional checks on address validity. */ - match ext_data_get_addr(rs1, zeros(), Write(Data), width) { + match ext_data_get_addr(rs1, zeros(), Write(Data), size_bytes(width)) { Ext_DataAddr_Error(e) => { ext_handle_data_check_error(e); RETIRE_FAIL }, Ext_DataAddr_OK(vaddr) => { let aligned : bool = @@ -205,7 +205,7 @@ function clause execute (AMO(op, aq, rl, rs2, rs1, width, rd)) = { /* Get the address, X(rs1) (no offset). * Some extensions perform additional checks on address validity. */ - match ext_data_get_addr(rs1, zeros(), ReadWrite(Data, Data), width) { + match ext_data_get_addr(rs1, zeros(), ReadWrite(Data, Data), size_bytes(width)) { Ext_DataAddr_Error(e) => { ext_handle_data_check_error(e); RETIRE_FAIL }, Ext_DataAddr_OK(vaddr) => { match translateAddr(vaddr, ReadWrite(Data, Data)) { |