diff --git a/cranelift/codegen/meta/src/cdsl/ast.rs b/cranelift/codegen/meta/src/cdsl/ast.rs index 5e1c192f0f..141ffd84c2 100644 --- a/cranelift/codegen/meta/src/cdsl/ast.rs +++ b/cranelift/codegen/meta/src/cdsl/ast.rs @@ -11,7 +11,6 @@ use std::fmt; pub enum Expr { Var(VarIndex), Literal(Literal), - Apply(Apply), } impl Expr { @@ -39,7 +38,6 @@ impl Expr { match self { Expr::Var(var_index) => var_pool.get(*var_index).to_rust_code(), Expr::Literal(literal) => literal.to_rust_code(), - Expr::Apply(a) => a.to_rust_code(var_pool), } } } @@ -81,9 +79,6 @@ impl DefPool { pub fn get(&self, index: DefIndex) -> &Def { self.pool.get(index).unwrap() } - pub fn get_mut(&mut self, index: DefIndex) -> &mut Def { - self.pool.get_mut(index).unwrap() - } pub fn next_index(&self) -> DefIndex { self.pool.next_key() } @@ -430,16 +425,6 @@ impl Apply { format!("{}({})", inst_name, args) } - fn to_rust_code(&self, var_pool: &VarPool) -> String { - let args = self - .args - .iter() - .map(|arg| arg.to_rust_code(var_pool)) - .collect::>() - .join(", "); - format!("{}({})", self.inst.name, args) - } - pub fn inst_predicate( &self, format_registry: &FormatRegistry, diff --git a/cranelift/codegen/meta/src/cdsl/instructions.rs b/cranelift/codegen/meta/src/cdsl/instructions.rs index da59beb2b0..1689f2a5c0 100644 --- a/cranelift/codegen/meta/src/cdsl/instructions.rs +++ b/cranelift/codegen/meta/src/cdsl/instructions.rs @@ -4,7 +4,6 @@ use std::collections::HashMap; use std::fmt; use std::ops; use std::rc::Rc; -use std::slice; use crate::cdsl::camel_case; use crate::cdsl::formats::{ @@ -72,10 +71,6 @@ pub struct InstructionGroup { } impl InstructionGroup { - pub fn iter(&self) -> slice::Iter { - self.instructions.iter() - } - pub fn by_name(&self, name: &'static str) -> &Instruction { self.instructions .iter() diff --git a/cranelift/codegen/meta/src/cdsl/xform.rs b/cranelift/codegen/meta/src/cdsl/xform.rs index e988bf12ac..b1a0234cd4 100644 --- a/cranelift/codegen/meta/src/cdsl/xform.rs +++ b/cranelift/codegen/meta/src/cdsl/xform.rs @@ -384,9 +384,6 @@ impl TransformGroups { pub fn get(&self, id: TransformGroupIndex) -> &TransformGroup { &self.groups[id] } - pub fn get_mut(&mut self, id: TransformGroupIndex) -> &mut TransformGroup { - self.groups.get_mut(id).unwrap() - } fn next_key(&self) -> TransformGroupIndex { self.groups.next_key() } diff --git a/cranelift/codegen/meta/src/gen_encodings.rs b/cranelift/codegen/meta/src/gen_encodings.rs index 71fcf17002..cfaa63f087 100644 --- a/cranelift/codegen/meta/src/gen_encodings.rs +++ b/cranelift/codegen/meta/src/gen_encodings.rs @@ -1126,7 +1126,7 @@ fn gen_isa(defs: &SharedDefinitions, isa: &TargetIsa, fmt: &mut Formatter) { fmt.line("};"); } -pub fn generate( +pub(crate) fn generate( defs: &SharedDefinitions, isa: &TargetIsa, filename: &str, diff --git a/cranelift/codegen/meta/src/gen_inst.rs b/cranelift/codegen/meta/src/gen_inst.rs index 5dbb9dc095..7d8353dad3 100644 --- a/cranelift/codegen/meta/src/gen_inst.rs +++ b/cranelift/codegen/meta/src/gen_inst.rs @@ -1059,7 +1059,7 @@ fn gen_builder(instructions: &AllInstructions, formats: &FormatRegistry, fmt: &m fmt.line("}"); } -pub fn generate( +pub(crate) fn generate( shared_defs: &SharedDefinitions, opcode_filename: &str, inst_builder_filename: &str, diff --git a/cranelift/codegen/meta/src/isa/arm32/mod.rs b/cranelift/codegen/meta/src/isa/arm32/mod.rs index d143a15163..fb41db2530 100644 --- a/cranelift/codegen/meta/src/isa/arm32/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm32/mod.rs @@ -49,7 +49,7 @@ fn define_regs() -> IsaRegs { regs.build() } -pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { +pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let settings = define_settings(&shared_defs.settings); let regs = define_regs(); diff --git a/cranelift/codegen/meta/src/isa/arm64/mod.rs b/cranelift/codegen/meta/src/isa/arm64/mod.rs index 195fc80ae6..697e9513c5 100644 --- a/cranelift/codegen/meta/src/isa/arm64/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm64/mod.rs @@ -45,7 +45,7 @@ fn define_registers() -> IsaRegs { regs.build() } -pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { +pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let settings = define_settings(&shared_defs.settings); let regs = define_registers(); diff --git a/cranelift/codegen/meta/src/isa/mod.rs b/cranelift/codegen/meta/src/isa/mod.rs index 0c2bb5eed0..6c5ba13888 100644 --- a/cranelift/codegen/meta/src/isa/mod.rs +++ b/cranelift/codegen/meta/src/isa/mod.rs @@ -55,7 +55,7 @@ impl fmt::Display for Isa { } } -pub fn define(isas: &Vec, shared_defs: &mut SharedDefinitions) -> Vec { +pub(crate) fn define(isas: &Vec, shared_defs: &mut SharedDefinitions) -> Vec { isas.iter() .map(|isa| match isa { Isa::Riscv => riscv::define(shared_defs), diff --git a/cranelift/codegen/meta/src/isa/riscv/encodings.rs b/cranelift/codegen/meta/src/isa/riscv/encodings.rs index af5e471a53..02a3bc7b61 100644 --- a/cranelift/codegen/meta/src/isa/riscv/encodings.rs +++ b/cranelift/codegen/meta/src/isa/riscv/encodings.rs @@ -101,7 +101,7 @@ fn lui_bits() -> u16 { 0b01101 } -pub fn define<'defs>( +pub(crate) fn define<'defs>( shared_defs: &'defs SharedDefinitions, isa_settings: &SettingGroup, recipes: &'defs RecipeGroup, diff --git a/cranelift/codegen/meta/src/isa/riscv/mod.rs b/cranelift/codegen/meta/src/isa/riscv/mod.rs index 435b38eb34..a2683b5a8b 100644 --- a/cranelift/codegen/meta/src/isa/riscv/mod.rs +++ b/cranelift/codegen/meta/src/isa/riscv/mod.rs @@ -85,7 +85,7 @@ fn define_registers() -> IsaRegs { regs.build() } -pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { +pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let settings = define_settings(&shared_defs.settings); let regs = define_registers(); diff --git a/cranelift/codegen/meta/src/isa/riscv/recipes.rs b/cranelift/codegen/meta/src/isa/riscv/recipes.rs index 40396b4ab3..f32bbd568c 100644 --- a/cranelift/codegen/meta/src/isa/riscv/recipes.rs +++ b/cranelift/codegen/meta/src/isa/riscv/recipes.rs @@ -50,7 +50,7 @@ impl<'formats> RecipeGroup<'formats> { } } -pub fn define<'formats>( +pub(crate) fn define<'formats>( shared_defs: &'formats SharedDefinitions, regs: &IsaRegs, ) -> RecipeGroup<'formats> { diff --git a/cranelift/codegen/meta/src/isa/x86/encodings.rs b/cranelift/codegen/meta/src/isa/x86/encodings.rs index 072cbb1b2a..ecdff33740 100644 --- a/cranelift/codegen/meta/src/isa/x86/encodings.rs +++ b/cranelift/codegen/meta/src/isa/x86/encodings.rs @@ -318,7 +318,7 @@ impl PerCpuModeEncodings { // Definitions. -pub fn define( +pub(crate) fn define( shared_defs: &SharedDefinitions, settings: &SettingGroup, x86: &InstructionGroup, diff --git a/cranelift/codegen/meta/src/isa/x86/instructions.rs b/cranelift/codegen/meta/src/isa/x86/instructions.rs index 742b632642..03730cdeac 100644 --- a/cranelift/codegen/meta/src/isa/x86/instructions.rs +++ b/cranelift/codegen/meta/src/isa/x86/instructions.rs @@ -10,7 +10,7 @@ use crate::cdsl::typevar::{Interval, TypeSetBuilder, TypeVar}; use crate::shared::immediates::Immediates; use crate::shared::types; -pub fn define( +pub(crate) fn define( mut all_instructions: &mut AllInstructions, format_registry: &FormatRegistry, immediates: &Immediates, diff --git a/cranelift/codegen/meta/src/isa/x86/legalize.rs b/cranelift/codegen/meta/src/isa/x86/legalize.rs index 158b05e4f1..2fd160de3a 100644 --- a/cranelift/codegen/meta/src/isa/x86/legalize.rs +++ b/cranelift/codegen/meta/src/isa/x86/legalize.rs @@ -6,7 +6,7 @@ use crate::shared::types::Float::F64; use crate::shared::types::Int::{I32, I64}; use crate::shared::Definitions as SharedDefinitions; -pub fn define(shared: &mut SharedDefinitions, x86_instructions: &InstructionGroup) { +pub(crate) fn define(shared: &mut SharedDefinitions, x86_instructions: &InstructionGroup) { let mut group = TransformGroupBuilder::new( "x86_expand", r#" diff --git a/cranelift/codegen/meta/src/isa/x86/mod.rs b/cranelift/codegen/meta/src/isa/x86/mod.rs index 5122c7b2ad..10baf256a9 100644 --- a/cranelift/codegen/meta/src/isa/x86/mod.rs +++ b/cranelift/codegen/meta/src/isa/x86/mod.rs @@ -13,7 +13,7 @@ mod recipes; mod registers; mod settings; -pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { +pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa { let settings = settings::define(&shared_defs.settings); let regs = registers::define(); diff --git a/cranelift/codegen/meta/src/isa/x86/recipes.rs b/cranelift/codegen/meta/src/isa/x86/recipes.rs index 8eb0fdac6d..6a369f34c6 100644 --- a/cranelift/codegen/meta/src/isa/x86/recipes.rs +++ b/cranelift/codegen/meta/src/isa/x86/recipes.rs @@ -325,7 +325,7 @@ fn valid_scale(format: &InstructionFormat) -> InstructionPredicate { }) } -pub fn define<'shared>( +pub(crate) fn define<'shared>( shared_defs: &'shared SharedDefinitions, settings: &'shared SettingGroup, regs: &'shared IsaRegs, diff --git a/cranelift/codegen/meta/src/shared/formats.rs b/cranelift/codegen/meta/src/shared/formats.rs index d631f337c2..5309afc1b0 100644 --- a/cranelift/codegen/meta/src/shared/formats.rs +++ b/cranelift/codegen/meta/src/shared/formats.rs @@ -1,7 +1,7 @@ use crate::cdsl::formats::{FormatRegistry, InstructionFormatBuilder as Builder}; use crate::shared::{entities::EntityRefs, immediates::Immediates}; -pub fn define(imm: &Immediates, entities: &EntityRefs) -> FormatRegistry { +pub(crate) fn define(imm: &Immediates, entities: &EntityRefs) -> FormatRegistry { let mut registry = FormatRegistry::new(); registry.insert(Builder::new("Unary").value()); diff --git a/cranelift/codegen/meta/src/shared/immediates.rs b/cranelift/codegen/meta/src/shared/immediates.rs index b7a7f712a2..30c1a73970 100644 --- a/cranelift/codegen/meta/src/shared/immediates.rs +++ b/cranelift/codegen/meta/src/shared/immediates.rs @@ -2,7 +2,7 @@ use crate::cdsl::operands::{OperandKind, OperandKindBuilder as Builder}; use std::collections::HashMap; -pub struct Immediates { +pub(crate) struct Immediates { /// A 64-bit immediate integer operand. /// /// This type of immediate integer can interact with SSA values with any IntType type. diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rs index 9499bf190a..f636141a37 100644 --- a/cranelift/codegen/meta/src/shared/instructions.rs +++ b/cranelift/codegen/meta/src/shared/instructions.rs @@ -11,7 +11,7 @@ use crate::cdsl::typevar::{Interval, TypeSetBuilder, TypeVar}; use crate::shared::types; use crate::shared::{entities::EntityRefs, immediates::Immediates}; -pub fn define( +pub(crate) fn define( all_instructions: &mut AllInstructions, format_registry: &FormatRegistry, imm: &Immediates, diff --git a/cranelift/codegen/meta/src/shared/legalize.rs b/cranelift/codegen/meta/src/shared/legalize.rs index ce2faa7720..90fe47d0fd 100644 --- a/cranelift/codegen/meta/src/shared/legalize.rs +++ b/cranelift/codegen/meta/src/shared/legalize.rs @@ -6,7 +6,7 @@ use crate::shared::immediates::Immediates; use crate::shared::types::Float::{F32, F64}; use crate::shared::types::Int::{I16, I32, I64, I8}; -pub fn define(insts: &InstructionGroup, imm: &Immediates) -> TransformGroups { +pub(crate) fn define(insts: &InstructionGroup, imm: &Immediates) -> TransformGroups { let mut narrow = TransformGroupBuilder::new( "narrow", r#" diff --git a/cranelift/codegen/meta/src/shared/mod.rs b/cranelift/codegen/meta/src/shared/mod.rs index 29c74caa06..12921da5ef 100644 --- a/cranelift/codegen/meta/src/shared/mod.rs +++ b/cranelift/codegen/meta/src/shared/mod.rs @@ -16,7 +16,7 @@ use crate::cdsl::xform::TransformGroups; use crate::shared::entities::EntityRefs; use crate::shared::immediates::Immediates; -pub struct Definitions { +pub(crate) struct Definitions { pub settings: SettingGroup, pub all_instructions: AllInstructions, pub instructions: InstructionGroup, @@ -25,7 +25,7 @@ pub struct Definitions { pub transform_groups: TransformGroups, } -pub fn define() -> Definitions { +pub(crate) fn define() -> Definitions { let mut all_instructions = AllInstructions::new(); let immediates = Immediates::new();