[meta] Make Builders build() instead of finish();

This commit is contained in:
Benjamin Bouvier
2019-05-28 15:01:14 +02:00
parent d9277f249b
commit 70f79d23bf
19 changed files with 156 additions and 159 deletions

View File

@@ -8,7 +8,7 @@ use crate::shared::Definitions as SharedDefinitions;
fn define_settings(_shared: &SettingGroup) -> SettingGroup {
let setting = SettingGroupBuilder::new("arm32");
setting.finish()
setting.build()
}
fn define_regs() -> IsaRegs {
@@ -45,7 +45,7 @@ fn define_regs() -> IsaRegs {
let builder = RegClassBuilder::new_toplevel("FLAG", flag_reg);
regs.add_class(builder);
regs.finish()
regs.build()
}
pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
@@ -57,7 +57,7 @@ pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
"arm32 specific instruction set",
&shared_defs.format_registry,
)
.finish();
.build();
// CPU modes for 32-bit ARM and Thumb2.
let mut a32 = CpuMode::new("A32");

View File

@@ -8,7 +8,7 @@ use crate::shared::Definitions as SharedDefinitions;
fn define_settings(_shared: &SettingGroup) -> SettingGroup {
let setting = SettingGroupBuilder::new("arm64");
setting.finish()
setting.build()
}
fn define_registers() -> IsaRegs {
@@ -41,7 +41,7 @@ fn define_registers() -> IsaRegs {
let builder = RegClassBuilder::new_toplevel("FLAG", flag_reg);
regs.add_class(builder);
regs.finish()
regs.build()
}
pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
@@ -53,7 +53,7 @@ pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
"arm64 specific instruction set",
&shared_defs.format_registry,
)
.finish();
.build();
let mut a64 = CpuMode::new("A64");

View File

@@ -57,7 +57,7 @@ fn define_settings(shared: &SettingGroup) -> SettingGroup {
predicate!(shared_enable_simd && supports_f && supports_d),
);
setting.finish()
setting.build()
}
fn define_registers() -> IsaRegs {
@@ -79,7 +79,7 @@ fn define_registers() -> IsaRegs {
let builder = RegClassBuilder::new_toplevel("FPR", float_regs);
regs.add_class(builder);
regs.finish()
regs.build()
}
pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
@@ -91,7 +91,7 @@ pub fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
"riscv specific instruction set",
&shared_defs.format_registry,
)
.finish();
.build();
// CPU modes for 32-bit and 64-bit operation.
let mut rv_32 = CpuMode::new("RV32");

View File

@@ -18,7 +18,7 @@ pub fn define(format_registry: &FormatRegistry) -> InstructionGroup {
let iWord = &TypeVar::new(
"iWord",
"A scalar integer machine word",
TypeSetBuilder::new().ints(32..64).finish(),
TypeSetBuilder::new().ints(32..64).build(),
);
let nlo = &operand_doc("nlo", iWord, "Low part of numerator");
let nhi = &operand_doc("nhi", iWord, "High part of numerator");
@@ -103,7 +103,7 @@ pub fn define(format_registry: &FormatRegistry) -> InstructionGroup {
TypeSetBuilder::new()
.floats(Interval::All)
.simd_lanes(Interval::All)
.finish(),
.build(),
);
let IntTo = &TypeVar::new(
"IntTo",
@@ -111,7 +111,7 @@ pub fn define(format_registry: &FormatRegistry) -> InstructionGroup {
TypeSetBuilder::new()
.ints(32..64)
.simd_lanes(Interval::All)
.finish(),
.build(),
);
let x = &operand("x", Float);
let a = &operand("a", IntTo);
@@ -242,5 +242,5 @@ pub fn define(format_registry: &FormatRegistry) -> InstructionGroup {
.operands_out(vec![y, rflags]),
);
ig.finish()
ig.build()
}

View File

@@ -289,5 +289,5 @@ pub fn define(shared: &mut SharedDefinitions, x86_instructions: &InstructionGrou
],
);
group.finish_and_add_to(&mut shared.transform_groups);
group.build_and_add_to(&mut shared.transform_groups);
}

View File

@@ -38,5 +38,5 @@ pub fn define() -> IsaRegs {
let builder = RegClassBuilder::subclass_of("FPR8", fpr, 0, 8);
regs.add_class(builder);
regs.finish()
regs.build()
}

View File

@@ -83,5 +83,5 @@ pub fn define(shared: &SettingGroup) -> SettingGroup {
),
);
settings.finish()
settings.build()
}