Skip to content

Commit

Permalink
Merge pull request betrusted-io#572 from betrusted-io/fix-renode-aes
Browse files Browse the repository at this point in the history
renode: vexriscv: fix CPU on newer Renode versions
  • Loading branch information
bunnie authored Aug 20, 2024
2 parents 720213c + c49acbc commit 19de3e0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ Xous uses [Renode](https://renode.io/) as the preferred emulator, because
it is easy to extend the hardware peripherals without recompiling the
entire emulator.

Due to a breaking change in Renode, this codebase is only compatible with Renode equal to or later than `1.15.2.7965 (e6e79aad-202408180425)`

[Download Renode](https://renode.io/#downloads) and ensure it is in your path.
For now, you need to [download the nightly build](https://dl.antmicro.com/projects/renode/builds/),
until `DecodedOperation` is included in the release.
Expand Down
5 changes: 4 additions & 1 deletion RELEASE-v0.9.md
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,10 @@ perform the Xous firmware upgrade. This requires running manual update commands,
- USB core able to enumerate, communicate to Linux devices. Windows compat still WIP.
- Mailbox protocol to other devices has been tested, working.
- TRNG has been tuned, partially validated.

- BIO-BDMA test cases added
- Various fixes to track changes in Rust 1.80
- Add documentation to the `modals` library (thanks @rowr111)
- Due to a breaking change in Renode, this release is only compatible with Renode equal to or later than 1.15.2.7965(e6e79aad-202408180425) (see issue #570 / PR #572)

## Roadmap
- Lots of testing and bug fixes
Expand Down
2 changes: 1 addition & 1 deletion emulation/peripherals/vexriscv-aes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AesVexRiscv : VexRiscv
public AesVexRiscv(Core.Machine machine,
uint hartId = 0,
IRiscVTimeProvider timeProvider = null,
PrivilegeArchitecture privilegeArchitecture = PrivilegeArchitecture.Priv1_10,
PrivilegedArchitecture privilegeArchitecture = PrivilegedArchitecture.Priv1_10,
string cpuType = "rv32im",
bool builtInIrqController = true) : base(machine, hartId, timeProvider, privilegeArchitecture, cpuType, builtInIrqController)
{
Expand Down

0 comments on commit 19de3e0

Please sign in to comment.