Skip to content

Commit

Permalink
Update Rust to 1.67 to keep up with "cc"'s requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuelRiedel committed Jul 8, 2024
1 parent 0e10592 commit 04017f1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
rust:
- 1.63.0 # minimum supported version
- 1.67.0 # minimum supported version
steps:
- uses: actions/checkout@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ Banshee is a binary-translation-based, instruction-accurate RISC-V simulator for

## Requirements

Banshee currently requires Rust version 1.63.0 and LLVM 12.
Banshee currently requires Rust version 1.67.0 and LLVM 12.

To install Rust, visit [Rustup](https://rustup.rs/) and choose the correct version of Rust during the installation process.

If you already have Rust installed, get the specific version of the Rust with:

```bash
# Install the correct Rust version
rustup install 1.63.0
rustup install 1.67.0

# Change default toolchain version
rustup default 1.63.0
rustup default 1.67.0
```

To get LLVM on Ubuntu, install the following packages:
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.63.0"
channel = "1.67.0"
components = [ "rustfmt" ]
6 changes: 3 additions & 3 deletions src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl Engine {
);

// Parse the module.
let mut module = std::mem::MaybeUninit::uninit().assume_init();
let mut module = std::mem::MaybeUninit::zeroed().assume_init();
let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
if LLVMParseIRInContext(self.context, initial_buf, &mut module, &mut errmsg) != 0
|| !errmsg.is_null()
Expand Down Expand Up @@ -171,7 +171,7 @@ impl Engine {
);

// Parse the module.
let mut runtime = std::mem::MaybeUninit::uninit().assume_init();
let mut runtime = std::mem::MaybeUninit::zeroed().assume_init();
let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
if LLVMParseIRInContext(self.context, runtime_buf, &mut runtime, &mut errmsg) != 0
|| !errmsg.is_null()
Expand Down Expand Up @@ -337,7 +337,7 @@ impl Engine {
debug!("Creating JIT compiler for translated code");
let execs: Vec<_> = (0..self.num_clusters)
.map(|i| {
let mut ee = std::mem::MaybeUninit::uninit().assume_init();
let mut ee = std::mem::MaybeUninit::zeroed().assume_init();
let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
let optlevel = if self.opt_jit { 3 } else { 0 };
LLVMCreateJITCompilerForModule(&mut ee, self.modules[i], optlevel, &mut errmsg);
Expand Down

0 comments on commit 04017f1

Please sign in to comment.