Skip to content

Use Symbol for inline asm register class names #79917

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 11, 2020
Merged

Use Symbol for inline asm register class names #79917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions compiler/rustc_span/src/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ symbols! {
document_private_items,
dotdot_in_tuple_patterns,
dotdoteq_in_patterns,
dreg,
dreg_low16,
dreg_low8,
drop,
drop_in_place,
drop_types_in_const,
Expand Down Expand Up @@ -544,6 +547,7 @@ symbols! {
format_args_capture,
format_args_nl,
freeze,
freg,
frem_fast,
from,
from_desugaring,
Expand Down Expand Up @@ -627,6 +631,7 @@ symbols! {
iter,
keyword,
kind,
kreg,
label,
label_break_value,
lang,
Expand All @@ -652,6 +657,7 @@ symbols! {
lint_reasons,
literal,
llvm_asm,
local,
local_inner_macros,
log10f32,
log10f64,
Expand Down Expand Up @@ -854,6 +860,9 @@ symbols! {
pub_restricted,
pure,
pushpop_unsafe,
qreg,
qreg_low4,
qreg_low8,
quad_precision_float,
question_mark,
quote,
Expand All @@ -875,6 +884,13 @@ symbols! {
reexport_test_harness_main,
reference,
reflect,
reg,
reg16,
reg32,
reg64,
reg_abcd,
reg_byte,
reg_thumb,
register_attr,
register_tool,
relaxed_adts,
Expand Down Expand Up @@ -1060,6 +1076,8 @@ symbols! {
spotlight,
sqrtf32,
sqrtf64,
sreg,
sreg_low16,
sse4a_target_feature,
stable,
staged_api,
Expand Down Expand Up @@ -1215,6 +1233,8 @@ symbols! {
volatile_load,
volatile_set_memory,
volatile_store,
vreg,
vreg_low16,
warn,
wasm_import_module,
wasm_target_feature,
Expand All @@ -1226,6 +1246,9 @@ symbols! {
wrapping_mul,
wrapping_sub,
write_bytes,
xmm_reg,
ymm_reg,
zmm_reg,
}
}

Expand Down
51 changes: 22 additions & 29 deletions compiler/rustc_target/src/asm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ macro_rules! def_reg_class {
}

impl $arch_regclass {
pub fn name(self) -> &'static str {
pub fn name(self) -> rustc_span::Symbol {
match self {
$(Self::$class => stringify!($class),)*
$(Self::$class => rustc_span::symbol::sym::$class,)*
}
}

pub fn parse(_arch: super::InlineAsmArch, name: &str) -> Result<Self, &'static str> {
pub fn parse(_arch: super::InlineAsmArch, name: rustc_span::Symbol) -> Result<Self, &'static str> {
match name {
$(
stringify!($class) => Ok(Self::$class),
rustc_span::sym::$class => Ok(Self::$class),
)*
_ => Err("unknown register class"),
}
Expand Down Expand Up @@ -327,7 +327,7 @@ pub enum InlineAsmRegClass {
}

impl InlineAsmRegClass {
pub fn name(self) -> &'static str {
pub fn name(self) -> Symbol {
match self {
Self::X86(r) => r.name(),
Self::Arm(r) => r.name(),
Expand Down Expand Up @@ -422,29 +422,22 @@ impl InlineAsmRegClass {
}

pub fn parse(arch: InlineAsmArch, name: Symbol) -> Result<Self, &'static str> {
// FIXME: use direct symbol comparison for register class names
name.with(|name| {
Ok(match arch {
InlineAsmArch::X86 | InlineAsmArch::X86_64 => {
Self::X86(X86InlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::Arm => Self::Arm(ArmInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::AArch64 => {
Self::AArch64(AArch64InlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::RiscV32 | InlineAsmArch::RiscV64 => {
Self::RiscV(RiscVInlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::Nvptx64 => Self::Nvptx(NvptxInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::Hexagon => {
Self::Hexagon(HexagonInlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::Mips | InlineAsmArch::Mips64 => {
Self::Mips(MipsInlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::SpirV => Self::SpirV(SpirVInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::Wasm32 => Self::Wasm(WasmInlineAsmRegClass::parse(arch, name)?),
})
Ok(match arch {
InlineAsmArch::X86 | InlineAsmArch::X86_64 => {
Self::X86(X86InlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::Arm => Self::Arm(ArmInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::AArch64 => Self::AArch64(AArch64InlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::RiscV32 | InlineAsmArch::RiscV64 => {
Self::RiscV(RiscVInlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::Nvptx64 => Self::Nvptx(NvptxInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::Hexagon => Self::Hexagon(HexagonInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::Mips | InlineAsmArch::Mips64 => {
Self::Mips(MipsInlineAsmRegClass::parse(arch, name)?)
}
InlineAsmArch::SpirV => Self::SpirV(SpirVInlineAsmRegClass::parse(arch, name)?),
InlineAsmArch::Wasm32 => Self::Wasm(WasmInlineAsmRegClass::parse(arch, name)?),
})
}

Expand Down Expand Up @@ -484,7 +477,7 @@ impl fmt::Display for InlineAsmRegOrRegClass {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Reg(r) => write!(f, "\"{}\"", r.name()),
Self::RegClass(r) => f.write_str(r.name()),
Self::RegClass(r) => write!(f, "{}", r.name()),
}
}
}
Expand Down