mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #154 from bjorn3/dependabot/cargo/cranelift-606eee5

Browse Source 
Bump cranelift from `fe081d3` to `606eee5`
This commit is contained in:
bjorn3 2018-11-15 10:56:25 +01:00 committed by GitHub
commit f42b7c8ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -98,7 +98,7 @@ dependencies = [
[[package]]
name = "cranelift"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-frontend 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
@ -107,7 +107,7 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-entity 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
]
@ -115,7 +115,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-bforest 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-codegen-meta 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
@ -129,7 +129,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-entity 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
]
@ -137,12 +137,12 @@ dependencies = [
[[package]]
name = "cranelift-entity"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
[[package]]
name = "cranelift-faerie"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-module 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
@ -155,7 +155,7 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -165,7 +165,7 @@ dependencies = [
[[package]]
name = "cranelift-module"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-entity 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
@ -176,7 +176,7 @@ dependencies = [
[[package]]
name = "cranelift-native"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"raw-cpuid 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -186,7 +186,7 @@ dependencies = [
[[package]]
name = "cranelift-simplejit"
version = "0.23.0"
source = "git+https://github.com/CraneStation/cranelift.git#fe081d3a4710e4f1393ecad17fcb988f01ac5ef0"
source = "git+https://github.com/CraneStation/cranelift.git#606eee5a6c4835b7cbbf5d8f05b83d62331fa61e"
dependencies = [
"cranelift-codegen 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-module 0.23.0 (git+https://github.com/CraneStation/cranelift.git)",

29
src/pretty_clif.rs
View File

@ -10,6 +10,26 @@ use crate::prelude::*;
pub struct CommentWriter(pub HashMap<Inst, String>);
impl FuncWriter for CommentWriter {
fn write_preamble(
&mut self,
w: &mut dyn fmt::Write,
func: &Function,
reg_info: Option<&isa::RegInfo>,
) -> Result<bool, fmt::Error> {
PlainWriter.write_preamble(w, func, reg_info)
}
fn write_ebb_header(
&mut self,
w: &mut dyn fmt::Write,
func: &Function,
isa: Option<&dyn isa::TargetIsa>,
ebb: Ebb,
indent: usize,
) -> fmt::Result {
PlainWriter.write_ebb_header(w, func, isa, ebb, indent)
}
fn write_instruction(
&mut self,
w: &mut dyn fmt::Write,
@ -25,15 +45,6 @@ impl FuncWriter for CommentWriter {
}
Ok(())
}
fn write_preamble(
&mut self,
w: &mut dyn fmt::Write,
func: &Function,
reg_info: Option<&isa::RegInfo>,
) -> Result<bool, fmt::Error> {
PlainWriter.write_preamble(w, func, reg_info)
}
}
impl<'a, 'tcx: 'a, B: Backend + 'a> FunctionCx<'a, 'tcx, B> {