bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix: appeased x.py test tidy --bless

Browse source
This commit is contained in:
linux1 2021-08-22 17:38:22 -04:00
parent eeb0b52bf8
commit 0c9e23c7ce
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_target/src/asm/mod.rs
View file

@ -257,7 +257,7 @@ impl InlineAsmReg {
Self::PowerPC(r) => r.name(), Self::PowerPC(r) => r.name(),
Self::Hexagon(r) => r.name(), Self::Hexagon(r) => r.name(),
Self::Mips(r) => r.name(), Self::Mips(r) => r.name(),
Self::S390x(r) => r.name(), Self::S390x(r) => r.name(),
Self::Bpf(r) => r.name(), Self::Bpf(r) => r.name(),
Self::Err => "<reg>", Self::Err => "<reg>",
} }
@ -312,7 +312,7 @@ impl InlineAsmReg {
InlineAsmArch::Mips | InlineAsmArch::Mips64 => { InlineAsmArch::Mips | InlineAsmArch::Mips64 => {
Self::Mips(MipsInlineAsmReg::parse(arch, has_feature, target, &name)?) Self::Mips(MipsInlineAsmReg::parse(arch, has_feature, target, &name)?)
} }
InlineAsmArch::S390x => { InlineAsmArch::S390x => {
Self::S390x(S390xInlineAsmReg::parse(arch, has_feature, target, &name)?) Self::S390x(S390xInlineAsmReg::parse(arch, has_feature, target, &name)?)
} }
InlineAsmArch::SpirV => { InlineAsmArch::SpirV => {
@ -715,11 +715,11 @@ pub fn allocatable_registers(
mips::fill_reg_map(arch, has_feature, target, &mut map); mips::fill_reg_map(arch, has_feature, target, &mut map);
map map
} }
InlineAsmArch::S390x => { InlineAsmArch::S390x => {
let mut map = s390x::regclass_map(); let mut map = s390x::regclass_map();
s390x::fill_reg_map(arch, has_feature, target, &mut map); s390x::fill_reg_map(arch, has_feature, target, &mut map);
map map
} }
InlineAsmArch::SpirV => { InlineAsmArch::SpirV => {
let mut map = spirv::regclass_map(); let mut map = spirv::regclass_map();
spirv::fill_reg_map(arch, has_feature, target, &mut map); spirv::fill_reg_map(arch, has_feature, target, &mut map);

2
compiler/rustc_target/src/asm/s390x.rs
View file

@ -113,7 +113,7 @@ def_regs! {
"c14 is reserved by the kernel and cannot be used as an operand for inline asm", "c14 is reserved by the kernel and cannot be used as an operand for inline asm",
#error = ["c15"] => #error = ["c15"] =>
"c15 is reserved by the kernel and cannot be used as an operand for inline asm", "c15 is reserved by the kernel and cannot be used as an operand for inline asm",
#error = ["a2"] => #error = ["a2"] =>
"a2 is not supported by LLVM and cannot be used as an operand for inline asm", "a2 is not supported by LLVM and cannot be used as an operand for inline asm",
#error = ["a3"] => #error = ["a3"] =>
"a3 is not supported by LLVM and cannot be used as an operand for inline asm", "a3 is not supported by LLVM and cannot be used as an operand for inline asm",

4
src/test/assembly/asm/s390x-types.rs
View file

@ -49,7 +49,7 @@ extern "Rust" {
} }
macro_rules! check { ($func:ident, $ty:ty, $class:ident, $mov:literal) => { macro_rules! check { ($func:ident, $ty:ty, $class:ident, $mov:literal) => {
#[no_mangle] #[no_mangle]
pub unsafe fn $func(x: $ty) -> $ty { pub unsafe fn $func(x: $ty) -> $ty {
dont_merge(stringify!(func)); dont_merge(stringify!(func));
@ -60,7 +60,7 @@ macro_rules! check { ($func:ident, $ty:ty, $class:ident, $mov:literal) => {
};} };}
macro_rules! check_reg { ($func:ident, $ty:ty, $reg:tt, $mov:literal) => { macro_rules! check_reg { ($func:ident, $ty:ty, $reg:tt, $mov:literal) => {
#[no_mangle] #[no_mangle]
pub unsafe fn $func(x: $ty) -> $ty { pub unsafe fn $func(x: $ty) -> $ty {
dont_merge(stringify!(func)); dont_merge(stringify!(func));