T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[meta] Morph a few pub into pub(crate), and remove dead code;

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-09-04 17:50:51 +02:00
parent 8fba449b7b
commit d1d2e790b9
21 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cranelift/codegen/meta/src/cdsl/ast.rs
View File

@@ -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::<Vec<_>>()
.join(", ");
format!("{}({})", self.inst.name, args)
}
pub fn inst_predicate(
&self,
format_registry: &FormatRegistry,

5
cranelift/codegen/meta/src/cdsl/instructions.rs
View File

@@ -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<Instruction> {
self.instructions.iter()
}
pub fn by_name(&self, name: &'static str) -> &Instruction {
self.instructions
.iter()

3
cranelift/codegen/meta/src/cdsl/xform.rs
View File

@@ -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()
}

2
cranelift/codegen/meta/src/gen_encodings.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/gen_inst.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/isa/arm32/mod.rs
View File

@@ -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();

2
cranelift/codegen/meta/src/isa/arm64/mod.rs
View File

@@ -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();

2
cranelift/codegen/meta/src/isa/mod.rs
View File

@@ -55,7 +55,7 @@ impl fmt::Display for Isa {
}
}
pub fn define(isas: &Vec<Isa>, shared_defs: &mut SharedDefinitions) -> Vec<TargetIsa> {
pub(crate) fn define(isas: &Vec<Isa>, shared_defs: &mut SharedDefinitions) -> Vec<TargetIsa> {
isas.iter()
.map(|isa| match isa {
Isa::Riscv => riscv::define(shared_defs),

2
cranelift/codegen/meta/src/isa/riscv/encodings.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/isa/riscv/mod.rs
View File

@@ -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();

2
cranelift/codegen/meta/src/isa/riscv/recipes.rs
View File

@@ -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> {

2
cranelift/codegen/meta/src/isa/x86/encodings.rs
View File

@@ -318,7 +318,7 @@ impl PerCpuModeEncodings {
// Definitions.
pub fn define(
pub(crate) fn define(
shared_defs: &SharedDefinitions,
settings: &SettingGroup,
x86: &InstructionGroup,

2
cranelift/codegen/meta/src/isa/x86/instructions.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/isa/x86/legalize.rs
View File

@@ -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#"

2
cranelift/codegen/meta/src/isa/x86/mod.rs
View File

@@ -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();

2
cranelift/codegen/meta/src/isa/x86/recipes.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/shared/formats.rs
View File

@@ -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());

2
cranelift/codegen/meta/src/shared/immediates.rs
View File

@@ -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.

2
cranelift/codegen/meta/src/shared/instructions.rs
View File

@@ -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,

2
cranelift/codegen/meta/src/shared/legalize.rs
View File

@@ -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#"

4
cranelift/codegen/meta/src/shared/mod.rs
View File

@@ -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();