Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust to 1.67 to keep up with "cc"'s requirements #19

Merged
merged 1 commit into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading