From d3e694fbe71086d9521a79fb3a1e6f4daf4a092e Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Fri, 18 Oct 2019 16:04:51 +0200 Subject: [PATCH] [meta] Remove unused InstructionGroup::{name, doc}; --- cranelift/codegen/meta/src/cdsl/instructions.rs | 10 ---------- cranelift/codegen/meta/src/cdsl/xform.rs | 2 +- cranelift/codegen/meta/src/isa/arm32/mod.rs | 2 -- cranelift/codegen/meta/src/isa/arm64/mod.rs | 2 -- cranelift/codegen/meta/src/isa/riscv/mod.rs | 2 -- cranelift/codegen/meta/src/isa/x86/instructions.rs | 7 +------ cranelift/codegen/meta/src/shared/instructions.rs | 7 +------ 7 files changed, 3 insertions(+), 29 deletions(-) diff --git a/cranelift/codegen/meta/src/cdsl/instructions.rs b/cranelift/codegen/meta/src/cdsl/instructions.rs index 0e18ced843..e642a512a7 100644 --- a/cranelift/codegen/meta/src/cdsl/instructions.rs +++ b/cranelift/codegen/meta/src/cdsl/instructions.rs @@ -23,8 +23,6 @@ entity_impl!(OpcodeNumber); pub(crate) type AllInstructions = PrimaryMap; pub(crate) struct InstructionGroupBuilder<'format_reg, 'all_inst> { - _name: &'static str, - _doc: &'static str, format_registry: &'format_reg FormatRegistry, all_instructions: &'all_inst mut AllInstructions, own_instructions: Vec, @@ -32,14 +30,10 @@ pub(crate) struct InstructionGroupBuilder<'format_reg, 'all_inst> { impl<'format_reg, 'all_inst> InstructionGroupBuilder<'format_reg, 'all_inst> { pub fn new( - name: &'static str, - doc: &'static str, all_instructions: &'all_inst mut AllInstructions, format_registry: &'format_reg FormatRegistry, ) -> Self { Self { - _name: name, - _doc: doc, format_registry, all_instructions, own_instructions: Vec::new(), @@ -56,8 +50,6 @@ impl<'format_reg, 'all_inst> InstructionGroupBuilder<'format_reg, 'all_inst> { pub fn build(self) -> InstructionGroup { InstructionGroup { - _name: self._name, - _doc: self._doc, instructions: self.own_instructions, } } @@ -67,8 +59,6 @@ impl<'format_reg, 'all_inst> InstructionGroupBuilder<'format_reg, 'all_inst> { /// target architecture can support instructions from multiple groups, and it /// does not necessarily support all instructions in a group. pub(crate) struct InstructionGroup { - _name: &'static str, - _doc: &'static str, instructions: Vec, } diff --git a/cranelift/codegen/meta/src/cdsl/xform.rs b/cranelift/codegen/meta/src/cdsl/xform.rs index 916bdc0a32..6980998d70 100644 --- a/cranelift/codegen/meta/src/cdsl/xform.rs +++ b/cranelift/codegen/meta/src/cdsl/xform.rs @@ -471,7 +471,7 @@ fn test_double_custom_legalization() { let mut dummy_all = AllInstructions::new(); let mut format = FormatRegistry::new(); format.insert(InstructionFormatBuilder::new("nullary")); - let mut inst_group = InstructionGroupBuilder::new("test", "", &mut dummy_all, &format); + let mut inst_group = InstructionGroupBuilder::new(&mut dummy_all, &format); inst_group.push(InstructionBuilder::new("dummy", "doc")); let inst_group = inst_group.build(); let dummy_inst = inst_group.by_name("dummy"); diff --git a/cranelift/codegen/meta/src/isa/arm32/mod.rs b/cranelift/codegen/meta/src/isa/arm32/mod.rs index 1f3c05ad60..152d57d598 100644 --- a/cranelift/codegen/meta/src/isa/arm32/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm32/mod.rs @@ -54,8 +54,6 @@ pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let regs = define_regs(); let inst_group = InstructionGroupBuilder::new( - "arm32", - "arm32 specific instruction set", &mut shared_defs.all_instructions, &shared_defs.format_registry, ) diff --git a/cranelift/codegen/meta/src/isa/arm64/mod.rs b/cranelift/codegen/meta/src/isa/arm64/mod.rs index 15bfb736cc..3811cc25a6 100644 --- a/cranelift/codegen/meta/src/isa/arm64/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm64/mod.rs @@ -50,8 +50,6 @@ pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let regs = define_registers(); let inst_group = InstructionGroupBuilder::new( - "arm64", - "arm64 specific instruction set", &mut shared_defs.all_instructions, &shared_defs.format_registry, ) diff --git a/cranelift/codegen/meta/src/isa/riscv/mod.rs b/cranelift/codegen/meta/src/isa/riscv/mod.rs index 14eb3267f6..ef173176c0 100644 --- a/cranelift/codegen/meta/src/isa/riscv/mod.rs +++ b/cranelift/codegen/meta/src/isa/riscv/mod.rs @@ -90,8 +90,6 @@ pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let regs = define_registers(); let inst_group = InstructionGroupBuilder::new( - "riscv", - "riscv specific instruction set", &mut shared_defs.all_instructions, &shared_defs.format_registry, ) diff --git a/cranelift/codegen/meta/src/isa/x86/instructions.rs b/cranelift/codegen/meta/src/isa/x86/instructions.rs index 6ed1e88999..d5d02b1ac5 100644 --- a/cranelift/codegen/meta/src/isa/x86/instructions.rs +++ b/cranelift/codegen/meta/src/isa/x86/instructions.rs @@ -15,12 +15,7 @@ pub(crate) fn define( format_registry: &FormatRegistry, immediates: &Immediates, ) -> InstructionGroup { - let mut ig = InstructionGroupBuilder::new( - "x86", - "x86 specific instruction set", - &mut all_instructions, - format_registry, - ); + let mut ig = InstructionGroupBuilder::new(&mut all_instructions, format_registry); let iflags: &TypeVar = &ValueType::Special(types::Flag::IFlags.into()).into(); diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rs index e13871fa3c..f6d181def2 100644 --- a/cranelift/codegen/meta/src/shared/instructions.rs +++ b/cranelift/codegen/meta/src/shared/instructions.rs @@ -17,12 +17,7 @@ pub(crate) fn define( imm: &Immediates, entities: &EntityRefs, ) -> InstructionGroup { - let mut ig = InstructionGroupBuilder::new( - "base", - "Shared base instruction set", - all_instructions, - format_registry, - ); + let mut ig = InstructionGroupBuilder::new(all_instructions, format_registry); // Operand kind shorthands. let iflags: &TypeVar = &ValueType::Special(types::Flag::IFlags.into()).into();